Skip to content

Commit 02ef0d4

Browse files
alliswellalliswell
committed
did stuff
1 parent 098188b commit 02ef0d4

File tree

5 files changed

+122
-43
lines changed

5 files changed

+122
-43
lines changed

‎dev/reset.less‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ footer, header, hgroup, menu, nav, section {
3232
display: block;
3333
}
3434
html {
35-
overflow-y: scroll; /* Keeps page centred in all browsers regardless of content height */
35+
margin: 0;
36+
padding: 0;
37+
//overflow-y: scroll; /* Keeps page centred in all browsers regardless of content height */
3638
font-size: 62.5%; /* Corrects text resizing oddly in IE6/7 when body font-size is set using em units http://clagnut.com/blog/348/#c790 */
3739
-webkit-text-size-adjust: 100%; /* Prevents iOS text size adjust after orientation change, without disabling user zoom */
3840
-ms-text-size-adjust: 100%; /* www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/ */

‎dev/style.less‎

Lines changed: 45 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ button,
107107
input,
108108
select {
109109
padding: 0;
110+
margin: 0;
110111
background: @site-bg;
111112
font-family: @body-font;
112113
.font-size(@body-text-size);
@@ -381,11 +382,22 @@ article {
381382
margin-right: 10px;
382383
}
383384

384-
}
385-
385+
}// post-categories
386386

387387
}//article
388388

389+
/* Page loop styling */
390+
391+
.page article {
392+
border-bottom: none;
393+
394+
.title {
395+
margin-bottom: @margin;
396+
}
397+
398+
}// .page article
399+
400+
389401
/* Pagination */
390402
#pagination {
391403
margin-bottom: @margin;
@@ -442,15 +454,19 @@ h3#comments {
442454
}
443455

444456
}// comment-author
445-
446-
.comment-meta {
447-
font-size: (@body-text-size - 6);
448-
margin-bottom: 10px;
449-
}
450-
451-
452-
453457

458+
}//commentlist
459+
460+
// Jetpack
461+
462+
.comment-meta {
463+
font-size: (@body-text-size - 6);
464+
margin-bottom: 10px;
465+
}
466+
467+
.comment-subscription-form, .comment-subscription-form {
468+
margin-bottom: 0;
469+
font-size: ( @body-text-size - 4px);
454470
}
455471

