diff --git a/wp-admin/css/ie.css b/wp-admin/css/ie.css index 228e6de411..3071ee0883 100644 --- a/wp-admin/css/ie.css +++ b/wp-admin/css/ie.css @@ -21,10 +21,6 @@ position: absolute; } -.welcome-panel .welcome-panel-column { - margin: 0 -25px 0 4%; -} - #wp-fullscreen-title { width: 97%; } diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css index c6a7b7e0a8..12be44a9a7 100644 --- a/wp-admin/css/wp-admin-rtl.css +++ b/wp-admin/css/wp-admin-rtl.css @@ -575,6 +575,7 @@ form.upgrade .hint { padding-left: 125px; } +/* Welcome Panel */ .welcome-panel .welcome-panel-close { right: auto; left: 10px; @@ -585,34 +586,18 @@ form.upgrade .hint { right: -12px; } -.welcome-panel .wp-badge { - float: right; +.welcome-panel-content { + margin-left: 0; + margin-right: 13px; } .welcome-panel .welcome-panel-column { - margin: 0 -25px 0 5%; - padding-left: 0; - padding-right: 25px; float: right; } -.welcome-panel .welcome-panel-column.welcome-panel-last { - margin-right: auto; - padding-right: 0; - margin-left: 0; -} - -.welcome-panel h4 .icon16 { - margin-left: 0; - margin-right: -32px; -} - -.welcome-panel .welcome-panel-column-container { - padding: 0 25px 0 0; -} - .welcome-panel .welcome-panel-column ul { - margin: 1.6em 1.3em 1em 1em; + margin-right: 0; + margin-left: 1em; } .welcome-panel .welcome-panel-column li { @@ -620,6 +605,51 @@ form.upgrade .hint { padding-right: 2px; } +.welcome-panel .welcome-add-page { + background-position: right 2px; +} + +.welcome-panel .welcome-edit-page { + background-position: right -90px; +} + +.welcome-panel .welcome-learn-more { + background-position: right -136px; +} + +.welcome-panel .welcome-comments { + background-position: right -182px; +} + +.welcome-panel .welcome-view-site { + background-position: right -274px; +} + +.welcome-panel .welcome-widgets-menus { + background-position: right -229px; + line-height: 14px; +} + +.welcome-panel .welcome-write-blog { + background-position: right -44px; +} + +.welcome-panel .welcome-icon { + padding: 2px 32px 8px 0; +} + +@media screen and (max-width: 870px) { + .welcome-panel .welcome-panel-column li { + margin-right: 0; + margin-left: 13px; + } + + .welcome-panel .welcome-icon { + padding-right: 25px; + padding-left: 0; + } +} + /*------------------------------------------------------------------------------ 10.0 - List Posts (/Pages/etc) ------------------------------------------------------------------------------*/ diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css index 2d8edf8dd8..17adb99a8e 100644 --- a/wp-admin/css/wp-admin.css +++ b/wp-admin/css/wp-admin.css @@ -2260,11 +2260,12 @@ html.wp-toolbar { .welcome-panel .welcome-panel-close { position: absolute; - top: 0; + top: 5px; right: 10px; padding: 8px 3px; font-size: 13px; text-decoration: none; + line-height: 1; } .welcome-panel .welcome-panel-close:before { @@ -2309,57 +2310,45 @@ html.wp-toolbar { width: 36%; } -.welcome-panel .welcome-panel-column.welcome-panel-last { - margin-right: 0; -} - -.welcome-panel h4 .icon16 { - margin-left: -32px; -} - .welcome-panel-column p { margin-top: 7px; } +.welcome-panel .welcome-icon { + display: block; + padding: 2px 0 8px 32px; + background-image: url('../images/welcome-icons.png'); + background-repeat: no-repeat; + background-size: 16px; +} + .welcome-panel .welcome-add-page { - background: url('../images/welcome-icons.png') no-repeat 0 -1px; + background-position: 0 2px; } .welcome-panel .welcome-edit-page { - background: url('../images/welcome-icons.png') no-repeat 0px -92px; + background-position: 0 -90px; } .welcome-panel .welcome-learn-more { - background: url('../images/welcome-icons.png') no-repeat 0px -138px; + background-position: 0 -136px; } .welcome-panel .welcome-comments { - background: url('../images/welcome-icons.png') no-repeat 0px -184px; + background-position: 0 -182px; } .welcome-panel .welcome-view-site { - background: url('../images/welcome-icons.png') no-repeat 0px -276px; + background-position: 0 -274px; } .welcome-panel .welcome-widgets-menus { - background: url('../images/welcome-icons.png') no-repeat 1px -230px; + background-position: 1px -229px; line-height: 14px; } .welcome-panel .welcome-write-blog { - background: url('../images/welcome-icons.png') no-repeat 0px -46px; -} - -.welcome-panel .welcome-add-page, -.welcome-panel .welcome-edit-page, -.welcome-panel .welcome-learn-more, -.welcome-panel .welcome-comments, -.welcome-panel .welcome-view-site, -.welcome-panel .welcome-widgets-menus, -.welcome-panel .welcome-write-blog { - background-size: 16px; - display: block; - padding: 2px 0 8px 32px; + background-position: 0 -44px; } .welcome-panel .welcome-panel-column ul { @@ -2377,7 +2366,8 @@ html.wp-toolbar { padding: 1em 2.3em; } - .welcome-panel .welcome-panel-column, .welcome-panel .welcome-panel-column:first-child { + .welcome-panel .welcome-panel-column, + .welcome-panel .welcome-panel-column:first-child { display: block; float: none; width: 100%; @@ -2392,13 +2382,7 @@ html.wp-toolbar { margin: 0.4em 0 0; } - .welcome-panel .welcome-add-page, - .welcome-panel .welcome-edit-page, - .welcome-panel .welcome-learn-more, - .welcome-panel .welcome-comments, - .welcome-panel .welcome-view-site, - .welcome-panel .welcome-widgets-menus, - .welcome-panel .welcome-write-blog { + .welcome-panel .welcome-icon { padding-left: 25px; } } @@ -8386,39 +8370,8 @@ a.widget-control-edit { background-size: 20px auto; } - .welcome-panel .welcome-add-page { - background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px; - background-size: 16px; - } - - .welcome-panel .welcome-edit-page { - background: url('../images/welcome-icons-2x.png') no-repeat 0px -92px; - background-size: 16px; - } - - .welcome-panel .welcome-learn-more { - background: url('../images/welcome-icons-2x.png') no-repeat 0px -138px; - background-size: 16px; - } - - .welcome-panel .welcome-comments { - background: url('../images/welcome-icons-2x.png') no-repeat 0px -184px; - background-size: 16px; - } - - .welcome-panel .welcome-view-site { - background: url('../images/welcome-icons-2x.png') no-repeat 0px -276px; - background-size: 16px; - } - - .welcome-panel .welcome-widgets-menus { - background: url('../images/welcome-icons-2x.png') no-repeat 1px -230px; - background-size: 16px; - } - - .welcome-panel .welcome-write-blog { - background: url('../images/welcome-icons-2x.png') no-repeat 0px -46px; - background-size: 16px; + .welcome-panel .welcome-icon { + background-image: url('../images/welcome-icons-2x.png'); } .login h1 a { diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 142283d5c6..c0bc65e0f5 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -1252,25 +1252,25 @@ function wp_welcome_panel() {

', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?> -
  • ' . __( 'Turn comments on or off' ) . '', admin_url( 'options-discussion.php' ) ); ?>
  • -
  • ' . __( 'Learn more about getting started' ) . '', 'http://codex.wordpress.org/First_Steps_With_WordPress' ); ?>
  • +
  • Manage ' . __( 'widgets' ) . ' or ' . __( 'menus' ) . '', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?>
  • +
  • ' . __( 'Turn comments on or off' ) . '', admin_url( 'options-discussion.php' ) ); ?>
  • +
  • ' . __( 'Learn more about getting started' ) . '', 'http://codex.wordpress.org/First_Steps_With_WordPress' ); ?>