diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml
index 14a9f1f..7f7370b 100644
--- a/_notes/dwsync.xml
+++ b/_notes/dwsync.xml
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/css/nav.css b/css/nav.css
index f047ae3..ff336a7 100644
--- a/css/nav.css
+++ b/css/nav.css
@@ -1,76 +1,5 @@
/* NAV
--------------------------------------------------------------*/
-.navbar-default .navbar-brand {
- height: auto;
- float: none;
- margin-right: 110px;
- font: 500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
- color: black;
-}
-
-/* overwriting bootstrap 3's philosophical opposition to drop down menus. */
-.dropdown-submenu {
- position: relative;
-}
-
-.dropdown-submenu > .dropdown-menu {
- top: 0;
- left: 100%;
- padding: 0;
-}
-
-.dropdown-submenu:hover > .dropdown-menu {
- display: block;
-}
-
-.dropdown-submenu > a:after {
- display: block;
- content: " ";
- float: right;
- width: 0;
- height: 0;
- border-color: transparent;
- border-style: solid;
- border-width: 5px 0 5px 5px;
- border-left-color: #cccccc;
- margin-top: 5px;
- margin-right: -10px;
-}
-
-.dropdown-submenu:hover > a:after {
- border-left-color: #ffffff;
-}
-
-.dropdown-submenu .pull-left {
- float: none;
-}
-
-.dropdown-submenu.pull-left > .dropdown-menu {
- left: -100%;
- margin-left: 10px;
-}
-
-.navbar-collapse {
- max-height: none;
-}
-
-/**/
-.menu-icon,
-.menu-label {
- display: inline-block;
-}
-
-.menu-label {
- position: relative;
- top: -.15em;
- margin-left: .2em;
-}
-
-.dropdown-menu .dropdown-menu {
- margin: 0;
- top: -1px;
-}
-
#masthead {
z-index: 9999;
}
diff --git a/header.php b/header.php
index acb3aa2..ef3611d 100644
--- a/header.php
+++ b/header.php
@@ -18,9 +18,6 @@
>
-
diff --git a/sass/nav.scss b/sass/nav.scss
index 9c757bd..6bb48f0 100644
--- a/sass/nav.scss
+++ b/sass/nav.scss
@@ -1,14 +1,8 @@
/* NAV
--------------------------------------------------------------*/
-.navbar-default .navbar-brand {
- height:auto;
- float:none;
- margin-right:110px;
- font:500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
- color:black;
- }
-/* overwriting bootstrap 3's philosophical opposition to drop down menus. */
+
+// Support for mulitple-level dropdown menus.
.dropdown-submenu{
position:relative;
}
@@ -22,6 +16,11 @@
.dropdown-submenu:hover > .dropdown-menu{
display:block;
}
+
+ .dropdown-submenu:hover > a {
+ color: $navbar-default-link-hover-color;
+ background-color: $navbar-default-link-hover-bg;
+ }
.dropdown-submenu > a:after{
display:block;
@@ -32,13 +31,13 @@
border-color:transparent;
border-style:solid;
border-width:5px 0 5px 5px;
- border-left-color:#cccccc;
+ border-left-color:$navbar-default-link-color;
margin-top:5px;
margin-right:-10px;
}
-
+
.dropdown-submenu:hover > a:after{
- border-left-color:#ffffff;
+ border-left-color:$navbar-default-link-hover-color;
}
.dropdown-submenu .pull-left{
@@ -50,22 +49,6 @@
margin-left:10px;
}
-.navbar-collapse {
- max-height:none;
- }
-
-/**/
-.menu-icon,
-.menu-label {
- display: inline-block;
- }
- .menu-label {
- position: relative;
- top:-.15em;
- margin-left: .2em;
- }
-
-// Alignment Correction
.dropdown-menu {
.dropdown-menu {
@@ -74,7 +57,40 @@
}
}
-// For IE
+/**/
+
+
+// Mobile Nav Changes
+ .navbar-collapse {
+ max-height:none;
+ }
+
+
+ .menu-icon,
+ .menu-label {
+ display: inline-block;
+ }
+ .menu-label {
+ position: relative;
+ top:-.15em;
+ margin-left: .2em;
+ }
+
+
+
+// Display Alternate Site Identity in Mobile
+
+.navbar-default .navbar-brand {
+ height:auto;
+ float:none;
+ margin-right:110px;
+ font:500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
+ color:black;
+ }
+
+/**/
+// For IE 7
+
$nav-z: 9999;
#masthead {
z-index:$nav-z;
diff --git a/style.css b/style.css
index e3b9d89..0170962 100644
--- a/style.css
+++ b/style.css
@@ -7109,15 +7109,6 @@ object {
/* NAV
--------------------------------------------------------------*/
-.navbar-default .navbar-brand {
- height: auto;
- float: none;
- margin-right: 110px;
- font: 500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
- color: black;
-}
-
-/* overwriting bootstrap 3's philosophical opposition to drop down menus. */
.dropdown-submenu {
position: relative;
}
@@ -7132,6 +7123,11 @@ object {
display: block;
}
+.dropdown-submenu:hover > a {
+ color: #333333;
+ background-color: transparent;
+}
+
.dropdown-submenu > a:after {
display: block;
content: " ";
@@ -7141,13 +7137,13 @@ object {
border-color: transparent;
border-style: solid;
border-width: 5px 0 5px 5px;
- border-left-color: #cccccc;
+ border-left-color: #777777;
margin-top: 5px;
margin-right: -10px;
}
.dropdown-submenu:hover > a:after {
- border-left-color: #ffffff;
+ border-left-color: #333333;
}
.dropdown-submenu .pull-left {
@@ -7159,11 +7155,16 @@ object {
margin-left: 10px;
}
+.dropdown-menu .dropdown-menu {
+ margin: 0;
+ top: -1px;
+}
+
+/**/
.navbar-collapse {
max-height: none;
}
-/**/
.menu-icon,
.menu-label {
display: inline-block;
@@ -7175,11 +7176,15 @@ object {
margin-left: .2em;
}
-.dropdown-menu .dropdown-menu {
- margin: 0;
- top: -1px;
+.navbar-default .navbar-brand {
+ height: auto;
+ float: none;
+ margin-right: 110px;
+ font: 500 18px "Proxima Nova", Helvetica, Arial, sans-serif;
+ color: black;
}
+/**/
#masthead {
z-index: 9999;
}