Syncing with dev branch

This commit is contained in:
Braad
2015-04-21 12:05:22 -07:00
parent 9de3310f11
commit 6d34078f94
24 changed files with 4150 additions and 162 deletions
+27 -34
View File
@@ -1368,15 +1368,11 @@ Site Header
.site-header .widget-area {
width: 100%;
padding: 20px;
background-color: #eee;
border: 1px solid #ddd;
border-width: 0;
overflow: hidden;
}
.site-header .widget-area.open {
padding: 20px;
border-width: 1px 0;
overflow: hidden;
}
.site-header .search-form {
@@ -1414,23 +1410,21 @@ Site Header
content: "\f0c9";
}
.nav-primary,
/*.site-header .nav-primary,*/
.site-header .widget-area {
position: absolute;
z-index: -999;
top: 100%;
left: 0;
right: 0;
max-height: 0;
opacity: 0;
filter: alpha(opacity=0);
box-shadow: 0 4px 8px 1px rgba(0,0,0,0.4);
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-webkit-transition: all .5s ease, padding 0s .5s;
-moz-transition: all .5s ease, padding 0s .5s;
-ms-transition: all .5s ease, padding 0s .5s;
-o-transition: all .5s ease, padding 0s .5s;
transition: all .5s ease, padding 0s .5s;
-webkit-transition: opacity 0.25s ease, z-index 0s 0.25s;
-moz-transition: opacity 0.25s ease, z-index 0s 0.25s;
-ms-transition: opacity 0.25s ease, z-index 0s 0.25s;
-o-transition: opacity 0.25s ease, z-index 0s 0.25s;
transition: opacity 0.25s ease, z-index 0s 0.25s;
}
.site-container > .nav-primary {
@@ -1440,14 +1434,13 @@ Site Header
.nav-primary.open,
.widget-area.open {
z-index: 50;
max-height: 9999px;
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-webkit-transition: opacity .5s ease, padding 0s 0s;
-moz-transition: opacity .5s ease, padding 0s 0s;
-ms-transition: opacity .5s ease, padding 0s 0s;
-o-transition: opacity .5s ease, padding 0s 0s;
transition: opacity .5s ease, padding 0s 0s;
filter: alpha(opacity=100);
-webkit-transition: z-index 0s ease, opacity 0.25s 0s;
-moz-transition: z-index 0s ease, opacity 0.25s 0s;
-ms-transition: z-index 0s ease, opacity 0.25s 0s;
-o-transition: z-index 0s ease, opacity 0.25s 0s;
transition: z-index 0s ease, opacity 0.25s 0s;
}
@@ -1623,7 +1616,7 @@ Site Navigation
.genesis-nav-menu > .right .search-form {
display: inline-block;
padding: 0;
padding: 8px 0;
}
.genesis-nav-menu > .right input[type="submit"] {
@@ -1682,12 +1675,6 @@ Site Navigation
padding: 0;
}
.site-header .nav-primary a:hover,
.site-header .nav-primary [class*="current-"] > a,
.site-header .nav-primary [class*="current_"] > a {
color: #333;
}
.site-header .right {
padding-right: 0;
}
@@ -2481,7 +2468,7 @@ Media Queries
--------------------------------------------- */
.genesis-nav-menu > .right {
display: inline-block;
display: none;
float: right;
border-top: none;
}
@@ -2491,10 +2478,6 @@ Media Queries
margin: 0 0 0 2rem;
}
.genesis-nav-menu > .search form {
padding-right: 0;
}
.genesis-nav-menu > .right input[type="submit"] {
display: inline-block;
}
@@ -2570,6 +2553,16 @@ Media Queries
padding: 0.6em 1.2em;
}
.site-header .nav-primary .menu > li:last-of-type:not(.right) {
padding-right: 0;
}
.site-header .nav-primary a:hover,
.site-header .nav-primary [class*="current-"] > a,
.site-header .nav-primary [class*="current_"] > a {
color: #333;
}
/* Plugins
--------------------------------------------- */