rayelliott
/
_s
Archived
forked from mirror/_s
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #698 from slushman/master 

Remove duplicate b & strong and improve SASS inheritance.
This commit is contained in:
Konstantin Obenland 2015-02-10 08:25:07 -08:00
parent 41f33d3c9a 7ef388656e
commit 56bad5250d
7 changed files with 59 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sass/elements/_elements.scss
View File

@ -12,13 +12,13 @@ body {
background: $color__background-body; /* Fallback for when there is no custom background color defined. */ background: $color__background-body; /* Fallback for when there is no custom background color defined. */
} }
blockquote:before, blockquote:after,
q:before, q:after {
content: "";
}
blockquote, q { blockquote, q {
quotes: "" ""; quotes: "" "";
&:before,
&:after {
content: "";
}
} }
hr { hr {

27
sass/forms/_buttons.scss
View File

@ -12,24 +12,15 @@ input[type="submit"] {
line-height: 1; line-height: 1;
padding: .6em 1em .4em; padding: .6em 1em .4em;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
}
button:hover, &:hover {
input[type="button"]:hover, border-color: $color__border-button-hover;
input[type="reset"]:hover, box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
input[type="submit"]:hover { }
border-color: $color__border-button-hover;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
}
button:focus, &:active,
input[type="button"]:focus, &:focus {
input[type="reset"]:focus, border-color: $color__border-button-focus;
input[type="submit"]:focus, box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
button:active, }
input[type="button"]:active,
input[type="reset"]:active,
input[type="submit"]:active {
border-color: $color__border-button-focus;
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
} }

11
sass/forms/_fields.scss
View File

@ -7,15 +7,10 @@ textarea {
color: $color__text-input; color: $color__text-input;
border: 1px solid $color__border-input; border: 1px solid $color__border-input;
border-radius: 3px; border-radius: 3px;
}
input[type="text"]:focus, &:focus {
input[type="email"]:focus, color: $color__text-input-focus;
input[type="url"]:focus, }
input[type="password"]:focus,
input[type="search"]:focus,
textarea:focus {
color: $color__text-input-focus;
} }
input[type="text"], input[type="text"],

48
sass/media/_galleries.scss
View File

@ -7,38 +7,38 @@
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
width: 100%; width: 100%;
}
.gallery-columns-2 .gallery-item { .gallery-columns-2 & {
max-width: 50%; max-width: 50%;
} }
.gallery-columns-3 .gallery-item { .gallery-columns-3 & {
max-width: 33.33%; max-width: 33.33%;
} }
.gallery-columns-4 .gallery-item { .gallery-columns-4 & {
max-width: 25%; max-width: 25%;
} }
.gallery-columns-5 .gallery-item { .gallery-columns-5 & {
max-width: 20%; max-width: 20%;
} }
.gallery-columns-6 .gallery-item { .gallery-columns-6 & {
max-width: 16.66%; max-width: 16.66%;
} }
.gallery-columns-7 .gallery-item { .gallery-columns-7 & {
max-width: 14.28%; max-width: 14.28%;
} }
.gallery-columns-8 .gallery-item { .gallery-columns-8 & {
max-width: 12.5%; max-width: 12.5%;
} }
.gallery-columns-9 .gallery-item { .gallery-columns-9 & {
max-width: 11.11%; max-width: 11.11%;
}
} }
.gallery-caption { .gallery-caption {

35
sass/navigation/_menus.scss
View File

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

4
sass/typography/_copy.scss
View File

@ -2,10 +2,6 @@ p {
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
b, strong {
font-weight: bold;
}
dfn, cite, em, i { dfn, cite, em, i {
font-style: italic; font-style: italic;
} }

5
style.css
View File

@ -289,11 +289,6 @@ p {
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }
b,
strong {
font-weight: bold;
}
dfn, dfn,
cite, cite,
em, em,