Ticket #21368: 21368.20.diff

File 21368.20.diff, 8.8 KB (added by lessbloat, 7 months ago)
Line 
1Index: wp-admin/includes/dashboard.php
2===================================================================
3--- wp-admin/includes/dashboard.php     (revision 22191)
4+++ wp-admin/includes/dashboard.php     (working copy)
5@@ -1239,7 +1239,6 @@
6        <div class="welcome-panel-column-container">
7        <div class="welcome-panel-column">
8                <h4><?php _e( 'Get Started' ); ?></h4>
9-               <p><?php _e( 'First, tweak the look of your site:' ); ?></p>
10                <a class="button-primary welcome-button load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
11                <a class="button-primary welcome-button hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
12                <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
13@@ -1250,25 +1249,25 @@
14                <h4><?php _e( 'Next Steps' ); ?></h4>
15                <ul>
16                <?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
17-                       <li><?php printf( '<a href="%s">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
18-                       <li><?php printf( '<a href="%s">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
19+                       <li><?php printf( '<a href="%s" class="welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
20+                       <li><?php printf( '<a href="%s" class="welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
21                <?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
22-                       <li><?php printf( '<a href="%s">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
23-                       <li><?php printf( '<a href="%s">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
24-                       <li><?php printf( '<a href="%s">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
25+                       <li><?php printf( '<a href="%s" class="welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
26+                       <li><?php printf( '<a href="%s" class="welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
27+                       <li><?php printf( '<a href="%s" class="welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
28                <?php else : ?>
29-                       <li><?php printf( '<a href="%s">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
30-                       <li><?php printf( '<a href="%s">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
31+                       <li><?php printf( '<a href="%s" class="welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
32+                       <li><?php printf( '<a href="%s" class="welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
33                <?php endif; ?>
34-                       <li><?php printf( '<a href="%s">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
35+                       <li><?php printf( '<a href="%s" class="welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
36                </ul>
37        </div>
38        <div class="welcome-panel-column welcome-panel-last">
39-               <h4><?php _e( 'Learn How To' ); ?></h4>
40+               <h4><?php _e( 'More Actions' ); ?></h4>
41                <ul>
42-                       <li><?php printf( '<a id="wp350_add_images" href="%s">' . __( 'Add image/media' ) . '</a>', admin_url( 'media-new.php' ) ); ?></li>
43-                       <li><?php printf( '<a id="wp350_widgets" href="%s">' . __( 'Add/remove widgets' ) . '</a>', admin_url( 'widgets.php' ) ); ?></li>
44-                       <li><?php printf( '<a id="wp350_edit_menu" href="%s">' . __( 'Edit your navigation menu' ) . '</a>', admin_url( 'nav-menus.php' ) ); ?></li>
45+                       <li><?php printf( '<div class="welcome-widgets-menus">Manage <a href="%s">' . __( 'widgets' ) . '</a> or <a href="%s">' . __( 'menus' ) . '</a></div>', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?></li>
46+                       <li><?php printf( '<a href="%s" class="welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
47+                       <li><?php printf( '<a href="%s" class="welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', 'http://codex.wordpress.org/First_Steps_With_WordPress' ); ?></li>
48                </ul>
49        </div>
50        </div>
51Index: wp-admin/images/welcome-icons.png
52===================================================================
53Cannot display: file marked as a binary type.
54svn:mime-type = application/octet-stream
55
56Property changes on: wp-admin/images/welcome-icons.png
57___________________________________________________________________
58Added: svn:mime-type
59   + application/octet-stream
60
61Index: wp-admin/images/welcome-icons-2x.png
62===================================================================
63Cannot display: file marked as a binary type.
64svn:mime-type = application/octet-stream
65
66Property changes on: wp-admin/images/welcome-icons-2x.png
67___________________________________________________________________
68Added: svn:mime-type
69   + application/octet-stream
70
71Index: wp-admin/css/wp-admin.css
72===================================================================
73--- wp-admin/css/wp-admin.css   (revision 22191)
74+++ wp-admin/css/wp-admin.css   (working copy)
75@@ -2181,13 +2181,13 @@
76        border-style: solid;
77        border-radius: 3px;
78        font-size: 13px;
79-       line-height: 1.6em;
80+       line-height: 2.1em;
81 }
82 
83 .welcome-panel h3 {
84        margin: 0;
85        font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
86-       font-size: 32px;
87+       font-size: 21px;
88        font-weight: normal;
89        line-height: 1.2;
90 }
91@@ -2197,7 +2197,7 @@
92 }
93 
94 .welcome-panel .about-description {
95-       font-size: 18px;
96+       font-size: 16px;
97        margin: 0;
98 }
99 
100@@ -2224,8 +2224,8 @@
101 }
102 
103 .welcome-button {
104-       margin: -9px 0 3px;
105-       padding: 1em 3em;
106+       margin: 8px 0 3px;
107+       padding: 1em 2em;
108        font: normal 15px/1 sans-serif;
109 }
110 
111@@ -2259,16 +2259,87 @@
112 }
113 
114 .welcome-panel-column p {
115-       margin-top: 5px;
116+       margin-top: 8px;
117 }
118 
119+.welcome-panel .welcome-add-page {
120+       background: url('../images/welcome-icons.png') no-repeat 0 -1px;
121+}
122+
123+.welcome-panel .welcome-edit-page {
124+       background: url('../images/welcome-icons.png') no-repeat 0px -92px;
125+}
126+
127+.welcome-panel .welcome-learn-more {
128+       background: url('../images/welcome-icons.png') no-repeat 0px -138px;
129+}
130+
131+.welcome-panel .welcome-comments {
132+       background: url('../images/welcome-icons.png') no-repeat 0px -184px;
133+}
134+
135+.welcome-panel .welcome-view-site {
136+       background: url('../images/welcome-icons.png') no-repeat 0px -276px;
137+}
138+
139+.welcome-panel .welcome-widgets-menus {
140+       background: url('../images/welcome-icons.png') no-repeat 1px -230px;
141+       line-height: 14px;
142+}
143+
144+.welcome-panel .welcome-write-blog {
145+       background: url('../images/welcome-icons.png') no-repeat 0px -46px;
146+}
147+
148+.welcome-panel .welcome-add-page,
149+.welcome-panel .welcome-edit-page,
150+.welcome-panel .welcome-learn-more,
151+.welcome-panel .welcome-comments,
152+.welcome-panel .welcome-view-site,
153+.welcome-panel .welcome-widgets-menus,
154+.welcome-panel .welcome-write-blog {
155+       background-size: 16px;
156+       display: block;
157+       padding: 2px 0 8px 32px;
158+}
159+
160+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
161+       .welcome-panel .welcome-add-page {
162+               background: url('../images/welcome-icons-2x.png') no-repeat 0 -1px;
163+       }
164+       
165+       .welcome-panel .welcome-edit-page {
166+               background: url('../images/welcome-icons-2x.png') no-repeat 0px -92px;
167+       }
168+       
169+       .welcome-panel .welcome-learn-more {
170+               background: url('../images/welcome-icons-2x.png') no-repeat 0px -138px;
171+       }
172+       
173+       .welcome-panel .welcome-comments {
174+               background: url('../images/welcome-icons-2x.png') no-repeat 0px -184px;
175+       }
176+       
177+       .welcome-panel .welcome-view-site {
178+               background: url('../images/welcome-icons-2x.png') no-repeat 0px -276px;
179+       }
180+       
181+       .welcome-panel .welcome-widgets-menus {
182+               background: url('../images/welcome-icons-2x.png') no-repeat 1px -230px;
183+       }
184+       
185+       .welcome-panel .welcome-write-blog {
186+               background: url('../images/welcome-icons-2x.png') no-repeat 0px -46px;
187+       }
188+}
189+
190 .welcome-panel .welcome-panel-column ul {
191-       margin: 0.4em 1em 1em 1.3em;
192+       margin: 0.8em 1em 1em 0;
193 }
194 
195 .welcome-panel .welcome-panel-column li {
196-       list-style-type: disc;
197-       padding-left: 2px;
198+    line-height: 16px;
199+    list-style-type: none;
200 }
201 
202 @media screen and (max-width: 870px) {
203@@ -2291,6 +2362,16 @@
204        .welcome-panel .welcome-panel-column ul {
205                margin: 0.4em 0 0;
206        }
207+       
208+       .welcome-panel .welcome-add-page,
209+       .welcome-panel .welcome-edit-page,
210+       .welcome-panel .welcome-learn-more,
211+       .welcome-panel .welcome-comments,
212+       .welcome-panel .welcome-view-site,
213+       .welcome-panel .welcome-widgets-menus,
214+       .welcome-panel .welcome-write-blog {
215+               padding-left: 25px;
216+       }
217 }
218 
219 /**