Merge lp:~sajoupa/wordpress/wp-theme-xubuntu-website-r119 into lp:~canonical-sysadmins/wordpress/wp-theme-xubuntu-website
- wp-theme-xubuntu-website-r119
- Merge into wp-theme-xubuntu-website
Proposed by
Laurent Sesquès
Status: | Merged |
---|---|
Merged at revision: | 107 |
Proposed branch: | lp:~sajoupa/wordpress/wp-theme-xubuntu-website-r119 |
Merge into: | lp:~canonical-sysadmins/wordpress/wp-theme-xubuntu-website |
Diff against target: |
3227 lines (+1205/-1479) 26 files modified
xubuntu-fifteen/attachment.php (+0/-69) xubuntu-fifteen/content-archive.php (+9/-11) xubuntu-fifteen/content-attachment.php (+51/-0) xubuntu-fifteen/content-release.php (+23/-84) xubuntu-fifteen/content-search.php (+9/-11) xubuntu-fifteen/footer.php (+2/-2) xubuntu-fifteen/functions-features-release-links.php (+127/-0) xubuntu-fifteen/functions-features.php (+11/-0) xubuntu-fifteen/functions.php (+0/-1) xubuntu-fifteen/header.php (+28/-30) xubuntu-fifteen/index.php (+15/-7) xubuntu-fifteen/reset.css (+20/-3) xubuntu-fifteen/script-menu.js (+4/-16) xubuntu-fifteen/style-common.css (+181/-280) xubuntu-fifteen/style-editor.css (+1/-14) xubuntu-fifteen/style-resp-1000.css (+24/-21) xubuntu-fifteen/style-resp-1200.css (+9/-23) xubuntu-fifteen/style-resp-450.css (+0/-161) xubuntu-fifteen/style-resp-600.css (+264/-293) xubuntu-fifteen/style-resp-800.css (+67/-57) xubuntu-fifteen/style.css (+348/-376) xubuntu-fifteen/template_blank.php (+0/-16) xubuntu-fifteen/widgets-blog.php (+3/-3) xubuntu-fifteen/widgets-footer.php (+1/-0) xubuntu-fifteen/widgets-front.php (+1/-1) xubuntu-fifteen/widgets-release.php (+7/-0) |
To merge this branch: | bzr merge lp:~sajoupa/wordpress/wp-theme-xubuntu-website-r119 |
Related bugs: |
Commit message
Description of the change
Merge r119 of lp:xubuntu-website as per uRT#29426
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed file 'xubuntu-fifteen/attachment.php' |
2 | --- xubuntu-fifteen/attachment.php 2015-02-19 15:54:23 +0000 |
3 | +++ xubuntu-fifteen/attachment.php 1970-01-01 00:00:00 +0000 |
4 | @@ -1,69 +0,0 @@ |
5 | -<?php |
6 | - /* Template name: Full size gallery */ |
7 | -?> |
8 | - |
9 | -<?php get_header( ); ?> |
10 | -<?php the_post( ); ?> |
11 | - |
12 | -<div id="content_outer"> |
13 | - <div id="content" class="air"> |
14 | - <?php |
15 | - // Get previous/next attachment if available |
16 | - $args = array( |
17 | - 'post_parent' => get_post_field( 'post_parent', get_the_ID( ) ), |
18 | - 'post_type' => 'attachment', |
19 | - 'post_mime_type' => 'image', |
20 | - 'order_by' => 'date', |
21 | - 'order' => 'ASC' |
22 | - ); |
23 | - $attachments = get_children( $args ); |
24 | - sort( $attachments ); |
25 | - |
26 | - foreach( $attachments as $i => $a ) { |
27 | - if( $a->ID == get_the_ID( ) ) { |
28 | - $prev = $i - 1; $next = $i + 1; |
29 | - |
30 | - if( $prev >= 0 ) { |
31 | - $prev_img = $attachments[$prev]; |
32 | - } else { |
33 | - $last = count( $attachments ) - 1; |
34 | - $prev_img = $attachments[$last]; |
35 | - } |
36 | - |
37 | - if( $next <= count( $attachments ) - 1 ) { |
38 | - $next_img = $attachments[$next]; |
39 | - } else { |
40 | - $next_img = $attachments[0]; |
41 | - } |
42 | - } |
43 | - |
44 | - continue; |
45 | - } |
46 | - ?> |
47 | - <?php if( count( $attachments ) > 1 ) { ?> |
48 | - <div id="attachment_navi"> |
49 | - <a class="button back" href="<?php echo get_the_permalink( $prev_img->ID ); ?>"><?php _e( 'Previous', 'xubuntu' ); ?></a> |
50 | - <a class="button primary clean" href="<?php echo get_the_permalink( get_post_field( 'post_parent', get_the_ID( ) ) ); ?>"><?php _e( 'Parent', 'xubuntu' ); ?></a> |
51 | - <a class="button" href="<?php echo get_the_permalink( $next_img->ID ); ?>"><?php _e( 'Next', 'xubuntu' ); ?></a> |
52 | - </div> |
53 | - <?php } ?> |
54 | - <div id="attachment"> |
55 | - <?php |
56 | - // Output the image |
57 | - echo wp_get_attachment_image( get_the_ID( ), 'original' ); |
58 | - ?> |
59 | - </div> |
60 | - <?php |
61 | - $caption = get_the_excerpt( ); |
62 | - $description = get_the_content( ); |
63 | - ?> |
64 | - <?php if( $caption || $description ) { ?> |
65 | - <div class="boxed"> |
66 | - <?php if( $caption ) { ?><h2><?php echo $caption; ?></h2><?php } ?> |
67 | - <?php if( $description ) { ?><p><?php echo $description; ?></p><?php } ?> |
68 | - </div> |
69 | - <?php } ?> |
70 | - </div> |
71 | -</div> |
72 | - |
73 | -<?php get_footer( ); ?> |
74 | \ No newline at end of file |
75 | |
76 | === modified file 'xubuntu-fifteen/content-archive.php' |
77 | --- xubuntu-fifteen/content-archive.php 2016-08-28 23:39:44 +0000 |
78 | +++ xubuntu-fifteen/content-archive.php 2016-12-15 07:46:28 +0000 |
79 | @@ -16,14 +16,12 @@ |
80 | } |
81 | ?> |
82 | |
83 | -<div id="archive-posts"> |
84 | - <ul> |
85 | - <?php while( have_posts( ) ) { ?> |
86 | - <?php the_post( ); ?> |
87 | - <li class="post-title"> |
88 | - <span class="post-time"><?php print strftime( __( '%B %e, %Y', 'xubuntu' ), get_the_time( 'U' ) ); ?></span> |
89 | - <b><a href="<?php the_permalink( ); ?>" rel="bookmark" title="<?php the_title( ); ?>"><?php the_title( ); ?></a></b> |
90 | - </li> |
91 | - <?php } ?> |
92 | - </ul> |
93 | -</div> |
94 | \ No newline at end of file |
95 | +<ul class="posts-list"> |
96 | + <?php while( have_posts( ) ) { ?> |
97 | + <?php the_post( ); ?> |
98 | + <li class="post-title"> |
99 | + <span class="post-time"><?php print strftime( __( '%B %e, %Y', 'xubuntu' ), get_the_time( 'U' ) ); ?></span> |
100 | + <b><a href="<?php the_permalink( ); ?>" rel="bookmark" title="<?php the_title( ); ?>"><?php the_title( ); ?></a></b> |
101 | + </li> |
102 | + <?php } ?> |
103 | +</ul> |
104 | \ No newline at end of file |
105 | |
106 | === added file 'xubuntu-fifteen/content-attachment.php' |
107 | --- xubuntu-fifteen/content-attachment.php 1970-01-01 00:00:00 +0000 |
108 | +++ xubuntu-fifteen/content-attachment.php 2016-12-15 07:46:28 +0000 |
109 | @@ -0,0 +1,51 @@ |
110 | +<?php |
111 | + if( get_the_excerpt( ) ) { |
112 | + echo '<h1>' . get_the_excerpt( ) . '</h1>'; |
113 | + } |
114 | + if( get_the_content( ) ) { |
115 | + echo wpautop( get_the_content( ) ); |
116 | + } |
117 | +?> |
118 | + |
119 | +<p><?php echo wp_get_attachment_image( get_the_ID( ), 'original' ); ?></p> |
120 | + |
121 | +<?php |
122 | + // Get previous/next attachment if available |
123 | + $args = array( |
124 | + 'post_parent' => get_post_field( 'post_parent', get_the_ID( ) ), |
125 | + 'post_type' => 'attachment', |
126 | + 'post_mime_type' => 'image', |
127 | + 'order_by' => 'date', |
128 | + 'order' => 'ASC' |
129 | + ); |
130 | + $attachments = get_children( $args ); |
131 | + sort( $attachments ); |
132 | + |
133 | + foreach( $attachments as $i => $a ) { |
134 | + if( $a->ID == get_the_ID( ) ) { |
135 | + $prev = $i - 1; $next = $i + 1; |
136 | + |
137 | + if( $prev >= 0 ) { |
138 | + $prev_img = $attachments[$prev]; |
139 | + } else { |
140 | + $last = count( $attachments ) - 1; |
141 | + $prev_img = $attachments[$last]; |
142 | + } |
143 | + |
144 | + if( $next <= count( $attachments ) - 1 ) { |
145 | + $next_img = $attachments[$next]; |
146 | + } else { |
147 | + $next_img = $attachments[0]; |
148 | + } |
149 | + } |
150 | + |
151 | + continue; |
152 | + } |
153 | +?> |
154 | +<?php if( count( $attachments ) > 1 ) { ?> |
155 | + <div class="attachment-navi"> |
156 | + <a class="button back" href="<?php echo get_the_permalink( $prev_img->ID ); ?>"><?php _e( 'Previous', 'xubuntu' ); ?></a> |
157 | + <a class="button primary clean" href="<?php echo get_the_permalink( get_post_field( 'post_parent', get_the_ID( ) ) ); ?>"><?php _e( 'Parent', 'xubuntu' ); ?></a> |
158 | + <a class="button" href="<?php echo get_the_permalink( $next_img->ID ); ?>"><?php _e( 'Next', 'xubuntu' ); ?></a> |
159 | + </div> |
160 | +<?php } ?> |
161 | |
162 | === modified file 'xubuntu-fifteen/content-release.php' |
163 | --- xubuntu-fifteen/content-release.php 2016-08-29 12:39:20 +0000 |
164 | +++ xubuntu-fifteen/content-release.php 2016-12-15 07:46:28 +0000 |
165 | @@ -11,17 +11,14 @@ |
166 | $eol_time = gmmktime( 0, 0, 1, $month, $day, $year ); |
167 | } |
168 | |
169 | - if( strlen( $release_meta['release_codename'] ) > 0 ) { |
170 | - $codename = ', ' . $release_meta['release_codename']; |
171 | - } else { |
172 | - $codename = ''; |
173 | - } |
174 | - |
175 | - echo '<h1 class="post-title">Xubuntu ' . single_term_title( '', false ) . $codename . '</h1>'; |
176 | - if( isset( $release_time ) || isset( $eol_time ) ) { |
177 | + echo '<h1 class="post-title">Xubuntu ' . single_term_title( '', false ) . '</h1>'; |
178 | + if( strlen( $release_meta['release_codename'] ) > 0 || isset( $release_time ) || isset( $eol_time ) ) { |
179 | echo '<dl class="release-info group">'; |
180 | + if( strlen( $release_meta['release_codename'] ) > 0 ) { |
181 | + echo '<dt>' . __( 'Codename', 'xubuntu' ) . '</dt><dd>' . $release_meta['release_codename'] . '</dd>'; |
182 | + } |
183 | if( isset( $release_time ) ) { |
184 | - echo '<dt>' . __( 'Release date', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $release_time ) . '</dd>'; |
185 | + echo '<dt>' . __( 'Release Date', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $release_time ) . '</dd>'; |
186 | } |
187 | if( isset( $eol_time ) ) { |
188 | echo '<dt>' . __( 'End of Life', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $eol_time ) . '</dd>'; |
189 | @@ -33,35 +30,14 @@ |
190 | ?> |
191 | |
192 | <?php |
193 | - $official_links = get_posts( array( |
194 | - 'post_type' => 'release_link', |
195 | - 'posts_per_page' => -1, |
196 | - 'tax_query' => array( array( |
197 | - 'taxonomy' => 'release', |
198 | - 'field' => 'term_id', |
199 | - 'terms' => $release->term_id |
200 | - ) ), |
201 | - 'meta_query' => array( |
202 | - 'relation' => 'OR', |
203 | - array( |
204 | - 'key' => 'link_type', |
205 | - 'value' => 'official' |
206 | - ), |
207 | - array( |
208 | - 'key' => 'link_type', |
209 | - 'value' => 'official-expiring' |
210 | - ), |
211 | - ), |
212 | - 'orderby' => 'title', |
213 | - 'order' => 'ASC' |
214 | - ) ); |
215 | + $official_links = release_link_list( array( 'official', 'official-expiring' ), $release->term_id ); |
216 | |
217 | - if( is_array( $official_links ) && count( $official_links ) > 0 ) { |
218 | - $otuput_links = array( ); |
219 | + if( $official_links ) { |
220 | + $output_links = array( ); |
221 | |
222 | foreach( $official_links as $official_link ) { |
223 | $meta = get_post_meta( $official_link->ID ); |
224 | - if( $meta['link_type'][0] == 'official-expiring' && time( ) <= $eol_time ) { |
225 | + if( ( $meta['link_type'][0] == 'official-expiring' && time( ) <= $eol_time ) || $meta['link_type'][0] == 'official' ) { |
226 | $output_links[] = '<li><strong><a href="' . $meta['link_url'][0] . '">' . $official_link->post_title . '</a></strong></li>'; |
227 | } |
228 | } |
229 | @@ -79,61 +55,24 @@ |
230 | |
231 | <?php if( have_posts( ) ) { ?> |
232 | <h2><?php _e( 'Articles', 'xubuntu' ); ?></h2> |
233 | - <div id="archive-posts"> |
234 | - <ul> |
235 | - <?php while( have_posts( ) ) { ?> |
236 | - <?php the_post( ); ?> |
237 | - <?php if( get_post_type( ) == 'post' ) { ?> |
238 | - <li class="post-title"> |
239 | - <span class="post-time"><?php print strftime( __( '%B %e, %Y', 'xubuntu' ), get_the_time( 'U' ) ); ?></span> |
240 | - <b><a href="<?php the_permalink( ); ?>" rel="bookmark" title="<?php the_title( ); ?>"><?php the_title( ); ?></a></b> |
241 | - </li> |
242 | - <?php } ?> |
243 | + <ul class="posts-list"> |
244 | + <?php while( have_posts( ) ) { ?> |
245 | + <?php the_post( ); ?> |
246 | + <?php if( get_post_type( ) == 'post' ) { ?> |
247 | + <li class="post-title"> |
248 | + <span class="post-time"><?php print strftime( __( '%B %e, %Y', 'xubuntu' ), get_the_time( 'U' ) ); ?></span> |
249 | + <b><a href="<?php the_permalink( ); ?>" rel="bookmark" title="<?php the_title( ); ?>"><?php the_title( ); ?></a></b> |
250 | + </li> |
251 | <?php } ?> |
252 | - </ul> |
253 | - </div> |
254 | + <?php } ?> |
255 | + </ul> |
256 | <?php } ?> |
257 | |
258 | <?php |
259 | - $press_links = get_posts( array( |
260 | - 'post_type' => 'release_link', |
261 | - 'posts_per_page' => -1, |
262 | - 'tax_query' => array( array( |
263 | - 'taxonomy' => 'release', |
264 | - 'field' => 'term_id', |
265 | - 'terms' => $release->term_id |
266 | - ) ), |
267 | - 'meta_query' => array( array( |
268 | - 'key' => 'link_type', |
269 | - 'value' => 'press' |
270 | - ) ), |
271 | - 'orderby' => 'title', |
272 | - 'order' => 'ASC' |
273 | - ) ); |
274 | - |
275 | - if( is_array( $press_links ) && count( $press_links ) > 0 ) { |
276 | + $press_links = release_link_list( 'press', $release->term_id ); |
277 | + if( $press_links ) { |
278 | echo '<h2>' . __( 'In the Press', 'xubuntu' ) . '</h2>'; |
279 | - echo '<ul class="link-list">'; |
280 | - foreach( $press_links as $press_link ) { |
281 | - $meta = get_post_meta( $press_link->ID ); |
282 | - echo '<li>'; |
283 | - echo '<strong><a href="' . $meta['link_url'][0] . '">' . $press_link->post_title . '</a></strong>'; |
284 | - if( ( isset( $meta['author_name'][0] ) && strlen( $meta['author_name'][0] ) > 0 ) || ( isset( $meta['author_site'][0] ) && strlen( $meta['author_site'][0] ) > 0 ) ) { |
285 | - echo ' by '; |
286 | - } |
287 | - if( isset( $meta['author_name'][0] ) && strlen( $meta['author_name'][0] ) > 0 ) { |
288 | - echo $meta['author_name'][0] . ' of '; |
289 | - } |
290 | - if( isset( $meta['author_site'][0] ) && strlen( $meta['author_site'][0] ) > 0 ) { |
291 | - if( isset( $meta['author_url'][0] ) && strlen( $meta['author_url'][0] ) > 0 ) { |
292 | - echo '<a href="' . $meta['author_url'][0] . '">' . $meta['author_site'][0] . '</a>'; |
293 | - } else { |
294 | - echo $meta['author_site'][0]; |
295 | - } |
296 | - } |
297 | - echo '</li>'; |
298 | - } |
299 | - echo '</ul>'; |
300 | + echo release_link_press_output( $press_links ); |
301 | } |
302 | ?> |
303 | |
304 | |
305 | === modified file 'xubuntu-fifteen/content-search.php' |
306 | --- xubuntu-fifteen/content-search.php 2016-02-12 23:25:25 +0000 |
307 | +++ xubuntu-fifteen/content-search.php 2016-12-15 07:46:28 +0000 |
308 | @@ -1,17 +1,15 @@ |
309 | <h1 class="post-title"><?php printf( __( 'Search results for "%s"', 'xubuntu' ), $_GET['s'] ); ?></h1> |
310 | |
311 | <?php if( have_posts( ) ) { ?> |
312 | - <div id="archive-posts"> |
313 | - <ul> |
314 | - <?php while( have_posts( ) ) { ?> |
315 | - <?php the_post( ); ?> |
316 | - <li class="post-title"> |
317 | - <span class="post-time"><?php print strftime( __( '%B %e, %Y', 'xubuntu' ), get_the_time( 'U' ) ); ?></span> |
318 | - <b><a href="<?php the_permalink( ); ?>" rel="bookmark" title="<?php the_title( ); ?>"><?php the_title( ); ?></a></b> |
319 | - </li> |
320 | - <?php } ?> |
321 | - </ul> |
322 | - </div> |
323 | + <ul class="posts-list"> |
324 | + <?php while( have_posts( ) ) { ?> |
325 | + <?php the_post( ); ?> |
326 | + <li class="post-title"> |
327 | + <span class="post-time"><?php print strftime( __( '%B %e, %Y', 'xubuntu' ), get_the_time( 'U' ) ); ?></span> |
328 | + <b><a href="<?php the_permalink( ); ?>" rel="bookmark" title="<?php the_title( ); ?>"><?php the_title( ); ?></a></b> |
329 | + </li> |
330 | + <?php } ?> |
331 | + </ul> |
332 | <?php } else { ?> |
333 | <p><?php _e( 'No content found.', 'xubuntu' ); ?></p> |
334 | <?php } ?> |
335 | |
336 | === modified file 'xubuntu-fifteen/footer.php' |
337 | --- xubuntu-fifteen/footer.php 2016-07-30 22:50:35 +0000 |
338 | +++ xubuntu-fifteen/footer.php 2016-12-15 07:46:28 +0000 |
339 | @@ -1,7 +1,7 @@ |
340 | -<div id="footer"> |
341 | +<footer> |
342 | <?php get_template_part( 'widgets', 'footer' ); ?> |
343 | <?php wp_footer( ); ?> |
344 | -</div> |
345 | +</footer> |
346 | |
347 | </body> |
348 | </html> |
349 | |
350 | === modified file 'xubuntu-fifteen/functions-features-release-links.php' |
351 | --- xubuntu-fifteen/functions-features-release-links.php 2016-08-28 23:39:44 +0000 |
352 | +++ xubuntu-fifteen/functions-features-release-links.php 2016-12-15 07:46:28 +0000 |
353 | @@ -129,4 +129,131 @@ |
354 | } |
355 | } |
356 | |
357 | +/* |
358 | + * Add a function to help listing release links |
359 | + * |
360 | + */ |
361 | + |
362 | +function release_link_list( $link_type = 'press', $term = null ) { |
363 | + $args = array( |
364 | + 'post_type' => 'release_link', |
365 | + 'posts_per_page' => -1, |
366 | + 'orderby' => 'title', |
367 | + 'order' => 'ASC' |
368 | + ); |
369 | + |
370 | + if( isset( $link_type ) ) { |
371 | + $args['meta_query'] = array( |
372 | + 'relation' => 'OR', |
373 | + ); |
374 | + |
375 | + if( is_array( $link_type ) ) { |
376 | + foreach( $link_type as $type ) { |
377 | + $args['meta_query'][] = array( |
378 | + 'key' => 'link_type', |
379 | + 'value' => $type |
380 | + ); |
381 | + } |
382 | + } else { |
383 | + $args['meta_query'][] = array( |
384 | + 'key' => 'link_type', |
385 | + 'value' => $link_type |
386 | + ); |
387 | + } |
388 | + } |
389 | + |
390 | + if( isset( $term ) ) { |
391 | + $args['tax_query'] = array( array( |
392 | + 'taxonomy' => 'release', |
393 | + 'field' => 'term_id', |
394 | + 'terms' => $term |
395 | + ) ); |
396 | + } |
397 | + |
398 | + $links = get_posts( $args ); |
399 | + |
400 | + if( is_array( $links ) && count( $links ) > 0 ) { |
401 | + return $links; |
402 | + } else { |
403 | + return null; |
404 | + } |
405 | +} |
406 | + |
407 | +/* |
408 | + * Add a function to output press links |
409 | + * Used by: content-release.php ! |
410 | + * |
411 | + */ |
412 | + |
413 | +function release_link_press_output( $press_links = array( ) ) { |
414 | + if( count( $press_links ) > 0 ) { |
415 | + $out = '<ul class="link-list">'; |
416 | + foreach( $press_links as $press_link ) { |
417 | + $meta = get_post_meta( $press_link->ID ); |
418 | + $out .= '<li>'; |
419 | + $out .= '<strong><a href="' . $meta['link_url'][0] . '">' . $press_link->post_title . '</a></strong>'; |
420 | + if( ( isset( $meta['author_name'][0] ) && strlen( $meta['author_name'][0] ) > 0 ) || ( isset( $meta['author_site'][0] ) && strlen( $meta['author_site'][0] ) > 0 ) ) { |
421 | + $out .= ' by '; |
422 | + } |
423 | + if( isset( $meta['author_name'][0] ) && strlen( $meta['author_name'][0] ) > 0 ) { |
424 | + $out .= $meta['author_name'][0] . ' of '; |
425 | + } |
426 | + if( isset( $meta['author_site'][0] ) && strlen( $meta['author_site'][0] ) > 0 ) { |
427 | + if( isset( $meta['author_url'][0] ) && strlen( $meta['author_url'][0] ) > 0 ) { |
428 | + $out .= '<a href="' . $meta['author_url'][0] . '">' . $meta['author_site'][0] . '</a>'; |
429 | + } else { |
430 | + $out .= $meta['author_site'][0]; |
431 | + } |
432 | + } |
433 | + $out .= '</li>'; |
434 | + } |
435 | + $out .= '</ul>'; |
436 | + |
437 | + return $out; |
438 | + } |
439 | +} |
440 | + |
441 | +/* |
442 | + * Add a shortcode for printing out press links |
443 | + * |
444 | + */ |
445 | + |
446 | +add_shortcode( 'press', 'release_link_shortcode_press' ); |
447 | + |
448 | +function release_link_shortcode_press( $atts ) { |
449 | + $atts = shortcode_atts( |
450 | + array( |
451 | + 'release' => false, |
452 | + ), |
453 | + $atts, |
454 | + 'press' |
455 | + ); |
456 | + |
457 | + $args = array( ); |
458 | + |
459 | + if( strlen( $atts['release'] ) > 0 ) { |
460 | + $single_release = get_term_by( 'slug', $atts['release'], 'release' ); |
461 | + $args['include'] = $single_release->term_id; |
462 | + } |
463 | + |
464 | + $releases = get_terms( 'release', $args ); |
465 | + $navi = ''; |
466 | + $links_out = ''; |
467 | + |
468 | + foreach( $releases as $release ) { |
469 | + $links = release_link_list( 'press', $release->term_id ); |
470 | + if( count( $links ) > 0 ) { |
471 | + $release_meta = get_option( 'taxonomy_term_' . $release->term_id ); |
472 | + $navi .= '<a class="button" href="#' . $release->slug . '">' . $release->name . '</a>'; |
473 | + $links_out .= '<h2 id="' . $release->slug . '">' . $release->name . ' (' . $release_meta['release_codename'] . ')</h2>' . release_link_press_output( $links ); |
474 | + } |
475 | + } |
476 | + |
477 | + if( count( $releases ) > 1 ) { |
478 | + return '<p>' . $navi . '</p>' . $links_out; |
479 | + } else { |
480 | + return $links_out; |
481 | + } |
482 | +} |
483 | + |
484 | ?> |
485 | \ No newline at end of file |
486 | |
487 | === modified file 'xubuntu-fifteen/functions-features.php' |
488 | --- xubuntu-fifteen/functions-features.php 2016-08-29 13:44:57 +0000 |
489 | +++ xubuntu-fifteen/functions-features.php 2016-12-15 07:46:28 +0000 |
490 | @@ -26,6 +26,17 @@ |
491 | 'before_title' => '<h2>', |
492 | 'after_title' => '</h2>' |
493 | ) ); |
494 | + |
495 | + /* Widgets for release pages */ |
496 | + register_sidebar( array( |
497 | + 'name' => 'Release page widgets', |
498 | + 'id' => 'release_widgets', |
499 | + 'before_widget' => '', |
500 | + 'after_widget' => '', |
501 | + 'before_title' => '<h2>', |
502 | + 'after_title' => '</h2>' |
503 | + ) ); |
504 | + |
505 | /* Footer */ |
506 | register_sidebars( 2, array( |
507 | 'name' => 'Footer %d', |
508 | |
509 | === modified file 'xubuntu-fifteen/functions.php' |
510 | --- xubuntu-fifteen/functions.php 2016-08-28 23:39:44 +0000 |
511 | +++ xubuntu-fifteen/functions.php 2016-12-15 07:46:28 +0000 |
512 | @@ -45,7 +45,6 @@ |
513 | wp_enqueue_style( 'xubuntu-style-resp-1000', get_stylesheet_directory_uri( ) . '/style-resp-1000.css', array( 'xubuntu-style', 'xubuntu-style-common', 'xubuntu-style-resp-1200' ), false, 'only screen and (max-width:1000px)' ); |
514 | wp_enqueue_style( 'xubuntu-style-resp-800', get_stylesheet_directory_uri( ) . '/style-resp-800.css', array( 'xubuntu-style', 'xubuntu-style-common', 'xubuntu-style-resp-1000' ), false, 'only screen and (max-width:800px)' ); |
515 | wp_enqueue_style( 'xubuntu-style-resp-600', get_stylesheet_directory_uri( ) . '/style-resp-600.css', array( 'xubuntu-style', 'xubuntu-style-common', 'xubuntu-style-resp-800' ), false, 'only screen and (max-width:600px)' ); |
516 | - wp_enqueue_style( 'xubuntu-style-resp-450', get_stylesheet_directory_uri( ) . '/style-resp-450.css', array( 'xubuntu-style', 'xubuntu-style-common', 'xubuntu-style-resp-600' ), false, 'only screen and (max-width:450px)' ); |
517 | } |
518 | |
519 | /* Check if the current page is a blog page |
520 | |
521 | === modified file 'xubuntu-fifteen/header.php' |
522 | --- xubuntu-fifteen/header.php 2016-01-03 22:40:57 +0000 |
523 | +++ xubuntu-fifteen/header.php 2016-12-15 07:46:28 +0000 |
524 | @@ -9,39 +9,37 @@ |
525 | <meta name="author" content="The Xubuntu community" /> |
526 | <meta name="viewport" content="width=device-width, maximum-scale=1.0, minimum-scale=1.0, initial-scale=1" /> |
527 | |
528 | - <link rel="shortcut icon" href="<?php bloginfo('stylesheet_directory'); ?>/images/favicon.png"> |
529 | + <link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri( ); ?>/images/xubuntu-icon-16.png"> |
530 | |
531 | <?php wp_head( ); ?> |
532 | </head> |
533 | |
534 | <body id="xubuntu" <?php echo body_class( ); ?>> |
535 | |
536 | -<div id="header_outer"> |
537 | - <div id="header_art"></div> |
538 | - <div id="header"> |
539 | - <div id="logo"> |
540 | - <a href="<?php echo home_url( '/' ); ?>"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/images/xubuntu-logo-45.png" alt="Xubuntu" /></a> |
541 | - </div> |
542 | - </div> |
543 | - <div id="navi_outer"> |
544 | - <div id="navi"> |
545 | - <a id="opennavi" class="navi_open_button" href="#footer_navi" title="<?php _e( 'Click to see more', 'xubuntu' ); ?>"></a> |
546 | - <?php |
547 | - wp_nav_menu( array( |
548 | - 'theme_location' => 'quick_navigation', |
549 | - 'container_id' => 'navi_quick', |
550 | - 'container_class' => 'group navigation nq', |
551 | - 'fallback_cb' => 'xubuntu_quick_menu_fallback' |
552 | - ) ); |
553 | - ?> |
554 | - <?php |
555 | - wp_nav_menu( array( |
556 | - 'theme_location' => 'main_navigation', |
557 | - 'container_id' => 'navi_main', |
558 | - 'container_class' => 'group navigation nd', |
559 | - 'fallback_cb' => false |
560 | - ) ); |
561 | - ?> |
562 | - </div> |
563 | - </div> |
564 | -</div> |
565 | +<header> |
566 | + <div id="logo"> |
567 | + <a href="<?php echo home_url( '/' ); ?>"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/images/xubuntu-logo-45.png" alt="Xubuntu" /></a> |
568 | + </div> |
569 | + |
570 | + <div id="navi"> |
571 | + <a id="opennavi" class="navi_open_button" href="#footer_navi" title="<?php _e( 'Click to see more', 'xubuntu' ); ?>"></a> |
572 | + <?php |
573 | + wp_nav_menu( array( |
574 | + 'theme_location' => 'quick_navigation', |
575 | + 'container' => 'nav', |
576 | + 'container_id' => 'navi_quick', |
577 | + 'container_class' => 'group navigation nq', |
578 | + 'fallback_cb' => 'xubuntu_quick_menu_fallback' |
579 | + ) ); |
580 | + ?> |
581 | + <?php |
582 | + wp_nav_menu( array( |
583 | + 'theme_location' => 'main_navigation', |
584 | + 'container' => 'nav', |
585 | + 'container_id' => 'navi_main', |
586 | + 'container_class' => 'group navigation nd', |
587 | + 'fallback_cb' => false |
588 | + ) ); |
589 | + ?> |
590 | + </div> |
591 | +</header> |
592 | |
593 | === removed file 'xubuntu-fifteen/images/favicon.png' |
594 | Binary files xubuntu-fifteen/images/favicon.png 2015-02-19 15:54:23 +0000 and xubuntu-fifteen/images/favicon.png 1970-01-01 00:00:00 +0000 differ |
595 | === added file 'xubuntu-fifteen/images/header.png' |
596 | Binary files xubuntu-fifteen/images/header.png 1970-01-01 00:00:00 +0000 and xubuntu-fifteen/images/header.png 2016-12-15 07:46:28 +0000 differ |
597 | === added file 'xubuntu-fifteen/images/xubuntu-icon-16.png' |
598 | Binary files xubuntu-fifteen/images/xubuntu-icon-16.png 1970-01-01 00:00:00 +0000 and xubuntu-fifteen/images/xubuntu-icon-16.png 2016-12-15 07:46:28 +0000 differ |
599 | === modified file 'xubuntu-fifteen/index.php' |
600 | --- xubuntu-fifteen/index.php 2016-08-29 12:39:20 +0000 |
601 | +++ xubuntu-fifteen/index.php 2016-12-15 07:46:28 +0000 |
602 | @@ -1,13 +1,15 @@ |
603 | <?php get_header( ); ?> |
604 | |
605 | -<div id="content_outer"> |
606 | - <div id="content" class="group"> |
607 | - <div id="main" class="group"> |
608 | +<section id="middle" class="group"> |
609 | + <section id="content" class="group"> |
610 | + <main id="main" class="group"> |
611 | <?php |
612 | if( is_search( ) ) { |
613 | get_template_part( 'content', 'search' ); |
614 | } elseif( is_tax( 'release' ) ) { |
615 | get_template_part( 'content', 'release' ); |
616 | + } elseif( is_attachment( ) ) { |
617 | + get_template_part( 'content', 'attachment' ); |
618 | } elseif( have_posts( ) && !is_404( ) ) { |
619 | if( is_archive( ) ) { |
620 | get_template_part( 'content', 'archive' ); |
621 | @@ -23,10 +25,16 @@ |
622 | <?php |
623 | } |
624 | ?> |
625 | - </div> |
626 | - <?php if( is_blog( ) || is_search( ) ) { get_template_part( 'widgets', 'blog' ); } ?> |
627 | - </div> |
628 | + </main> |
629 | + <?php |
630 | + if( is_tax( 'release' ) ) { |
631 | + get_template_part( 'widgets', 'release' ); |
632 | + } elseif( is_blog( ) || is_search( ) ) { |
633 | + get_template_part( 'widgets', 'blog' ); |
634 | + } |
635 | + ?> |
636 | + </section> |
637 | <?php if( is_front_page( ) ) { get_template_part( 'widgets', 'front' ); } ?> |
638 | -</div> |
639 | +</section> |
640 | |
641 | <?php get_footer( ); ?> |
642 | \ No newline at end of file |
643 | |
644 | === modified file 'xubuntu-fifteen/reset.css' |
645 | --- xubuntu-fifteen/reset.css 2016-02-12 23:56:18 +0000 |
646 | +++ xubuntu-fifteen/reset.css 2016-12-15 07:46:28 +0000 |
647 | @@ -50,8 +50,10 @@ |
648 | border-spacing: 0; |
649 | } |
650 | |
651 | -/* Self-clearing float |
652 | - * (and other little tweaks) |
653 | +/* |
654 | + * Self-clearing float |
655 | + * Tony Aslett, 2004-05-08 |
656 | + * http://csscreator.com/attributes/containedfloat.php |
657 | * |
658 | */ |
659 | |
660 | @@ -61,7 +63,22 @@ |
661 | height: 0; |
662 | clear: both; |
663 | visibility: hidden; |
664 | -} |
665 | + font-size: 0; |
666 | +} |
667 | + |
668 | +/* |
669 | + * Border box model everywhere |
670 | + * Pasi Lallinaho, 2016-04-09 |
671 | + * |
672 | + */ |
673 | + |
674 | +* { |
675 | + box-sizing: border-box; |
676 | +} |
677 | + |
678 | +/* |
679 | + * |
680 | + */ |
681 | |
682 | .hidden, |
683 | .screen-reader-text { display: none; } |
684 | |
685 | === modified file 'xubuntu-fifteen/screenshot.png' |
686 | Binary files xubuntu-fifteen/screenshot.png 2015-02-19 15:54:23 +0000 and xubuntu-fifteen/screenshot.png 2016-12-15 07:46:28 +0000 differ |
687 | === modified file 'xubuntu-fifteen/script-menu.js' |
688 | --- xubuntu-fifteen/script-menu.js 2016-07-30 22:48:09 +0000 |
689 | +++ xubuntu-fifteen/script-menu.js 2016-12-15 07:46:28 +0000 |
690 | @@ -17,10 +17,6 @@ |
691 | } else if( current.offset( ).left - shift < 0 ) { |
692 | // The submenu would overflow in the left side |
693 | current_sub.css( 'left', '-2px' ); |
694 | - } else { |
695 | - // The submenu will fit the screen when centered |
696 | - // Commenting this line keeps menus left-aligned |
697 | - //current_sub.css( 'left', -shift ); |
698 | } |
699 | } ); |
700 | |
701 | @@ -68,17 +64,9 @@ |
702 | } ); |
703 | |
704 | function xubuntu_sticky_header( ) { |
705 | - if( jQuery( window ).scrollTop( ) > ( jQuery( '#header' ).outerHeight( ) + jQuery( '#navi' ).outerHeight( ) ) ) { |
706 | - jQuery( '#header_outer' ).addClass( 'scrolled' ); |
707 | - } else { |
708 | - jQuery( '#header_outer' ).removeClass( 'scrolled' ); |
709 | - } |
710 | -} |
711 | - |
712 | -function xubuntu_scrolled( ) { |
713 | - if( jQuery( window ).width( ) < 600 ) { |
714 | - jQuery( '#header_outer' ).addClass( 'scrolled' ); |
715 | - } else { |
716 | - jQuery( '#header_outer' ).removeClass( 'scrolled' ); |
717 | + if( jQuery( window ).scrollTop( ) > ( jQuery( '#logo' ).outerHeight( ) + jQuery( '#navi' ).outerHeight( ) ) ) { |
718 | + jQuery( 'header' ).addClass( 'scrolled' ); |
719 | + } else { |
720 | + jQuery( 'header' ).removeClass( 'scrolled' ); |
721 | } |
722 | } |
723 | \ No newline at end of file |
724 | |
725 | === modified file 'xubuntu-fifteen/style-common.css' |
726 | --- xubuntu-fifteen/style-common.css 2016-08-28 23:39:44 +0000 |
727 | +++ xubuntu-fifteen/style-common.css 2016-12-15 07:46:28 +0000 |
728 | @@ -1,4 +1,5 @@ |
729 | -/* SELECTION |
730 | +/* |
731 | + * Selection style |
732 | * |
733 | */ |
734 | |
735 | @@ -7,7 +8,8 @@ |
736 | color: #fff; |
737 | } |
738 | |
739 | -/* ELEMENTS |
740 | +/* |
741 | + * Elements |
742 | * |
743 | */ |
744 | |
745 | @@ -26,24 +28,23 @@ |
746 | a:active, |
747 | a:focus { |
748 | color: #13385e; |
749 | - border-bottom: 1px solid #3c3c3c; |
750 | - } |
751 | - #header a { |
752 | - border-bottom: none; |
753 | - } |
754 | - #sidebar ul li a { |
755 | + } |
756 | + main a:hover, |
757 | + main a:active, |
758 | + main a:focus { |
759 | + border-bottom: 1px solid #3c3c3c; |
760 | + } |
761 | + aside ul li a { |
762 | display: block; |
763 | - border: none; |
764 | } |
765 | |
766 | - #footer a { |
767 | + footer a { |
768 | color: #333; |
769 | - border-bottom: none; |
770 | transition: none; |
771 | } |
772 | - #footer a:hover, |
773 | - #footer a:active, |
774 | - #footer a:focus { |
775 | + footer a:hover, |
776 | + footer a:active, |
777 | + footer a:focus { |
778 | color: #2c82dd; |
779 | text-decoration: underline; |
780 | } |
781 | @@ -106,7 +107,7 @@ |
782 | .post-excerpt h2, |
783 | .post-list h2, |
784 | .post-post h2, |
785 | - #sidebar h2 { |
786 | + aside h2 { |
787 | border-top: 1px dotted #ccc; |
788 | padding-top: 0.5em; |
789 | } |
790 | @@ -130,84 +131,107 @@ |
791 | border-bottom: 1px solid #dadada; |
792 | } |
793 | |
794 | +main img { |
795 | + max-width: 100%; |
796 | + height: auto; |
797 | + |
798 | + border-radius: 3px; |
799 | + box-shadow: 1px 1px 5px rgba( 0, 0, 0, 0.2 ); |
800 | +} |
801 | + main img.plain { |
802 | + border-radius: 0; |
803 | + box-shadow: none; |
804 | + } |
805 | + |
806 | li { list-style-position: inside; } |
807 | - #main li { margin-bottom: 0.2em; list-style-position: outside; margin-left: 1.2em; } |
808 | - #main ul li { list-style-type: disc; } |
809 | - #main ul.link-list li, |
810 | - #main .post-list ul li, |
811 | - #main .post-post ul li { |
812 | - list-style-type: none; |
813 | - margin-left: 1em; |
814 | - } |
815 | - #main ul.link-list li:before, |
816 | - #main .post-list ul li:before, |
817 | - #main .post-post ul li:before { |
818 | - display: block; |
819 | - float: left; |
820 | - |
821 | - width: 0.7em; |
822 | - margin-left: -0.7em; |
823 | - margin-top: -0.12em; |
824 | - content: "›"; |
825 | - font-weight: 300; |
826 | - font-size: 140%; |
827 | - color: #555; |
828 | - } |
829 | - #main ol li { list-style-type: decimal; margin-left: 1.6em; } |
830 | - #archive-posts ul li { list-style-type: none; margin-left: 0; } |
831 | - #archive-posts ul li .post-time { display: inline-block; width: 25%; margin-right: 5px; } |
832 | - #sidebar ul li { |
833 | - list-style-type: none; |
834 | - margin-left: 1em; |
835 | - } |
836 | - #sidebar ul li:before { |
837 | - display: block; |
838 | - float: left; |
839 | - |
840 | - width: 0.7em; |
841 | - margin-left: -0.7em; |
842 | - margin-top: -0.12em; |
843 | - content: "›"; |
844 | - font-weight: 300; |
845 | - font-size: 140%; |
846 | - color: #555; |
847 | - } |
848 | - |
849 | - |
850 | -p { } |
851 | + main li { margin-bottom: 0.2em; list-style-position: outside; margin-left: 1.2em; } |
852 | + main ul li { list-style-type: disc; } |
853 | + main ul.link-list li, |
854 | + main .post-list ul li, |
855 | + main .post-post ul li { |
856 | + list-style-type: none; |
857 | + margin-left: 1em; |
858 | + } |
859 | + main ul.link-list li:before, |
860 | + main .post-list ul li:before, |
861 | + main .post-post ul li:before { |
862 | + display: block; |
863 | + float: left; |
864 | + |
865 | + width: 0.7em; |
866 | + margin-left: -0.7em; |
867 | + margin-top: -0.12em; |
868 | + content: "›"; |
869 | + font-weight: 300; |
870 | + font-size: 140%; |
871 | + color: #555; |
872 | + } |
873 | + main ol li { list-style-type: decimal; margin-left: 1.6em; } |
874 | + aside ul li { |
875 | + list-style-type: none; |
876 | + margin-left: 1em; |
877 | + } |
878 | + aside ul li:before { |
879 | + display: block; |
880 | + float: left; |
881 | + |
882 | + width: 0.7em; |
883 | + margin-left: -0.7em; |
884 | + margin-top: -0.12em; |
885 | + content: "›"; |
886 | + font-weight: 300; |
887 | + font-size: 140%; |
888 | + color: #555; |
889 | + } |
890 | |
891 | table { |
892 | width: 100%; |
893 | } |
894 | -table td { |
895 | - border: 1px solid #ccc; |
896 | - background-color: #f6f6f6; |
897 | - padding: 3px; |
898 | -} |
899 | -table th { |
900 | - text-align: left; |
901 | -} |
902 | - |
903 | -/* TEMPLATES |
904 | - * |
905 | - */ |
906 | - |
907 | -/* Aligned images |
908 | - * Usage: TinyMCE |
909 | - * |
910 | - */ |
911 | - |
912 | -.alignright { float: right; margin: 0 0 0 20px; } |
913 | -.alignleft { float: left; margin: 0 20px 0 0; } |
914 | - |
915 | -.alignright a, .alignleft a, .aligncenter a { |
916 | - border-bottom: none; |
917 | -} |
918 | - |
919 | -img.alignright, img.alignleft, img.aligncenter, |
920 | -.alignright img, .alignleft img, .aligncenter img { |
921 | - border-radius: 3px; |
922 | -} |
923 | + table td { |
924 | + border: 1px solid #ccc; |
925 | + background-color: #f6f6f6; |
926 | + padding: 3px; |
927 | + } |
928 | + table th { |
929 | + text-align: left; |
930 | + } |
931 | + |
932 | +/* |
933 | + * Templates |
934 | + * |
935 | + */ |
936 | + |
937 | +/* Aligned images (TinyMCE) */ |
938 | + |
939 | +.alignright, |
940 | +.alignleft { |
941 | + max-width: 310px; |
942 | + height: auto; |
943 | +} |
944 | + .alignleft img, |
945 | + .alignright img { |
946 | + max-width: 300px; |
947 | + height: auto; |
948 | + } |
949 | + |
950 | + .alignright { |
951 | + float: right; |
952 | + margin: 0 0 0 2em; |
953 | + } |
954 | + |
955 | + .alignleft { |
956 | + float: left; |
957 | + margin: 0 2em 0 0; |
958 | + } |
959 | + |
960 | + .aligncenter { |
961 | + display: block; |
962 | + margin: 0 auto; |
963 | + } |
964 | + |
965 | + .alignright a, .alignleft a, .aligncenter a { |
966 | + border-bottom: none !important; |
967 | + } |
968 | |
969 | .wp-caption-text { |
970 | text-align: center; |
971 | @@ -215,15 +239,8 @@ |
972 | padding-bottom: 0.3em; |
973 | } |
974 | |
975 | -.aligncenter { |
976 | - display: block; |
977 | - margin: 0 auto; |
978 | -} |
979 | +/* Gallery styling (WordPress) */ |
980 | |
981 | -/* Gallery styling |
982 | - * Usage: WordPress |
983 | - * |
984 | - */ |
985 | div.gallery { |
986 | width: 100%; |
987 | } |
988 | @@ -260,39 +277,60 @@ |
989 | div.gallery-columns-4 figure:nth-child(4n+3) { margin-left: 1%; margin-right: 2%; } |
990 | div.gallery-columns-4 figure:nth-child(4n+5) { clear: left; } |
991 | |
992 | -div.gallery figure img { |
993 | - max-width: 100%; |
994 | - height: auto; |
995 | - |
996 | - border-radius: 3px; |
997 | - box-shadow: 1px 1px 5px rgba( 0, 0, 0, 0.2 ); |
998 | -} |
999 | - |
1000 | div.gallery a { |
1001 | border-bottom: none; |
1002 | } |
1003 | |
1004 | -/* Preface |
1005 | - * Usage: manual |
1006 | - * |
1007 | - */ |
1008 | -p.preface { |
1009 | - margin: 2em 0; |
1010 | - padding: 1.5em 0; |
1011 | - |
1012 | - word-spacing: 0.2em; |
1013 | - line-height: 1.8em; |
1014 | - |
1015 | - font-size: 90%; |
1016 | - font-weight: 600; |
1017 | - border-top: 1px solid #d2d2d2; |
1018 | - border-bottom: 1px solid #d2d2d2; |
1019 | +/* Link buttons (TinyMCE, manual, content.php) */ |
1020 | + |
1021 | +a.button { |
1022 | + display: inline-block; |
1023 | + |
1024 | + margin: 0 0.5em 0.5em 0; |
1025 | + padding: 0.5em 0.75em; |
1026 | + |
1027 | + background-color: #fff; |
1028 | + box-shadow: 0 0 5px rgba( 0, 0, 0, 0.1 ); |
1029 | + |
1030 | + border: none; |
1031 | + border-bottom: 2px solid #ccc; |
1032 | } |
1033 | - |
1034 | -/* Section highlighting |
1035 | - * Usage: TinyMCE |
1036 | - * |
1037 | - */ |
1038 | + a.button:hover, a.button:active, a.button:focus { |
1039 | + box-shadow: 0 0 5px rgba( 0, 0, 0, 0.3 ); |
1040 | + border-bottom: 2px solid #999; |
1041 | + } |
1042 | + a.button:after { |
1043 | + display: block; |
1044 | + float: right; |
1045 | + |
1046 | + content: "›"; |
1047 | + font-weight: 300; |
1048 | + font-size: 140%; |
1049 | + margin: -0.1em 0 0 0.5em; |
1050 | + color: #555; |
1051 | + } |
1052 | + a.button.primary { |
1053 | + border-bottom: 2px solid #7cb8f7; |
1054 | + } |
1055 | + a.button.primary:hover, a.button.primary:active, a.button.primary:focus { |
1056 | + border-bottom: 2px solid #2c82dd; |
1057 | + } |
1058 | + a.button.back:after { |
1059 | + float: left; |
1060 | + content: "‹"; |
1061 | + margin: -0.1em 0.5em 0 0; |
1062 | + } |
1063 | + a.button.clean:after { |
1064 | + margin: 0; |
1065 | + content: ""; |
1066 | + } |
1067 | + .post-pagination a.button.forward { |
1068 | + float: right; |
1069 | + margin-right: 0; |
1070 | + } |
1071 | + |
1072 | +/* Section highlighting (TinyMCE) */ |
1073 | + |
1074 | .hb { |
1075 | margin: 2em 0; |
1076 | padding: 10px 25px 10px 25px; |
1077 | @@ -357,61 +395,10 @@ |
1078 | color: rgba( 200, 40, 5, 1 ); |
1079 | } |
1080 | |
1081 | -/* Button styles |
1082 | - * Usage: TinyMCE, manual, content.php, widget |
1083 | - * |
1084 | - */ |
1085 | - |
1086 | -a.button { |
1087 | - display: inline-block; |
1088 | - |
1089 | - margin: 0 0.5em 0.5em 0; |
1090 | - padding: 0.5em 0.75em; |
1091 | - |
1092 | - background-color: #fff; |
1093 | - box-shadow: 0 0 5px rgba( 0, 0, 0, 0.1 ); |
1094 | - |
1095 | - border: none; |
1096 | - border-bottom: 2px solid #ccc; |
1097 | -} |
1098 | - a.button:hover, a.button:active, a.button:focus { |
1099 | - box-shadow: 0 0 5px rgba( 0, 0, 0, 0.3 ); |
1100 | - border-bottom: 2px solid #999; |
1101 | - } |
1102 | - a.button:after { |
1103 | - display: block; |
1104 | - float: right; |
1105 | - |
1106 | - content: "›"; |
1107 | - font-weight: 300; |
1108 | - font-size: 140%; |
1109 | - margin: -0.1em 0 0 0.5em; |
1110 | - color: #555; |
1111 | - } |
1112 | - a.button.primary { |
1113 | - border-bottom: 2px solid #7cb8f7; |
1114 | - } |
1115 | - a.button.primary:hover, a.button.primary:active, a.button.primary:focus { |
1116 | - border-bottom: 2px solid #2c82dd; |
1117 | - } |
1118 | - a.button.back:after { |
1119 | - float: left; |
1120 | - content: "‹"; |
1121 | - margin: -0.1em 0.5em 0 0; |
1122 | - } |
1123 | - a.button.clean:after { |
1124 | - margin: 0; |
1125 | - content: ""; |
1126 | - } |
1127 | - .post-pagination a.button.forward { |
1128 | - float: right; |
1129 | - margin-right: 0; |
1130 | - } |
1131 | - |
1132 | -/* List in columns |
1133 | - * Usage: TinyMCE |
1134 | - * |
1135 | - */ |
1136 | + |
1137 | + |
1138 | +/* List in columns (TinyMCE) */ |
1139 | + |
1140 | ul.columnlist { |
1141 | -moz-column-gap: 1em; |
1142 | -webkit-column-gap: 1em; |
1143 | @@ -422,108 +409,22 @@ |
1144 | column-count: 3; |
1145 | } |
1146 | |
1147 | -/* Classes for menus |
1148 | - * Usage: manual |
1149 | +/* |
1150 | + * DEPRECATED |
1151 | * |
1152 | */ |
1153 | -.menu .strong { |
1154 | + |
1155 | +/* Preface (manual) */ |
1156 | + |
1157 | +p.preface { |
1158 | + margin: 2em 0; |
1159 | + padding: 1.5em 0; |
1160 | + |
1161 | + word-spacing: 0.2em; |
1162 | + line-height: 1.8em; |
1163 | + |
1164 | + font-size: 90%; |
1165 | font-weight: 600; |
1166 | -} |
1167 | - |
1168 | -/* Boxed content |
1169 | - * Usage: template_blank.php, TinyMCE, (template_gallery.php) |
1170 | - * |
1171 | - */ |
1172 | -.boxed { |
1173 | - margin-bottom: 1em; |
1174 | - |
1175 | - background-color: #fff; |
1176 | - border-radius: 3px; |
1177 | - box-shadow: 0 0 5px rgba( 0, 0, 0, 0.05 ); |
1178 | -} |
1179 | - .boxed h2 { |
1180 | - margin-top: 0; |
1181 | - } |
1182 | - h1.boxed { |
1183 | - padding: 0.3em 35px; |
1184 | - } |
1185 | - div.boxed { |
1186 | - padding: 35px; |
1187 | - } |
1188 | - div.boxed *:last-child { |
1189 | - margin-bottom: 0; |
1190 | - } |
1191 | - |
1192 | -/* Featured image |
1193 | - * Usage: content.php |
1194 | - * |
1195 | - */ |
1196 | -.post-thumbnail { |
1197 | - float: right; |
1198 | - margin: -1em 0 2em 2em; |
1199 | - |
1200 | - max-width: 400px; |
1201 | - height: auto; |
1202 | -} |
1203 | - body.home .post-thumbnail { |
1204 | - margin-top: 0; |
1205 | - } |
1206 | - /* Adjust the inline header on the front page to allow the floating image */ |
1207 | - body.home .post-post h1 { |
1208 | - display: inline; |
1209 | - } |
1210 | - body.home .post-post h1:after { |
1211 | - display: block; |
1212 | - content: ""; |
1213 | - margin-bottom: 1em; |
1214 | - } |
1215 | - |
1216 | -/* Featured image alignment in a gallery |
1217 | - * Usage: template_featured-gallery.php |
1218 | - * |
1219 | - */ |
1220 | -.featured { |
1221 | - margin-bottom: 2em; |
1222 | -} |
1223 | - |
1224 | - .featured .image { |
1225 | - float: left; |
1226 | - |
1227 | - width: 50%; |
1228 | - } |
1229 | - .featured .image img { |
1230 | - max-width: 100%; |
1231 | - float: right; |
1232 | - height: auto; |
1233 | - |
1234 | - border-radius: 3px; |
1235 | - box-shadow: 1px 1px 5px rgba( 0, 0, 0, 0.2 ); |
1236 | - } |
1237 | - |
1238 | - .featured .description { |
1239 | - float: right; |
1240 | - width: 45%; |
1241 | - } |
1242 | - |
1243 | - .featured .description h2:first-child { |
1244 | - margin-top: 0; |
1245 | - } |
1246 | - |
1247 | -/* Release list styling |
1248 | - * Usage: content-*.php |
1249 | - * |
1250 | - */ |
1251 | - |
1252 | -.releases .nobullet::before { |
1253 | - content: " " !important; |
1254 | -} |
1255 | -.releases .show-eol { |
1256 | - color: rgba( 0, 0, 0, 0.5 ); |
1257 | - margin-left: -1em; |
1258 | -} |
1259 | -.releases .eol a::before { |
1260 | - content: "EOL"; |
1261 | - font-size: 90%; |
1262 | - margin-right: 0.5em; |
1263 | - color: rgba( 0, 0, 0, 0.5 ); |
1264 | + border-top: 1px solid #d2d2d2; |
1265 | + border-bottom: 1px solid #d2d2d2; |
1266 | } |
1267 | \ No newline at end of file |
1268 | |
1269 | === modified file 'xubuntu-fifteen/style-editor.css' |
1270 | --- xubuntu-fifteen/style-editor.css 2015-12-30 13:33:04 +0000 |
1271 | +++ xubuntu-fifteen/style-editor.css 2016-12-15 07:46:28 +0000 |
1272 | @@ -1,20 +1,12 @@ |
1273 | body { |
1274 | font-size: small; |
1275 | - font-family: "Open Sans", sans-serif !important; |
1276 | + font-family: 'Open Sans', sans-serif !important; |
1277 | line-height: 1.5em; |
1278 | |
1279 | background-color: #fafafa; |
1280 | color: #3c3c3c; |
1281 | } |
1282 | |
1283 | -.group:after { |
1284 | - content: "."; |
1285 | - display: block; |
1286 | - height: 0; |
1287 | - clear: both; |
1288 | - visibility: hidden; |
1289 | -} |
1290 | - |
1291 | /* Elements |
1292 | * |
1293 | */ |
1294 | @@ -92,11 +84,6 @@ |
1295 | overflow: visible !important; |
1296 | } |
1297 | |
1298 | -div.boxed { |
1299 | - /* Use less padding for editor */ |
1300 | - padding: 15px !important; |
1301 | -} |
1302 | - |
1303 | |
1304 | /* Responsive styles |
1305 | * |
1306 | |
1307 | === modified file 'xubuntu-fifteen/style-resp-1000.css' |
1308 | --- xubuntu-fifteen/style-resp-1000.css 2016-01-03 22:40:57 +0000 |
1309 | +++ xubuntu-fifteen/style-resp-1000.css 2016-12-15 07:46:28 +0000 |
1310 | @@ -1,23 +1,9 @@ |
1311 | -/* For screen sizes less than 1000px wide */ |
1312 | - |
1313 | -#content, #header, #header_art, #footer, |
1314 | -#navi, #content_gallery, |
1315 | -body.home #main, .widgets_inner { |
1316 | - min-width: 0; |
1317 | -} |
1318 | - |
1319 | -/* Templates */ |
1320 | -#archive-posts span.post-time, |
1321 | -#archive-posts a { |
1322 | - display: block; |
1323 | - width: 100% !important; |
1324 | -} |
1325 | - |
1326 | -#archive-posts span.post-time { |
1327 | - color: #777; |
1328 | -} |
1329 | - |
1330 | -/* Horizontal navigation */ |
1331 | +/* |
1332 | + * Navigation |
1333 | + * |
1334 | + */ |
1335 | + |
1336 | +/* Navigation, horizontal */ |
1337 | .navigation.nh .menu { |
1338 | overflow: hidden; |
1339 | flex-wrap: wrap; |
1340 | @@ -42,4 +28,21 @@ |
1341 | } |
1342 | .navigation.nh .menu > li:last-child:nth-child(3n+2) { |
1343 | margin-right: 33.3%; |
1344 | - } |
1345 | \ No newline at end of file |
1346 | + } |
1347 | + |
1348 | +/* |
1349 | + * Templates |
1350 | + * |
1351 | + */ |
1352 | + |
1353 | +/* Post lists */ |
1354 | + |
1355 | +.posts-list span.post-time, |
1356 | +.posts-list a { |
1357 | + display: block; |
1358 | + width: 100% !important; |
1359 | +} |
1360 | + |
1361 | +.posts-list span.post-time { |
1362 | + color: #777; |
1363 | +} |
1364 | \ No newline at end of file |
1365 | |
1366 | === modified file 'xubuntu-fifteen/style-resp-1200.css' |
1367 | --- xubuntu-fifteen/style-resp-1200.css 2016-01-03 22:40:57 +0000 |
1368 | +++ xubuntu-fifteen/style-resp-1200.css 2016-12-15 07:46:28 +0000 |
1369 | @@ -1,25 +1,11 @@ |
1370 | -#content, #header, #header_art, #footer, |
1371 | -#navi, #content_gallery, |
1372 | -body.home #main, .widgets_inner { |
1373 | +/* |
1374 | + * Content width |
1375 | + * |
1376 | + */ |
1377 | + |
1378 | +header #logo, header nav, header::after, |
1379 | +#content, |
1380 | +body.home main, .widgets_front .widgets, |
1381 | +footer { |
1382 | width: 95%; |
1383 | } |
1384 | - |
1385 | -/* Front page */ |
1386 | -body.home .alignright, |
1387 | -body.home .alignleft { |
1388 | - max-width: 100%; |
1389 | - height: auto; |
1390 | -} |
1391 | - |
1392 | -/* Templates */ |
1393 | -.alignright, |
1394 | -.alignleft { |
1395 | - max-width: 310px; |
1396 | - height: auto; |
1397 | -} |
1398 | - |
1399 | -.alignright img, |
1400 | -.alignleft img { |
1401 | - max-width: 300px; |
1402 | - height: auto; |
1403 | -} |
1404 | \ No newline at end of file |
1405 | |
1406 | === removed file 'xubuntu-fifteen/style-resp-450.css' |
1407 | --- xubuntu-fifteen/style-resp-450.css 2016-07-30 22:59:42 +0000 |
1408 | +++ xubuntu-fifteen/style-resp-450.css 1970-01-01 00:00:00 +0000 |
1409 | @@ -1,161 +0,0 @@ |
1410 | -body { |
1411 | - min-width: 300px; |
1412 | -} |
1413 | - |
1414 | -#header { } |
1415 | - #logo { |
1416 | - max-width: 90%; |
1417 | - padding: 0; |
1418 | - margin: 0 0 0.5em -8px; |
1419 | - } |
1420 | - |
1421 | - #logo img { |
1422 | - max-width: 80%; |
1423 | - height: auto; |
1424 | - padding: 0.7em; |
1425 | - margin-left: 2.5%; |
1426 | - } |
1427 | - |
1428 | - #header #navi { |
1429 | - display: none; |
1430 | - } |
1431 | - |
1432 | -#content { } |
1433 | - #main { |
1434 | - padding: 1em 2.5% 0 2.5% !important; |
1435 | - font-size: 90%; |
1436 | - } |
1437 | - #sidebar { |
1438 | - |
1439 | - } |
1440 | - |
1441 | -#footer { } |
1442 | - #footer_navi .menu > li { |
1443 | - float: left; |
1444 | - clear: none; |
1445 | - width: 100% !important; |
1446 | - |
1447 | - margin: 0 !important; |
1448 | - border: none !important; |
1449 | - } |
1450 | - #footer_navi li { |
1451 | - padding-right: 0; |
1452 | - } |
1453 | - |
1454 | - |
1455 | -/* Front page |
1456 | - * |
1457 | - */ |
1458 | - |
1459 | -body.home #main { |
1460 | - width: auto; |
1461 | - margin: 0; |
1462 | -} |
1463 | - body.home h1 { |
1464 | - font-size: 140%; |
1465 | - } |
1466 | - |
1467 | - body.home p { |
1468 | - font-size: 95%; |
1469 | - } |
1470 | - |
1471 | -/* Elements |
1472 | - * |
1473 | - */ |
1474 | - |
1475 | -#main a { |
1476 | - display: inline-block; |
1477 | - overflow: hidden; |
1478 | - |
1479 | - max-width: 95%; |
1480 | - margin-bottom: -0.6em; |
1481 | -} |
1482 | - #main a.button { |
1483 | - margin-bottom: 0.5em; |
1484 | - } |
1485 | - |
1486 | -figure { |
1487 | - width: 100% !important; |
1488 | - text-align: center; |
1489 | -} |
1490 | - #main figure a { |
1491 | - max-width: 100% !important; |
1492 | - } |
1493 | - |
1494 | -/* Templates |
1495 | - * |
1496 | - */ |
1497 | -.navigation.nd .menu > li > a { |
1498 | - padding-left: 2.5%; |
1499 | - padding-right: 2.5%; |
1500 | -} |
1501 | -.navigation.nd .menu li .sub-menu li { |
1502 | - float: left; |
1503 | - display: block; |
1504 | - width: 100%; |
1505 | - margin: 0 !important; |
1506 | - border-bottom: 1px solid #f1f1f1; |
1507 | - overflow: hidden; |
1508 | -} |
1509 | - .navigation.nd .menu li .sub-menu li a { |
1510 | - display: block; |
1511 | - padding: 0.25em 2.5%; |
1512 | - border-right: none; |
1513 | - } |
1514 | - |
1515 | -#opennavi, |
1516 | -#navi li.menu-item-has-children .expand { |
1517 | - right: 2.5%; |
1518 | -} |
1519 | - #opennavi { |
1520 | - margin-right: -3px; |
1521 | - } |
1522 | - |
1523 | -#footer_navi .menu > li { |
1524 | - padding: 0 0 1em 0 !important; |
1525 | - margin-bottom: 1em !important; |
1526 | - |
1527 | - border-bottom: 1px solid rgba( 0, 0, 0, 0.10 ) !important; |
1528 | -} |
1529 | - #footer_navi .menu > li:last-child { |
1530 | - padding-bottom: 0 !important; |
1531 | - border-bottom: none !important; |
1532 | - } |
1533 | - |
1534 | - |
1535 | -.boxed { |
1536 | - padding: 1.5em 2.5% !important; |
1537 | -} |
1538 | - h1.boxed { |
1539 | - padding: 0.3em 2.5% !important; |
1540 | - } |
1541 | - |
1542 | -.hb { |
1543 | - border-left: none; |
1544 | - border-top-width: 0.4em; |
1545 | - border-top-style: solid; |
1546 | - |
1547 | - padding: 5px 15px; |
1548 | -} |
1549 | - .hb > :first-child { margin-top: 5px; } |
1550 | - |
1551 | -ul.columnlist { |
1552 | - -moz-column-gap: 0; |
1553 | - -webkit-column-gap: 0; |
1554 | - column-gap: 0; |
1555 | - |
1556 | - -moz-column-count: 1; |
1557 | - -webkit-column-count: 1; |
1558 | - column-count: 1; |
1559 | -} |
1560 | - |
1561 | -.post-meta { |
1562 | - margin-top: 1em; |
1563 | -} |
1564 | - .post-meta a { |
1565 | - display: inline !important; |
1566 | - } |
1567 | - |
1568 | -#archive-posts .post-time { |
1569 | - font-size: 85%; |
1570 | -} |
1571 | |
1572 | === modified file 'xubuntu-fifteen/style-resp-600.css' |
1573 | --- xubuntu-fifteen/style-resp-600.css 2016-07-30 22:59:42 +0000 |
1574 | +++ xubuntu-fifteen/style-resp-600.css 2016-12-15 07:46:28 +0000 |
1575 | @@ -1,210 +1,182 @@ |
1576 | -/* For screen sizes less than 600px wide */ |
1577 | - |
1578 | html { |
1579 | background-image: none; |
1580 | } |
1581 | |
1582 | body { |
1583 | padding-bottom: 0.3em; |
1584 | + min-width: 480px; |
1585 | } |
1586 | |
1587 | -#content, #header, #header_art, #footer { |
1588 | +/* |
1589 | + * Content width |
1590 | + * |
1591 | + */ |
1592 | + |
1593 | +header #logo, header nav, |
1594 | +#content, |
1595 | +footer { |
1596 | width: 100%; |
1597 | border-radius: 0; |
1598 | } |
1599 | - #header_outer { |
1600 | - z-index: 5000; |
1601 | - } |
1602 | - #header { |
1603 | - padding: 0; |
1604 | - } |
1605 | - #header_art { |
1606 | + |
1607 | +/* |
1608 | + * Header |
1609 | + * |
1610 | + */ |
1611 | + |
1612 | +header { |
1613 | + z-index: 5000; |
1614 | + |
1615 | + background-image: none !important; |
1616 | + border-top: none; |
1617 | +} |
1618 | + header::after { |
1619 | + display: none; |
1620 | + } |
1621 | + /* Fixed positioning on scroll */ |
1622 | + header.scrolled { |
1623 | + position: fixed; |
1624 | + top: 0; |
1625 | + left: 0; |
1626 | + width: 100%; |
1627 | + } |
1628 | + header.scrolled #navi { |
1629 | + width: 100%; |
1630 | + position: fixed; |
1631 | + left: 0; |
1632 | + z-index: 50000; |
1633 | + } |
1634 | + |
1635 | + #logo { |
1636 | + margin: 0; |
1637 | + padding: 0.5em 3.5%; |
1638 | + } |
1639 | + #logo a img { |
1640 | display: none; |
1641 | } |
1642 | + /* Show a compact version of the Xubuntu logo */ |
1643 | + #logo a:after { |
1644 | + font-size: 120%; |
1645 | + font-weight: 600; |
1646 | + |
1647 | + padding-right: 30px; |
1648 | + |
1649 | + background: transparent url(images/xubuntu-icon-20.png) 100% 50% no-repeat; |
1650 | + content: "Xubuntu"; |
1651 | + |
1652 | + color: #fff; |
1653 | + } |
1654 | + |
1655 | #navi { |
1656 | - width: 100%; |
1657 | - font-size: 100%; |
1658 | + font-size: 90%; |
1659 | + |
1660 | + background-color: #0e82d0; |
1661 | } |
1662 | - #navi .navigation .sub-menu .current_page_item a { |
1663 | - background-color: inherit; |
1664 | - border-radius: 0; |
1665 | - box-shadow: none; |
1666 | - } |
1667 | - a#opennavi { |
1668 | - z-index: 6000; |
1669 | - } |
1670 | - |
1671 | -#content_outer { |
1672 | + nav#navi_quick { |
1673 | + display: block !important; |
1674 | + |
1675 | + padding: 0.5em 40px 0.5em 3.5%; |
1676 | + background-color: rgba( 0, 0, 0, 0.2 ); |
1677 | + border-top: 1px solid rgba( 255, 255, 255, 0.2 ); |
1678 | + } |
1679 | + nav#navi_quick li { |
1680 | + font-size: 90%; |
1681 | + display: inline; |
1682 | + } |
1683 | + nav#navi_quick a { |
1684 | + display: inline; |
1685 | + margin-right: 1em; |
1686 | + |
1687 | + color: #fff; |
1688 | + font-weight: 600; |
1689 | + white-space: nowrap; |
1690 | + } |
1691 | + |
1692 | + #navi.open .navigation.nd .menu li.current-menu-ancestor-hidden .sub-menu { display: none; } |
1693 | + #navi.open .navigation.nd .menu li { display: block; } |
1694 | + |
1695 | + #navi .navigation.nd > ul > li { |
1696 | + background-color: rgba( 255, 255, 255, 0.25 ); |
1697 | + } |
1698 | + #navi li.menu-item-has-children .expand { |
1699 | + display: none; |
1700 | + |
1701 | + position: relative; |
1702 | + right: 3.5%; |
1703 | + top: 0; |
1704 | + |
1705 | + float: right; |
1706 | + z-index: 2000; |
1707 | + |
1708 | + height: 32px; |
1709 | + width: 32px; |
1710 | + padding: 0; |
1711 | + margin-right: -4px; |
1712 | + |
1713 | + background: transparent url(images/menu_arrow.png) 50% 50% no-repeat; |
1714 | + } |
1715 | + #navi.open li.menu-item-has-children .expand { |
1716 | + display: block; |
1717 | + transition: 200ms transform; |
1718 | + } |
1719 | + #navi .open-sub .sub-menu { |
1720 | + display: block !important; |
1721 | + margin: 0; |
1722 | + padding: 0; |
1723 | + } |
1724 | + #navi .open-sub li.menu-item-has-children .expand { |
1725 | + transform: rotate( -90deg ); |
1726 | + background-size: 65% 65%; |
1727 | + } |
1728 | + |
1729 | + |
1730 | + /* Button to open hidden dropdown navigation */ |
1731 | + #opennavi { |
1732 | + position: absolute; |
1733 | + z-index: 2000; |
1734 | + |
1735 | + display: block; |
1736 | + float: right; |
1737 | + |
1738 | + top: 0.15em; |
1739 | + right: 2.5%; |
1740 | + |
1741 | + width: 2.8em; |
1742 | + height: 2.8em; |
1743 | + |
1744 | + overflow: hidden; |
1745 | + |
1746 | + background: transparent url(images/menu.png) 50% 50% no-repeat; |
1747 | + } |
1748 | + |
1749 | +/* |
1750 | + * Main content area |
1751 | + * |
1752 | + */ |
1753 | + |
1754 | +section#middle { |
1755 | padding: 0; |
1756 | } |
1757 | - body.attachment #content.air { |
1758 | - padding-top: 1em; |
1759 | - } |
1760 | - #content.air { |
1761 | - padding-bottom: 0; |
1762 | - } |
1763 | - #content.air div.gallery { |
1764 | - width: 95%; |
1765 | - margin: 0 auto; |
1766 | - } |
1767 | - #content.air .boxed { |
1768 | - border-radius: 0; |
1769 | - } |
1770 | - #content.air h1.boxed { |
1771 | - margin-bottom: 0.5em; |
1772 | - box-shadow: inset 0 10px 5px -5px rgba( 0, 0, 0, 0.1 ); |
1773 | - } |
1774 | - #content.air .gallery + .boxed { |
1775 | - margin-top: 1.5em; |
1776 | - } |
1777 | - #main, |
1778 | - #sidebar { |
1779 | - padding: 1em 2.5% !important; |
1780 | - } |
1781 | - |
1782 | - #main .post-post { |
1783 | - max-width: 100%; |
1784 | - } |
1785 | - |
1786 | - #main figure, |
1787 | - #main figure img, |
1788 | - #main img { |
1789 | - max-width: 100%; |
1790 | - height: auto; |
1791 | - |
1792 | - padding: 0; |
1793 | - margin: 0; |
1794 | - } |
1795 | - #main figure figcaption { |
1796 | - margin-right: 0; |
1797 | - } |
1798 | - |
1799 | -#footer { |
1800 | - padding: 0 2.5%; |
1801 | -} |
1802 | - |
1803 | -/* Clear all floats and center-align |
1804 | - * |
1805 | - */ |
1806 | -#main figure[style*="float"], |
1807 | -.alignleft, |
1808 | -.alignright, |
1809 | -.aligncenter { |
1810 | - display: block; |
1811 | - float: none !important; |
1812 | - text-align: center; |
1813 | - margin: 0 auto !important; |
1814 | -} |
1815 | - |
1816 | -/* Home page */ |
1817 | -body.home #main { |
1818 | - width: 95%; |
1819 | -} |
1820 | - |
1821 | -/* Widget areas */ |
1822 | -.widgets_outer .widgets { |
1823 | - width: 95%; |
1824 | -} |
1825 | - |
1826 | -/* Attachments */ |
1827 | -#attachment { |
1828 | - width: 95%; |
1829 | - margin: 0.5em auto; |
1830 | -} |
1831 | - #attachment_navi { |
1832 | - font-size: 90%; |
1833 | - margin-bottom: 0; |
1834 | - } |
1835 | - body.attachment .boxed { |
1836 | - padding: 1em 0; |
1837 | - margin: 1em 0 -1em 0; |
1838 | - } |
1839 | - body.attachment .boxed { |
1840 | - margin-bottom: 1em; |
1841 | - } |
1842 | - |
1843 | -/* Elements and templates */ |
1844 | -blockquote { |
1845 | - max-width: 90%; |
1846 | -} |
1847 | - |
1848 | -figure { |
1849 | - width: 100% !important; |
1850 | - text-align: center; |
1851 | -} |
1852 | - #content figure a { |
1853 | - max-width: 100% !important; |
1854 | - } |
1855 | - |
1856 | - .gallery figure { |
1857 | - width: 100%; !important; |
1858 | - padding: 0; |
1859 | - margin: 0; |
1860 | - } |
1861 | - |
1862 | - #content.air .gallery-item { |
1863 | - margin: 0 0 0.5em 0; |
1864 | - } |
1865 | - |
1866 | -ul.columnlist { |
1867 | - -moz-column-gap: 1em; |
1868 | - -webkit-column-gap: 1em; |
1869 | - column-gap: 1em; |
1870 | - |
1871 | - -moz-column-count: 2; |
1872 | - -webkit-column-count: 2; |
1873 | - column-count: 2; |
1874 | -} |
1875 | - |
1876 | -#main figure, |
1877 | -#main figure img, |
1878 | -#main img { |
1879 | - margin-top: 0.5em; |
1880 | - margin-bottom: 0.5em; |
1881 | -} |
1882 | - |
1883 | -.boxed { |
1884 | - padding: 1.5em 2.5% !important; |
1885 | -} |
1886 | - h1.boxed { |
1887 | - padding: 0.3em 2.5% !important; |
1888 | - } |
1889 | - |
1890 | -.hb { |
1891 | - padding: 5px 20px; |
1892 | -} |
1893 | - |
1894 | -/* Featured images */ |
1895 | -.post-thumbnail { |
1896 | - display: block !important; |
1897 | - max-width: 100%; |
1898 | - width: 100%; |
1899 | - margin: 0 0 1em 0; |
1900 | - text-align: center; |
1901 | -} |
1902 | - .post-thumbnail img { |
1903 | - max-height: 120px; |
1904 | - width: auto; |
1905 | - } |
1906 | - |
1907 | -.featured { |
1908 | - width: 95%; |
1909 | - margin: 0 auto; |
1910 | -} |
1911 | - |
1912 | - |
1913 | -/* WordPress admin bar */ |
1914 | -#wpadminbar, #wp-toolbar { |
1915 | - display: none; |
1916 | -} |
1917 | - |
1918 | -body.admin-bar { |
1919 | - margin-top: -46px !important; |
1920 | -} |
1921 | - |
1922 | -/* NAVIGATION |
1923 | - * |
1924 | - */ |
1925 | + body.home #content, |
1926 | + #content { |
1927 | + padding: 1em 3.5%; |
1928 | + } |
1929 | + |
1930 | +/* |
1931 | + * Footer |
1932 | + * |
1933 | + */ |
1934 | + |
1935 | +footer { |
1936 | + padding: 0 3.5%; |
1937 | +} |
1938 | + |
1939 | +/* |
1940 | + * Navigation |
1941 | + * |
1942 | + */ |
1943 | + |
1944 | +/* Navigation, dropdown */ |
1945 | |
1946 | .navigation.nd { |
1947 | border-left: none; |
1948 | @@ -214,14 +186,18 @@ |
1949 | border-top: 1px solid rgba( 0, 0, 0, 0.2 ); |
1950 | } |
1951 | .navigation.nd .menu li { |
1952 | + display: none; |
1953 | + |
1954 | float: none; |
1955 | width: 100%; |
1956 | height: auto; |
1957 | |
1958 | position: static; |
1959 | } |
1960 | + .navigation.nd .menu li.open { display: block; } |
1961 | + |
1962 | .navigation.nd .menu li a { |
1963 | - padding: 0.5em 2.5%; |
1964 | + padding: 0.5em 3.5%; |
1965 | } |
1966 | .navigation.nd .menu > li { |
1967 | border: none; |
1968 | @@ -272,13 +248,11 @@ |
1969 | } |
1970 | .navigation.nd .menu li .sub-menu li a { |
1971 | display: block; |
1972 | - padding: 0.25em 5%; |
1973 | + padding: 0.25em 7%; |
1974 | } |
1975 | |
1976 | -.navigation.nd .menu li { display: none; } |
1977 | -.navigation.nd .menu li.open { display: block; } |
1978 | +/* Navigation, horizontal */ |
1979 | |
1980 | -/* Horizontal navigation */ |
1981 | .navigation.nh .menu > li { |
1982 | width: 34% !important; |
1983 | } |
1984 | @@ -299,102 +273,99 @@ |
1985 | margin-right: 0; |
1986 | } |
1987 | |
1988 | -/* Header */ |
1989 | -#header_outer { |
1990 | - background-image: none !important; |
1991 | - border-top: none; |
1992 | -} |
1993 | - #header_outer #logo { |
1994 | +/* |
1995 | + * Widget areas |
1996 | + * |
1997 | + */ |
1998 | + |
1999 | +.widgets_front .widgets { |
2000 | + width: 93%; |
2001 | +} |
2002 | + |
2003 | +/* |
2004 | + * Templates |
2005 | + * |
2006 | + */ |
2007 | + |
2008 | +/* Featured image */ |
2009 | +.post-thumbnail { |
2010 | + display: block !important; |
2011 | + max-width: 100%; |
2012 | + width: 100%; |
2013 | + margin: 0 0 1em 0; |
2014 | + text-align: center; |
2015 | +} |
2016 | + .post-thumbnail img { |
2017 | + max-height: 120px; |
2018 | + width: auto; |
2019 | + } |
2020 | + |
2021 | +/* Featured image in a gallery */ |
2022 | + |
2023 | +.featured { |
2024 | + width: 95%; |
2025 | + margin: 0 auto; |
2026 | +} |
2027 | + |
2028 | +/* |
2029 | + * Common |
2030 | + * |
2031 | + */ |
2032 | + |
2033 | +/* Aligned images */ |
2034 | + |
2035 | +main figure[style*="float"], |
2036 | +.alignleft, |
2037 | +.alignright, |
2038 | +.aligncenter { |
2039 | + /* Clear all floats and center-align */ |
2040 | + display: block; |
2041 | + float: none !important; |
2042 | + text-align: center; |
2043 | + margin: 0 auto !important; |
2044 | +} |
2045 | + |
2046 | +/* Elements */ |
2047 | + |
2048 | +blockquote { |
2049 | + max-width: 90%; |
2050 | +} |
2051 | + |
2052 | +figure { |
2053 | + width: 100% !important; |
2054 | + text-align: center; |
2055 | +} |
2056 | + #content figure a { |
2057 | + max-width: 100% !important; |
2058 | + } |
2059 | + .gallery figure { |
2060 | + width: 100%; !important; |
2061 | + padding: 0; |
2062 | margin: 0; |
2063 | - padding: 0.5em 2.5%; |
2064 | - } |
2065 | - #header_outer #logo a img { |
2066 | - display: none; |
2067 | - } |
2068 | - #header_outer #logo a:after { |
2069 | - font-size: 120%; |
2070 | - font-weight: 600; |
2071 | - |
2072 | - padding-right: 30px; |
2073 | - |
2074 | - background: transparent url(images/xubuntu-icon-20.png) 100% 50% no-repeat; |
2075 | - content: "Xubuntu"; |
2076 | - |
2077 | - color: #fff; |
2078 | - } |
2079 | - /* Fixed positioning on scroll */ |
2080 | - #header_outer.scrolled { |
2081 | - position: fixed; |
2082 | - top: 0; |
2083 | - left: 0; |
2084 | - width: 100%; |
2085 | - } |
2086 | - #header_outer.scrolled #navi { |
2087 | - width: 100%; |
2088 | - position: fixed; |
2089 | - left: 0; |
2090 | - z-index: 50000; |
2091 | - } |
2092 | - |
2093 | - #navi { |
2094 | - background-color: #0e82d0; |
2095 | - } |
2096 | - #navi_main { |
2097 | - font-size: 98%; |
2098 | - } |
2099 | - #navi.open .navigation.nd .menu li.current-menu-ancestor-hidden .sub-menu { display: none; } |
2100 | - #navi.open .navigation.nd .menu li { display: block; } |
2101 | - |
2102 | - #navi .navigation.nd > ul > li { |
2103 | - background-color: rgba( 255, 255, 255, 0.25 ); |
2104 | - } |
2105 | - #navi li.menu-item-has-children .expand { |
2106 | - display: none; |
2107 | - |
2108 | - position: relative; |
2109 | - right: 2.5%; |
2110 | - top: 0; |
2111 | - |
2112 | - float: right; |
2113 | - z-index: 2000; |
2114 | - |
2115 | - height: 32px; |
2116 | - width: 32px; |
2117 | - padding: 0; |
2118 | - margin-right: -4px; |
2119 | - |
2120 | - background: transparent url(images/menu_arrow.png) 50% 50% no-repeat; |
2121 | - } |
2122 | - #navi.open li.menu-item-has-children .expand { |
2123 | - display: block; |
2124 | - transition: 200ms transform; |
2125 | - } |
2126 | - #navi .open-sub .sub-menu { |
2127 | - display: block !important; |
2128 | - margin: 0; |
2129 | - padding: 0; |
2130 | - } |
2131 | - #navi .open-sub li.menu-item-has-children .expand { |
2132 | - transform: rotate( -90deg ); |
2133 | - background-size: 65% 65%; |
2134 | - } |
2135 | - #navi_quick { |
2136 | - display: block; |
2137 | - } |
2138 | - #opennavi { |
2139 | - position: relative; |
2140 | - display: block; |
2141 | - height: 0; |
2142 | - top: 0; |
2143 | - right: 2.5%; |
2144 | - |
2145 | - margin: 0 -0.3em 0 0; |
2146 | - |
2147 | - width: 2.8em; |
2148 | - height: 2.8em; |
2149 | - |
2150 | - overflow: hidden; |
2151 | - |
2152 | - background: transparent url(images/menu.png) 50% 50% no-repeat; |
2153 | - } |
2154 | - |
2155 | + } |
2156 | + |
2157 | +main figure, |
2158 | +main figure img, |
2159 | +main img { |
2160 | + margin-top: 0.5em; |
2161 | + margin-bottom: 0.5em; |
2162 | +} |
2163 | + |
2164 | + |
2165 | +/* List in columns */ |
2166 | + |
2167 | +ul.columnlist { |
2168 | + -moz-column-gap: 1em; |
2169 | + -webkit-column-gap: 1em; |
2170 | + column-gap: 1em; |
2171 | + |
2172 | + -moz-column-count: 2; |
2173 | + -webkit-column-count: 2; |
2174 | + column-count: 2; |
2175 | +} |
2176 | + |
2177 | +/* Section highlighting */ |
2178 | + |
2179 | +.hb { |
2180 | + padding: 5px 20px; |
2181 | +} |
2182 | |
2183 | === modified file 'xubuntu-fifteen/style-resp-800.css' |
2184 | --- xubuntu-fifteen/style-resp-800.css 2016-07-30 22:45:51 +0000 |
2185 | +++ xubuntu-fifteen/style-resp-800.css 2016-12-15 07:46:28 +0000 |
2186 | @@ -1,74 +1,84 @@ |
2187 | -/* For screen sizes less than 800px wide */ |
2188 | +/* |
2189 | + * Header |
2190 | + * |
2191 | + */ |
2192 | |
2193 | #navi { |
2194 | - font-size: 92%; |
2195 | -} |
2196 | - .navigation.nd .menu > li > a { |
2197 | - padding-left: 0.75em; |
2198 | - padding-right: 0.75em; |
2199 | + font-size: 82%; |
2200 | +} |
2201 | + |
2202 | +/* |
2203 | + * Main content area |
2204 | + * |
2205 | + */ |
2206 | + |
2207 | +#content { |
2208 | + display: block; |
2209 | +} |
2210 | + #content aside { |
2211 | + margin-top: 2em; |
2212 | + margin-left: 0; |
2213 | } |
2214 | |
2215 | -#footer { |
2216 | +/* |
2217 | + * Footer |
2218 | + * |
2219 | + */ |
2220 | + |
2221 | +footer { |
2222 | overflow: hidden; |
2223 | } |
2224 | |
2225 | -/* Front page |
2226 | - * |
2227 | - */ |
2228 | - |
2229 | -body.home .alignright, |
2230 | -body.home .alignleft { |
2231 | - max-width: 310px; |
2232 | - height: auto; |
2233 | -} |
2234 | - |
2235 | -/* Blog pages |
2236 | - * |
2237 | - */ |
2238 | - |
2239 | -body.single-post #main, |
2240 | -body.blog #main, |
2241 | -body.archive #main, |
2242 | -#sidebar { |
2243 | - float: none; |
2244 | - width: 100%; |
2245 | - padding: 1.25em 1.75em; |
2246 | -} |
2247 | - |
2248 | -/* Widget areas |
2249 | - * |
2250 | - */ |
2251 | - .widgets_flex .widgets { |
2252 | - display: block; |
2253 | +/* |
2254 | + * Navigation |
2255 | + * |
2256 | + */ |
2257 | + |
2258 | +.navigation.nd .menu > li > a { |
2259 | + padding-left: 0.75em; |
2260 | + padding-right: 0.75em; |
2261 | +} |
2262 | + |
2263 | +/* |
2264 | + * Widget areas |
2265 | + * |
2266 | + */ |
2267 | + |
2268 | +.widgets_flex .widgets { |
2269 | + display: block; |
2270 | +} |
2271 | + .widgets_flex .widget { |
2272 | + width: 100% !important; |
2273 | + margin: 0 !important; |
2274 | + border: none !important; |
2275 | + padding: 1.5em 0 !important; |
2276 | + |
2277 | + border-bottom: 1px dotted rgba( 0, 0, 0, 0.2 ) !important; |
2278 | } |
2279 | - .widgets_flex .widget { |
2280 | - width: 100% !important; |
2281 | - margin: 0 !important; |
2282 | - border: none !important; |
2283 | - padding: 1.5em 0 !important; |
2284 | - |
2285 | - border-bottom: 1px dotted rgba( 0, 0, 0, 0.2 ) !important; |
2286 | - } |
2287 | - .widgets_flex .widget :last-child { |
2288 | - margin-bottom: 0; |
2289 | - } |
2290 | - .widgets_flex .widget:first-child { |
2291 | - padding-top: 0 !important; |
2292 | - } |
2293 | - .widgets_flex .widget:last-child { |
2294 | - border-bottom: none !important; |
2295 | - padding-bottom: 0 !important; |
2296 | - } |
2297 | - |
2298 | - |
2299 | -/* Featured images |
2300 | + .widgets_flex .widget :last-child { |
2301 | + margin-bottom: 0; |
2302 | + } |
2303 | + .widgets_flex .widget:first-child { |
2304 | + padding-top: 0 !important; |
2305 | + } |
2306 | + .widgets_flex .widget:last-child { |
2307 | + border-bottom: none !important; |
2308 | + padding-bottom: 0 !important; |
2309 | + } |
2310 | + |
2311 | +/* |
2312 | + * Templates |
2313 | * |
2314 | */ |
2315 | |
2316 | +/* Featured image */ |
2317 | + |
2318 | .post-thumbnail { |
2319 | max-width: 50%; |
2320 | } |
2321 | |
2322 | +/* Featured image in a gallery */ |
2323 | + |
2324 | .featured { |
2325 | margin-bottom: 0.5em; |
2326 | } |
2327 | @@ -88,4 +98,4 @@ |
2328 | |
2329 | .featured .description { |
2330 | margin-top: 1em; |
2331 | - } |
2332 | \ No newline at end of file |
2333 | + } |
2334 | |
2335 | === modified file 'xubuntu-fifteen/style.css' |
2336 | --- xubuntu-fifteen/style.css 2016-08-29 13:44:57 +0000 |
2337 | +++ xubuntu-fifteen/style.css 2016-12-15 07:46:28 +0000 |
2338 | @@ -1,16 +1,18 @@ |
2339 | /* |
2340 | * Theme Name: Xubuntu Fifteen |
2341 | + * Theme URI: https://xubuntu.org/ |
2342 | * Description: A theme built for the Xubuntu website at xubuntu.org. |
2343 | + * |
2344 | * Author: Pasi Lallinaho |
2345 | - * Version: 2016-aug (r116) |
2346 | * Author URI: http://open.knome.fi/ |
2347 | - * Theme URI: https://xubuntu.org/ |
2348 | + * |
2349 | + * Version: 2016-sept (r118) |
2350 | * |
2351 | */ |
2352 | |
2353 | body { |
2354 | font-size: small; |
2355 | - font-family: "Open Sans", sans-serif; |
2356 | + font-family: 'Open Sans', sans-serif; |
2357 | font-weight: 500; |
2358 | line-height: 1.5em; |
2359 | |
2360 | @@ -20,13 +22,15 @@ |
2361 | min-height: 760px; |
2362 | } |
2363 | |
2364 | -/* Content width |
2365 | +/* |
2366 | + * Content width |
2367 | * |
2368 | */ |
2369 | |
2370 | -#content, #main, #header, #header_art, #footer, #navi, |
2371 | -#content_gallery, |
2372 | -.widgets_inner { |
2373 | +header #logo, header nav, header::after, |
2374 | +#content, |
2375 | +.widgets_front .widgets, |
2376 | +footer { |
2377 | width: 90%; |
2378 | margin: 0 auto; |
2379 | |
2380 | @@ -35,409 +39,153 @@ |
2381 | clear: both; |
2382 | } |
2383 | |
2384 | -/* Basic layouting |
2385 | +/* |
2386 | + * Header |
2387 | * |
2388 | */ |
2389 | |
2390 | -#header_outer { |
2391 | +header { |
2392 | background: #0e82d0 linear-gradient( to right top, rgba( 0, 0, 0, 0 ), rgba( 0, 0, 0, 0.15 ) ); |
2393 | +/* background-color: #0e82d0; |
2394 | + background-image: linear-gradient( to right top, rgba( 0, 0, 0, 0 ), rgba( 0, 0, 0, 0.15 ) ), url(images/header.png); |
2395 | + background-position: 0 0, auto 50%; |
2396 | + background-repeat: no-repeat; */ |
2397 | + |
2398 | box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
2399 | - |
2400 | - position: relative; |
2401 | } |
2402 | - #header { |
2403 | - padding: 1.6em 0 1.2em 0; |
2404 | - position: relative; |
2405 | - } |
2406 | - |
2407 | - #header_art { |
2408 | - position: relative; |
2409 | - z-index: 0; |
2410 | - } |
2411 | - #header_art::before, |
2412 | - #header_art::after { |
2413 | - content: ""; |
2414 | - |
2415 | - display: block; |
2416 | - position: absolute; |
2417 | - } |
2418 | - #header_art::before { |
2419 | - height: 250px; |
2420 | - width: 900px; |
2421 | - top: 0; |
2422 | - left: -35px; |
2423 | - |
2424 | - background: transparent linear-gradient( to left, rgba( 255, 255, 255, 0.2 ), rgba( 20, 165, 245, 0.5 ) ); |
2425 | - transform: rotate( 15deg ) skewX( -2deg ); |
2426 | - z-index: 1; |
2427 | - } |
2428 | - #header_art::after { |
2429 | - height: 200px; |
2430 | - width: 850px; |
2431 | - top: 75px; |
2432 | - left: -50px; |
2433 | - |
2434 | - background: transparent linear-gradient( to right top, rgba( 255, 255, 255, 0 ), rgba( 255, 255, 255, 0.3 ) ); |
2435 | - transform: rotate( -18deg ) skewX( -6deg ); |
2436 | - z-index: 2; |
2437 | - opacity: 0.5; |
2438 | - } |
2439 | - |
2440 | - #logo { |
2441 | - color: #fff; |
2442 | - position: relative; |
2443 | - z-index: 100; |
2444 | - } |
2445 | - #navi_outer { |
2446 | - font-size: 90%; |
2447 | - background-color: rgba( 0, 0, 0, 0.2 ); |
2448 | - |
2449 | - position: relative; |
2450 | - z-index: 100; |
2451 | - } |
2452 | - #navi .navigation { |
2453 | - position: relative; |
2454 | - z-index: 100; |
2455 | - } |
2456 | - #navi .navigation ul { |
2457 | - margin-bottom: 0; |
2458 | - } |
2459 | - #navi .navigation .sub-menu .current_page_item a { |
2460 | - background-color: rgba( 255, 255, 255, 0.3 ); |
2461 | - border-radius: 3px; |
2462 | - box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
2463 | - } |
2464 | - #navi .navigation:hover .sub-menu .current_page_item a { |
2465 | - background-color: transparent; |
2466 | - box-shadow: none; |
2467 | - } |
2468 | - #navi_quick { |
2469 | - display: none; |
2470 | - |
2471 | - padding: 0.5em 40px 0em 2.5%; |
2472 | - |
2473 | - background-color: rgba( 0, 0, 0, 0.2 ); |
2474 | - border-top: 1px solid rgba( 255, 255, 255, 0.2 ); |
2475 | - |
2476 | - font-size: 90%; |
2477 | - } |
2478 | - #navi_quick .navi_open_button { |
2479 | - font-size: 120%; |
2480 | - display: block; |
2481 | - border: none; |
2482 | - height: 100%; |
2483 | - padding: 0 0 0.5em 0; |
2484 | - color: rgba( 255, 255, 255, 0.5 ); |
2485 | - } |
2486 | - #navi_quick li { |
2487 | - display: inline; |
2488 | - } |
2489 | - #navi_quick a { |
2490 | - color: #fff; |
2491 | - margin-right: 1em; |
2492 | - font-weight: 600; |
2493 | - |
2494 | - white-space: nowrap; |
2495 | - display: inline; |
2496 | - } |
2497 | - #opennavi { |
2498 | - display: none; |
2499 | - |
2500 | - float: right; |
2501 | - |
2502 | - position: relative; |
2503 | - top: 1px; |
2504 | - right: 1em; |
2505 | - z-index: 100; |
2506 | - |
2507 | - border: none; |
2508 | - } |
2509 | - |
2510 | -#content_outer { |
2511 | + header a { border-bottom: none !important; } |
2512 | + header ul { margin-bottom: 0; } |
2513 | + |
2514 | + header::after { |
2515 | + content: " "; |
2516 | + display: block; |
2517 | + position: relative; |
2518 | + height: 150px; |
2519 | + |
2520 | + top: -150px; |
2521 | + left: -35px; |
2522 | + margin-bottom: -150px; |
2523 | + padding: 0 35px; |
2524 | + |
2525 | + background: transparent url(images/header.png) 0 50% no-repeat; |
2526 | + } |
2527 | + |
2528 | + #logo { |
2529 | + position: relative; |
2530 | + z-index: 1; |
2531 | + |
2532 | + padding: 1.6em 0 1.2em; |
2533 | + color: #fff; |
2534 | + } |
2535 | + #navi { |
2536 | + position: relative; |
2537 | + z-index: 1; |
2538 | + |
2539 | + font-size: 90%; |
2540 | + background-color: rgba( 0, 0, 0, 0.2 ); |
2541 | + } |
2542 | + nav#navi_quick, |
2543 | + #opennavi { |
2544 | + display: none; |
2545 | + } |
2546 | + |
2547 | +/* |
2548 | + * Main content area |
2549 | + * |
2550 | + */ |
2551 | + |
2552 | +section#middle { |
2553 | padding: 1.5em 0; |
2554 | |
2555 | background-color: #eee; |
2556 | box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
2557 | - |
2558 | - position: relative; |
2559 | - z-index: 50; |
2560 | } |
2561 | #content { |
2562 | + display: flex; |
2563 | + padding: 1.8em 2.2em; |
2564 | + |
2565 | font-size: 110%; |
2566 | - padding: 0; |
2567 | |
2568 | background-color: #fafafa; |
2569 | border-radius: 4px; |
2570 | box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
2571 | } |
2572 | - #content.air { |
2573 | - background-color: transparent; |
2574 | - border-radius: 0; |
2575 | - box-shadow: none; |
2576 | - } |
2577 | - |
2578 | - #main { |
2579 | - box-sizing: border-box; |
2580 | - width: 100%; |
2581 | - float: left; |
2582 | - |
2583 | - padding: 25px 30px; |
2584 | - } |
2585 | - body.home #main { |
2586 | - float: none; |
2587 | - width: 90%; |
2588 | - margin: 0 auto 25px auto; |
2589 | + main { |
2590 | + flex: 68; |
2591 | + } |
2592 | + aside { |
2593 | + flex: 32; |
2594 | + margin-left: 2em; |
2595 | + |
2596 | + font-size: 90%; |
2597 | + } |
2598 | + aside > :first-child { |
2599 | + margin-top: 0; |
2600 | } |
2601 | |
2602 | -#footer { |
2603 | - box-sizing: border-box; |
2604 | - |
2605 | +body.home section#middle { |
2606 | + background-color: #f8f8f8; |
2607 | + padding: 0; |
2608 | +} |
2609 | + body.home #content { |
2610 | + padding: 0; |
2611 | + |
2612 | + background-color: transparent; |
2613 | + box-shadow: none; |
2614 | + } |
2615 | + body.home main { |
2616 | + padding: 2em 0 1em 0; |
2617 | + } |
2618 | + body.home main .post-post { margin: 0; } |
2619 | + body.home main h1 { margin-top: 0 !important; } |
2620 | + |
2621 | +/* |
2622 | + * Footer |
2623 | + * |
2624 | + */ |
2625 | + |
2626 | +footer { |
2627 | margin-top: 1em; |
2628 | padding: 2px; |
2629 | font-size: 80%; |
2630 | color: #555; |
2631 | } |
2632 | - #footer_widgets { |
2633 | + footer .widgets { |
2634 | padding-bottom: 1.5em; |
2635 | margin-bottom: 1.5em; |
2636 | border-bottom: 1px dotted #aaa; |
2637 | } |
2638 | - #footer_navi .menu .sub-menu { |
2639 | + nav#footer_navi .menu .sub-menu { |
2640 | font-size: 110%; |
2641 | } |
2642 | |
2643 | - |
2644 | -/* PAGES |
2645 | - * |
2646 | - */ |
2647 | - |
2648 | -/* Home page |
2649 | - * |
2650 | - */ |
2651 | - |
2652 | -body.home #content_outer { |
2653 | - background-color: #f8f8f8; |
2654 | - padding: 0; |
2655 | -} |
2656 | - |
2657 | - body.home #content { |
2658 | - width: 100%; |
2659 | - margin: 0; |
2660 | - max-width: 100%; |
2661 | - |
2662 | - background-color: transparent; |
2663 | - box-shadow: none; |
2664 | - padding: 1.5em 0 0 0; |
2665 | - border-radius: 0; |
2666 | - } |
2667 | - body.home #main { |
2668 | - padding: 0; |
2669 | - } |
2670 | - |
2671 | - body.home .widgets_outer { |
2672 | - padding: 1em 0; |
2673 | - margin-bottom: 1em; |
2674 | - } |
2675 | - body.home .widgets_outer#front, |
2676 | - body.home .widgets_outer#front-3 { |
2677 | - padding: 2em 0; |
2678 | - background-color: #fff; |
2679 | - box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
2680 | - } |
2681 | - |
2682 | - body.home .widgets_outer:last-child { |
2683 | - padding-bottom: 2em; |
2684 | - } |
2685 | - |
2686 | -/* Blog |
2687 | - * |
2688 | - */ |
2689 | - |
2690 | -body.single-post #main, |
2691 | -body.blog #main, |
2692 | -body.archive #main, |
2693 | -body.search #main { |
2694 | - float: left; |
2695 | - width: 65%; |
2696 | -} |
2697 | - |
2698 | -#sidebar { |
2699 | - float: right; |
2700 | - box-sizing: border-box; |
2701 | - width: 35%; |
2702 | - |
2703 | - font-size: 90%; |
2704 | - padding: 0 30px 2em 30px; |
2705 | -} |
2706 | - #sidebar .search-form { |
2707 | - display: flex; |
2708 | - } |
2709 | - #sidebar .search-form label { |
2710 | - /* Search input box */ |
2711 | - flex: 3; |
2712 | - margin-right: 0.5em; |
2713 | - } |
2714 | - #sidebar .search-form label input { |
2715 | - width: 100%; |
2716 | - } |
2717 | - #sidebar .search-form .search-submit { |
2718 | - flex: 1; |
2719 | - } |
2720 | - |
2721 | -/* Blog front and paging */ |
2722 | - |
2723 | -#main .post + .post, |
2724 | -.post-pagination { |
2725 | - margin-top: 2em; |
2726 | - padding-top: 1.25em; |
2727 | - border-top: 1px dotted rgba( 28, 80, 161, 0.5 ); |
2728 | -} |
2729 | -.post-pagination { |
2730 | - margin-bottom: 0; |
2731 | - font-size: 90%; |
2732 | - border-top-color: rgba( 0, 0, 0, 0.5 ); |
2733 | -} |
2734 | - |
2735 | - |
2736 | -/* Post styles */ |
2737 | +/* |
2738 | + * Post styles |
2739 | + * |
2740 | + */ |
2741 | + |
2742 | .post-post { |
2743 | color: #333; |
2744 | margin: 1.5em 0 0.5em 0; |
2745 | } |
2746 | - .post-post img, |
2747 | - .post-post figure { |
2748 | - max-width: 100%; |
2749 | - height: auto; |
2750 | + .post-post > :last-child { |
2751 | + margin-bottom: 0; |
2752 | } |
2753 | - .post-post > :last-child { |
2754 | - margin-bottom: 0; |
2755 | - } |
2756 | |
2757 | -.post-meta, .post-meta a { |
2758 | - color: #ccc; |
2759 | +.post-meta, |
2760 | +.post-meta a { |
2761 | color: rgba( 0, 0, 0, 0.2 ); |
2762 | } |
2763 | - |
2764 | -.post-meta span a { |
2765 | - transition: all 0.5s ease-in-out; |
2766 | -} |
2767 | -.post-meta span a:hover, |
2768 | -.post-meta span a:focus { |
2769 | - color: #808080; |
2770 | - color: rgba( 0, 0, 0, 0.5 ); |
2771 | -} |
2772 | - |
2773 | -/* Release archive |
2774 | - * |
2775 | - */ |
2776 | - |
2777 | -dl.release-info { |
2778 | - margin-bottom: 1em; |
2779 | -} |
2780 | - dl.release-info dt { |
2781 | - float: left; |
2782 | - clear: both; |
2783 | - |
2784 | - width: 25%; |
2785 | - margin-right: 5px; |
2786 | - |
2787 | - font-weight: bold; |
2788 | - } |
2789 | - dl.release-info dd { |
2790 | - float: left; |
2791 | - } |
2792 | - dl.release-info dd.eol::after { |
2793 | - content: "Unsupported"; |
2794 | - margin-left: 0.5em; |
2795 | - color: rgba( 200, 0, 0, 1 ); |
2796 | - } |
2797 | - |
2798 | -/* Attachments |
2799 | - * |
2800 | - */ |
2801 | - |
2802 | -#attachment { |
2803 | - margin-top: -1em; |
2804 | - margin-bottom: 1em; |
2805 | -} |
2806 | - #attachment img { |
2807 | - width: 100%; |
2808 | - height: auto; |
2809 | - |
2810 | - border-radius: 3px; |
2811 | - box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
2812 | - } |
2813 | - body.attachment .boxed { |
2814 | - padding: 1em 2em; |
2815 | - } |
2816 | - #attachment_navi { |
2817 | - text-align: center; |
2818 | - margin-bottom: 1em; |
2819 | - } |
2820 | - #attachment_navi .button:last-child { |
2821 | - margin-right: 0; |
2822 | - } |
2823 | - #attachment_navi .primary { |
2824 | - font-weight: 600 !important; |
2825 | - } |
2826 | - |
2827 | - |
2828 | -/* WIDGET AREAS |
2829 | - * |
2830 | - */ |
2831 | - |
2832 | -.widgets_flex .widgets { |
2833 | - display: flex; |
2834 | -} |
2835 | - .widgets_flex .widget { |
2836 | - float: left; |
2837 | - width: 25.1%; |
2838 | - |
2839 | - box-sizing: border-box; |
2840 | - flex-grow: 1; |
2841 | - |
2842 | - padding: 0 1.5em; |
2843 | - |
2844 | - border-right: 1px dotted rgba( 0, 0, 0, 0.2 ); |
2845 | - } |
2846 | - .widgets_flex .widget:first-child { |
2847 | - padding-left: 0; |
2848 | - } |
2849 | - .widgets_flex .widget:last-child { |
2850 | - border-right: none; |
2851 | - padding-right: 0; |
2852 | - } |
2853 | - .widgets_flex .widget p:last-child { |
2854 | - margin-bottom: 0; |
2855 | - } |
2856 | - |
2857 | -/* Tagclouds */ |
2858 | - |
2859 | -.tagcloud a { |
2860 | - display: block; |
2861 | - font-size: 100% !important; |
2862 | - margin-left: 1em; |
2863 | - margin-bottom: 0.2em; |
2864 | -} |
2865 | - .tagcloud a { |
2866 | - border-bottom: none !important; |
2867 | - } |
2868 | - .tagcloud a::before { |
2869 | - /* Imitates the list style */ |
2870 | - display: block; |
2871 | - float: left; |
2872 | - |
2873 | - width: 0.7em; |
2874 | - margin-left: -0.7em; |
2875 | - margin-top: -0.12em; |
2876 | - content: "›"; |
2877 | - font-weight: 300; |
2878 | - font-size: 140%; |
2879 | - color: #555; |
2880 | - } |
2881 | - |
2882 | - |
2883 | -/* NAVIGATION |
2884 | + .post-meta span a { |
2885 | + transition: all 0.5s ease-in-out; |
2886 | + } |
2887 | + .post-meta span a:hover, |
2888 | + .post-meta span a:focus { |
2889 | + color: rgba( 0, 0, 0, 0.5 ); |
2890 | + } |
2891 | + |
2892 | +/* |
2893 | + * Navigation |
2894 | * |
2895 | */ |
2896 | |
2897 | @@ -457,9 +205,8 @@ |
2898 | margin: 0.5em 0 1.5em 0; |
2899 | } |
2900 | |
2901 | -/* Dropdown navigation |
2902 | - * |
2903 | - */ |
2904 | +/* Navigation, dropdown */ |
2905 | + |
2906 | .navigation.nd { |
2907 | border-left: 1px solid rgba( 0, 0, 0, 0.2 ); |
2908 | } |
2909 | @@ -577,9 +324,7 @@ |
2910 | display: none; |
2911 | } |
2912 | |
2913 | -/* Horizontal navigation |
2914 | - * |
2915 | - */ |
2916 | +/* Navigation, horizontal */ |
2917 | |
2918 | .navigation.nh .menu { |
2919 | display: flex; |
2920 | @@ -611,3 +356,230 @@ |
2921 | padding-right: 0; |
2922 | border-right: none; |
2923 | } |
2924 | + |
2925 | +/* |
2926 | + * Widget areas |
2927 | + * |
2928 | + */ |
2929 | + |
2930 | +.widgets_flex .widgets { |
2931 | + display: flex; |
2932 | +} |
2933 | + .widgets_flex .widget { |
2934 | + float: left; |
2935 | + width: 25.1%; |
2936 | + |
2937 | + box-sizing: border-box; |
2938 | + flex-grow: 1; |
2939 | + |
2940 | + padding: 0 1.5em; |
2941 | + |
2942 | + border-right: 1px dotted rgba( 0, 0, 0, 0.2 ); |
2943 | + } |
2944 | + .widgets_flex .widget:first-child { |
2945 | + padding-left: 0; |
2946 | + } |
2947 | + .widgets_flex .widget:last-child { |
2948 | + border-right: none; |
2949 | + padding-right: 0; |
2950 | + } |
2951 | + .widgets_flex .widget p:last-child { |
2952 | + margin-bottom: 0; |
2953 | + } |
2954 | + |
2955 | +/* |
2956 | + * Templates |
2957 | + * |
2958 | + */ |
2959 | + |
2960 | +/* Attachments browsing */ |
2961 | + |
2962 | +.attachment_navi { |
2963 | + text-align: center; |
2964 | +} |
2965 | + .attachment_navi .button:last-child { |
2966 | + margin-right: 0; |
2967 | + } |
2968 | + |
2969 | +/* Classes for menus */ |
2970 | + |
2971 | +.menu .strong { |
2972 | + font-weight: 600; |
2973 | +} |
2974 | + |
2975 | +/* Featured image */ |
2976 | + |
2977 | +.post-thumbnail { |
2978 | + float: right; |
2979 | + margin: -1em 0 2em 2em; |
2980 | + |
2981 | + max-width: 400px; |
2982 | + height: auto; |
2983 | +} |
2984 | + .post-thumbnail img { |
2985 | + border-radius: 0; |
2986 | + box-shadow: none; |
2987 | + } |
2988 | + |
2989 | +/* Featured image on the front page */ |
2990 | + |
2991 | +body.home .post-thumbnail { |
2992 | + margin-top: 0; |
2993 | +} |
2994 | +body.home main h1 { |
2995 | + display: inline; |
2996 | +} |
2997 | + body.home main h1:after { |
2998 | + display: block; |
2999 | + content: ""; |
3000 | + margin-bottom: 1em; |
3001 | + } |
3002 | + |
3003 | +/* Featured image in a gallery */ |
3004 | + |
3005 | +.featured { |
3006 | + margin-bottom: 2em; |
3007 | +} |
3008 | + .featured .image { |
3009 | + float: left; |
3010 | + width: 50%; |
3011 | + } |
3012 | + .featured .image img { |
3013 | + max-width: 100%; |
3014 | + float: right; |
3015 | + height: auto; |
3016 | + |
3017 | + border-radius: 3px; |
3018 | + box-shadow: 1px 1px 5px rgba( 0, 0, 0, 0.2 ); |
3019 | + } |
3020 | + |
3021 | + .featured .description { |
3022 | + float: right; |
3023 | + width: 45%; |
3024 | + } |
3025 | + .featured .description h2:first-child { |
3026 | + margin-top: 0; |
3027 | + } |
3028 | + |
3029 | +/* Home page widgets */ |
3030 | + |
3031 | +body.home .widgets_outer { |
3032 | + padding: 1em 0; |
3033 | + margin-bottom: 1em; |
3034 | +} |
3035 | + body.home .widgets_outer#front, |
3036 | + body.home .widgets_outer#front-3 { |
3037 | + padding: 2em 0; |
3038 | + background-color: #fff; |
3039 | + box-shadow: 0 0 10px rgba( 0, 0, 0, 0.1 ); |
3040 | + } |
3041 | + body.home .widgets_outer:last-child { |
3042 | + padding-bottom: 2em; |
3043 | + } |
3044 | + |
3045 | +/* Post lists */ |
3046 | + |
3047 | +.posts-list li { |
3048 | + list-style-type: none; |
3049 | + margin-left: 0; |
3050 | +} |
3051 | + .posts-list li .post-time { |
3052 | + display: inline-block; |
3053 | + width: 25%; |
3054 | + margin-right: 0.25em; |
3055 | + } |
3056 | + |
3057 | +/* Post pagination */ |
3058 | + |
3059 | +main .post + .post, |
3060 | +.post-pagination { |
3061 | + margin-top: 2em; |
3062 | + padding-top: 1.25em; |
3063 | + border-top: 1px dotted rgba( 28, 80, 161, 0.5 ); |
3064 | +} |
3065 | +.post-pagination { |
3066 | + margin-bottom: 0; |
3067 | + font-size: 90%; |
3068 | + border-top-color: rgba( 0, 0, 0, 0.5 ); |
3069 | +} |
3070 | + |
3071 | +/* Release archive information */ |
3072 | + |
3073 | +dl.release-info { |
3074 | + margin-bottom: 1em; |
3075 | +} |
3076 | + dl.release-info dt { |
3077 | + float: left; |
3078 | + clear: both; |
3079 | + |
3080 | + width: 25%; |
3081 | + margin-right: 5px; |
3082 | + |
3083 | + font-weight: bold; |
3084 | + } |
3085 | + dl.release-info dd { |
3086 | + float: left; |
3087 | + } |
3088 | + dl.release-info dd.eol::after { |
3089 | + content: "Unsupported"; |
3090 | + margin-left: 0.5em; |
3091 | + color: rgba( 200, 0, 0, 1 ); |
3092 | + } |
3093 | + |
3094 | +/* Release lists */ |
3095 | + |
3096 | +.releases .nobullet::before { |
3097 | + content: " " !important; |
3098 | +} |
3099 | +.releases .show-eol { |
3100 | + color: rgba( 0, 0, 0, 0.5 ); |
3101 | + margin-left: -1em; |
3102 | +} |
3103 | +.releases .eol a::before { |
3104 | + content: "EOL"; |
3105 | + font-size: 90%; |
3106 | + margin-right: 0.5em; |
3107 | + color: rgba( 0, 0, 0, 0.5 ); |
3108 | +} |
3109 | + |
3110 | +/* Search form */ |
3111 | + |
3112 | +.search-form { |
3113 | + display: flex; |
3114 | +} |
3115 | + .search-form label { |
3116 | + /* Search input box */ |
3117 | + flex: 3; |
3118 | + margin-right: 0.5em; |
3119 | + } |
3120 | + .search-form label input { |
3121 | + width: 100%; |
3122 | + } |
3123 | + .search-form .search-submit { |
3124 | + flex: 1; |
3125 | + } |
3126 | + |
3127 | +/* Tagclouds */ |
3128 | + |
3129 | +.tagcloud a { |
3130 | + display: block; |
3131 | + font-size: 100% !important; |
3132 | + margin-left: 1em; |
3133 | + margin-bottom: 0.2em; |
3134 | +} |
3135 | + .tagcloud a { |
3136 | + border-bottom: none !important; |
3137 | + } |
3138 | + .tagcloud a::before { |
3139 | + /* Imitates the list style */ |
3140 | + display: block; |
3141 | + float: left; |
3142 | + |
3143 | + width: 0.7em; |
3144 | + margin-left: -0.7em; |
3145 | + margin-top: -0.12em; |
3146 | + content: "›"; |
3147 | + font-weight: 300; |
3148 | + font-size: 140%; |
3149 | + color: #555; |
3150 | + } |
3151 | \ No newline at end of file |
3152 | |
3153 | === removed file 'xubuntu-fifteen/template_blank.php' |
3154 | --- xubuntu-fifteen/template_blank.php 2015-02-23 13:21:04 +0000 |
3155 | +++ xubuntu-fifteen/template_blank.php 1970-01-01 00:00:00 +0000 |
3156 | @@ -1,16 +0,0 @@ |
3157 | -<?php |
3158 | - /* Template name: Blank */ |
3159 | - /* A blank page template with no content area background */ |
3160 | -?> |
3161 | - |
3162 | -<?php get_header( ); ?> |
3163 | -<?php the_post( ); ?> |
3164 | - |
3165 | -<div id="content_outer"> |
3166 | - <div id="content" class="air"> |
3167 | - <h1 class="boxed"><?php the_title( ); ?></h1> |
3168 | - <?php the_content( ); ?> |
3169 | - </div> |
3170 | -</div> |
3171 | - |
3172 | -<?php get_footer( ); ?> |
3173 | \ No newline at end of file |
3174 | |
3175 | === modified file 'xubuntu-fifteen/widgets-blog.php' |
3176 | --- xubuntu-fifteen/widgets-blog.php 2016-07-30 22:45:51 +0000 |
3177 | +++ xubuntu-fifteen/widgets-blog.php 2016-12-15 07:46:28 +0000 |
3178 | @@ -1,7 +1,7 @@ |
3179 | <?php |
3180 | - if( function_exists( 'dynamic_sidebar' ) ) { |
3181 | - ?><div id="sidebar"> |
3182 | + if( function_exists( 'dynamic_sidebar' ) && is_active_sidebar( 'blog_navigation' ) ) { |
3183 | + ?><aside id="sidebar"> |
3184 | <?php dynamic_sidebar( 'blog_navigation' ); ?> |
3185 | - </div><?php |
3186 | + </aside><?php |
3187 | } |
3188 | ?> |
3189 | \ No newline at end of file |
3190 | |
3191 | === modified file 'xubuntu-fifteen/widgets-footer.php' |
3192 | --- xubuntu-fifteen/widgets-footer.php 2015-06-11 20:39:33 +0000 |
3193 | +++ xubuntu-fifteen/widgets-footer.php 2016-12-15 07:46:28 +0000 |
3194 | @@ -6,6 +6,7 @@ |
3195 | |
3196 | wp_nav_menu( array( |
3197 | 'theme_location' => 'footer_navigation', |
3198 | + 'container' => 'nav', |
3199 | 'container_id' => 'footer_navi', |
3200 | 'container_class' => 'group navigation nh', |
3201 | 'fallback_cb' => false |
3202 | |
3203 | === modified file 'xubuntu-fifteen/widgets-front.php' |
3204 | --- xubuntu-fifteen/widgets-front.php 2015-11-25 01:41:13 +0000 |
3205 | +++ xubuntu-fifteen/widgets-front.php 2016-12-15 07:46:28 +0000 |
3206 | @@ -4,7 +4,7 @@ |
3207 | |
3208 | foreach( $widget_areas as $area ) { |
3209 | if( is_active_sidebar( $area ) ) { |
3210 | - ?><div id="<?php echo $area; ?>" class="widgets_outer widgets_flex"><div class="widgets_inner"><div class="widgets group"><?php dynamic_sidebar( $area ); ?></div></div></div><?php |
3211 | + ?><div id="<?php echo $area; ?>" class="widgets_front widgets_outer widgets_flex"><div class="widgets group"><?php dynamic_sidebar( $area ); ?></div></div><?php |
3212 | } |
3213 | } |
3214 | } |
3215 | |
3216 | === added file 'xubuntu-fifteen/widgets-release.php' |
3217 | --- xubuntu-fifteen/widgets-release.php 1970-01-01 00:00:00 +0000 |
3218 | +++ xubuntu-fifteen/widgets-release.php 2016-12-15 07:46:28 +0000 |
3219 | @@ -0,0 +1,7 @@ |
3220 | +<?php |
3221 | + if( function_exists( 'dynamic_sidebar' ) && is_active_sidebar( 'release_widgets' ) ) { |
3222 | + ?><aside id="sidebar"> |
3223 | + <?php dynamic_sidebar( 'release_widgets' ); ?> |
3224 | + </aside><?php |
3225 | + } |
3226 | +?> |
3227 | \ No newline at end of file |