gribse/achille-press
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge conflicts.

Browse source
This commit is contained in:
Konstantin Obenland 2015-01-14 09:35:02 -08:00
commit ec2a5e212a
15 changed files with 87 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sass/mixins/_mixins-master.scss
View file

@ -7,7 +7,8 @@
// Center block
@mixin center-block {
display: block;
margin: 0 auto;
margin-left: auto;
margin-right: auto;
}
// Clearfix

4
sass/modules/_infinite-scroll.scss
View file

@ -1,6 +1,6 @@
/* Globally hidden elements when Infinite Scroll is supported and in use. */
.infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden). */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling). */
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
display: none;
}

6
sass/navigation/_menus.scss
View file

@ -78,21 +78,21 @@
}
.site-main .comment-navigation,
.site-main .paging-navigation,
.site-main .posts-navigation,
.site-main .post-navigation {
margin: 0 0 1.5em;
overflow: hidden;
}
.comment-navigation .nav-previous,
.paging-navigation .nav-previous,
.posts-navigation .nav-previous,
.post-navigation .nav-previous {
float: left;
width: 50%;
}
.comment-navigation .nav-next,
.paging-navigation .nav-next,
.posts-navigation .nav-next,
.post-navigation .nav-next {
float: right;
text-align: right;

4
sass/style.scss
View file

@ -4,7 +4,7 @@ Theme URI: http://underscores.me/
Author: Automattic
Author URI: http://automattic.com/
Description: Hi. I'm a starter theme called <code>_s</code>, or <em>underscores</em>, if you like. I'm a theme meant for hacking so don't use me as a <em>Parent Theme</em>. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
Version: 1.0-wpcom
Version: 1.0.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: _s
@ -13,7 +13,7 @@ Tags:
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
_s is based on Underscores http://underscores.me/, (C) 2012-2014 Automattic, Inc.
_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc.
Normalizing styles have been helped along thanks to the fine work of
Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/