456472
#respond {
@@ -478,6 +494,20 @@ footer {
478494
/* Misc & mixens
479495
-------------------------------------------------------------- */
480496

497+
498+
/* Jetpack Gallery */
499+
500+
.gallery {
501+
502+
.gallery-item {
503+
margin-top: 0 !important;
504+
}
505+
506+
img {
507+
border: none !important;
508+
}
509+
}
510+
481511
.hide-text {
482512
overflow: hidden;
483513
text-indent: 100%;
@@ -538,6 +568,11 @@ html[xmlns] .clearfix {
538568
.gravatar {
539569
float: none;
540570
}
571+
572+
hgroup {
573+
width: 100%;
574+
}
575+
541576
}//header
542577

543578
} // max-width 767px

‎functions.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
/*-----------------------------------------------------------------------------------*/
66
add_theme_support( 'automatic-feed-links' );
77

8-
/*-----------------------------------------------------------------------------------*/
9-
/* enable post thumbnails
10-
/*-----------------------------------------------------------------------------------*/
11-
add_theme_support( 'post-thumbnails' );
128

139
/*-----------------------------------------------------------------------------------*/
1410
/* register main menu

‎index.php‎

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<head>
33
<meta charset="<?php bloginfo( 'charset' ); ?>" />
44
<meta name="viewport" content="width=device-width" />
5-
<title><?php wp_title( '|', true, 'right' ); ?></title>
5+
<title><?php bloginfo('name'); ?> | <?php if( is_home() ) : echo bloginfo( 'description' ); endif; ?><?php wp_title( '', true ); ?></title>
6+
67
<link rel="profile" href="http://gmpg.org/xfn/11" />
78
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
89

@@ -45,17 +46,18 @@
4546

4647
<div class="container">
4748

49+
<div id="primary">
50+
<div id="content" role="main">
51+
52+
4853
<?php
4954
/*-----------------------------------------------------------------------------------*/
5055
/* Start Home loop
5156
/*-----------------------------------------------------------------------------------*/
5257

53-
if( is_home() ) {
58+
if( is_home() || is_archive() ) {
5459

5560
?>
56-
<div id="primary">
57-
<div id="content" role="main">
58-
5961
<?php if ( have_posts() ) : ?>
6062

6163
<?php while ( have_posts() ) : the_post(); ?>
@@ -105,8 +107,6 @@
105107

106108
<?php endif; ?>
107109

108-
</div><!-- #content .site-content -->
109-
</div><!-- #primary .content-area -->
110110

111111
<?php } //end is_home(); ?>
112112

@@ -115,12 +115,9 @@
115115
/* Start Single loop
116116
/*-----------------------------------------------------------------------------------*/
117117

118-
if( is_single() || is_archive() ) {
118+
if( is_single() ) {
119119
?>
120120

121-
122-
<div id="primary">
123-
<div id="content" role="main">
124121

125122
<?php if ( have_posts() ) : ?>
126123

@@ -163,8 +160,6 @@
163160

164161
<?php endif; ?>
165162

166-
</div><!-- #content .site-content -->
167-
</div><!-- #primary .content-area -->
168163

169164
<?php } //end is_single(); ?>
170165

@@ -175,24 +170,54 @@
175170

176171
if( is_page()) {
177172
?>
173+
174+
<?php if ( have_posts() ) : ?>
175+
176+
<?php while ( have_posts() ) : the_post(); ?>
177+
178+
<article class="post">
179+
180+
<h1 class="title"><?php the_title() ?></h1>
181+
182+
<div class="the-content">
183+
<?php the_content(); ?>
184+
185+
<?php wp_link_pages(); ?>
186+
</div><!-- the-content -->
187+
188+
</article>
189+
190+
<?php endwhile; ?>
191+
192+
<?php else : ?>
193+
194+
<article class="post error">
195+
<h1 class="404">Nothing posted yet</h1>
196+
</article>
197+
198+
<?php endif; ?>
199+
178200
<?php } // end is_page(); ?>
201+
202+
</div><!-- #content .site-content -->
203+
</div><!-- #primary .content-area -->
204+
205+
</div><!-- / container-->
206+
179207
<?php
180208
/*-----------------------------------------------------------------------------------*/
181209
/* Start Footer
182210
/*-----------------------------------------------------------------------------------*/
183211
?>
184212

185-
</div><!-- / container-->
186-
187-
<footer class="site-footer" role="contentinfo">
188-
<div class="site-info container">
189-
<?php do_action( 'break_credits' ); ?>
190-
<a href="http://wordpress.org/" title="A Semantic Personal Publishing Platform" rel="generator">Proudly powered by WordPress</a>
191-
<span class="sep"> and </span>
192-
<a href="http://lessmade.com/themes/less" rel="theme">LESS</a> by <a href="http://jarederickson.com" rel="designer">Jared Erickson</a>
193-
</div><!-- .site-info -->
194-
</footer><!-- #colophon .site-footer -->
195-
</div><!-- #page .hfeed .site -->
213+
<footer class="site-footer" role="contentinfo">
214+
<div class="site-info container">
215+
<?php do_action( 'break_credits' ); ?>
216+
<a href="http://wordpress.org/" title="A Semantic Personal Publishing Platform" rel="generator">Proudly powered by WordPress</a>
217+
<span class="sep"> and </span>
218+
<a href="http://lessmade.com/themes/less" rel="theme">LESS</a> by <a href="http://jarederickson.com" rel="designer">Jared Erickson</a>
219+
</div><!-- .site-info -->
220+
</footer><!-- #colophon .site-footer -->
196221

197222
<?php wp_footer(); ?>
198223

‎style.css‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ section {
120120
display: block;
121121
}
122122
html {
123-
overflow-y: scroll;
124-
/* Keeps page centred in all browsers regardless of content height */
125-
123+
margin: 0;
124+
padding: 0;
126125
font-size: 62.5%;
127126
/* Corrects text resizing oddly in IE6/7 when body font-size is set using em units http://clagnut.com/blog/348/#c790 */
128127

@@ -332,6 +331,7 @@ button,
332331
input,
333332
select {
334333
padding: 0;
334+
margin: 0;
335335
background: #ffffff;
336336
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
337337
line-height: 26.64px;
@@ -583,6 +583,13 @@ article .post-categories li {
583583
display: inline-block;
584584
margin-right: 10px;
585585
}
586+
/* Page loop styling */
587+
.page article {
588+
border-bottom: none;
589+
}
590+
.page article .title {
591+
margin-bottom: 40px;
592+
}
586593
/* Pagination */
587594
#pagination {
588595
margin-bottom: 40px;
@@ -627,10 +634,15 @@ h3#comments {
627634
.commentlist .comment-author .says {
628635
display: none;
629636
}
630-
.commentlist .comment-meta {
637+
.comment-meta {
631638
font-size: 12px;
632639
margin-bottom: 10px;
633640
}
641+
.comment-subscription-form,
642+
.comment-subscription-form {
643+
margin-bottom: 0;
644+
font-size: 14px;
645+
}
634646
#respond {
635647
margin-bottom: 80px;
636648
}
@@ -648,6 +660,12 @@ footer {
648660
}
649661
/* Misc & mixens
650662
-------------------------------------------------------------- */
663+
/* Jetpack Gallery */.gallery .gallery-item {
664+
margin-top: 0 !important;
665+
}
666+
.gallery img {
667+
border: none !important;
668+
}
651669
.hide-text {
652670
overflow: hidden;
653671
text-indent: 100%;
@@ -683,4 +701,7 @@ html[xmlns] .clearfix {
683701
header .gravatar {
684702
float: none;
685703
}
704+
header hgroup {
705+
width: 100%;
706+
}
686707
}

0 commit comments

Comments
 (0)