Merge remote-tracking branch 'refs/remotes/BlissRoms/master'
# Conflicts:
# css/style.css
diff --git a/css/style.css b/css/style.css
index 577ee35..a0af41f 100644
--- a/css/style.css
+++ b/css/style.css
@@ -153,15 +153,23 @@
}
.navbar-collapse.collapse.collapsing {
background-color: #07374a;
-
+}
+.navbar-default .navbar-toggle .icon-bar {
+ color: #ffffff;
+ background-color: #ffffff; }
+.navbar-default .navbar-collapse.collapse.in ul {
+ background-color: #07374a;
+}
+.navbar-collapse.collapse.collapsing {
+ background-color: #07374a;
}
- .navbar-collapse.collapse.show {
+.navbar-collapse.collapse.show {
background-color: #07374a;
-webkit-transition: background-color .2s ease 0s;
transition: background-color .2s ease 0s;
}
-
+
/* Solid class attached on scroll past first section */
.navbar.solid {
background-color: #07374a;