Skip to content

Commit

Permalink
Merge diff between sass and css
Browse files Browse the repository at this point in the history
  • Loading branch information
youthkee committed Mar 3, 2016
1 parent 44550d4 commit cab232e
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 62 deletions.
4 changes: 2 additions & 2 deletions sass/forms/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ input[type="submit"] {
border-radius: 3px;
background: $color__background-button;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05);
color: rgba(0, 0, 0, .8);
color: rgba(0, 0, 0, 0.8);
@include font-size(0.75);
line-height: 1;
padding: .6em 1em .4em;
Expand All @@ -23,4 +23,4 @@ input[type="submit"] {
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);
}
}
}
2 changes: 1 addition & 1 deletion sass/site/secondary/_widgets.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.widget {
margin: 0 0 1.5em;

/* Make sure select elements fit in widgets. */
select {
max-width: 100%;
/* Make sure select elements fit in widgets. */
}
}
2 changes: 1 addition & 1 deletion sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/
# Clearings
# Widgets
# Content
## Posts and pages
## Posts and pages
## Asides
## Comments
# Infinite scroll
Expand Down
85 changes: 27 additions & 58 deletions style.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*!
Theme Name: _s
Theme URI: http://underscores.me/
Author: Automattic
Expand All @@ -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-2015 Automattic, Inc.
_s is based on Underscores http://underscores.me/, (C) 2012-2016 Automattic, Inc.
Underscores is distributed under the terms of the GNU GPL v2 or later.
Normalizing styles have been helped along thanks to the fine work of
Expand Down Expand Up @@ -360,18 +360,17 @@ body {
background: #fff; /* Fallback for when there is no custom background color defined. */
}

blockquote,
q {
quotes: "" "";
}
blockquote:before,
blockquote:after,
q:before,
q:after {
content: "";
}

blockquote,
q {
quotes: "" "";
}

hr {
background-color: #ccc;
border: 0;
Expand Down Expand Up @@ -428,7 +427,7 @@ input[type="submit"] {
border-radius: 3px;
background: #e6e6e6;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05);
color: rgba(0, 0, 0, .8);
color: rgba(0, 0, 0, 0.8);
font-size: 12px;
font-size: 0.75rem;
line-height: 1;
Expand All @@ -443,15 +442,14 @@ input[type="submit"]:hover {
border-color: #ccc #bbb #aaa;
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,
input[type="button"]:focus,
input[type="reset"]:focus,
input[type="submit"]:focus,
button:active,
button:focus,
input[type="button"]:active,
input[type="button"]:focus,
input[type="reset"]:active,
input[type="submit"]:active {
input[type="reset"]:focus,
input[type="submit"]:active,
input[type="submit"]:focus {
border-color: #aaa #bbb #bbb;
box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
}
Expand All @@ -476,11 +474,6 @@ textarea {
border: 1px solid #ccc;
border-radius: 3px;
}

select {
border: 1px solid #ccc;
}

input[type="text"]:focus,
input[type="email"]:focus,
input[type="url"]:focus,
Expand All @@ -500,6 +493,10 @@ textarea:focus {
color: #111;
}

select {
border: 1px solid #ccc;
}

input[type="text"],
input[type="email"],
input[type="url"],
Expand Down Expand Up @@ -568,17 +565,6 @@ a:active {
margin: 0;
padding-left: 0;
}

.main-navigation li {
float: left;
position: relative;
}

.main-navigation a {
display: block;
text-decoration: none;
}

.main-navigation ul ul {
box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);
float: left;
Expand All @@ -592,41 +578,24 @@ a:active {
left: -999em;
top: 0;
}

.main-navigation ul ul li:hover > ul,
.main-navigation ul ul li.focus > ul {
left: 100%;
}
.main-navigation ul ul a {
width: 200px;
}

.main-navigation ul ul li {

}

.main-navigation li:hover > a,
.main-navigation li.focus > a {
}

.main-navigation ul ul :hover > a,
.main-navigation ul ul .focus > a {
}

.main-navigation ul ul a:hover,
.main-navigation ul ul a.focus {
}

.main-navigation ul li:hover > ul,
.main-navigation ul li.focus > ul {
left: auto;
}

.main-navigation ul ul li:hover > ul,
.main-navigation ul ul li.focus > ul {
left: 100%;
.main-navigation li {
float: left;
position: relative;
}

.main-navigation .current_page_item > a,
.main-navigation .current-menu-item > a,
.main-navigation .current_page_ancestor > a,
.main-navigation .current-menu-ancestor > a {
.main-navigation a {
display: block;
text-decoration: none;
}

/* Small menu. */
Expand Down Expand Up @@ -761,9 +730,9 @@ a:active {
margin: 0 0 1.5em;
}

/* Make sure select elements fit in widgets. */
.widget select {
max-width: 100%;
/* Make sure select elements fit in widgets. */
}

/*--------------------------------------------------------------
Expand Down

0 comments on commit cab232e

Please sign in to comment.