Issue 5634 - Replaced logo and refactored navbar width and colors

static/css/main.css

Index: static/css/main.css
===================================================================
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -86,18 +86,19 @@
   .two-thirds {
     width: 66.666667%; }
   .one-fourth {
     width: 25%; }
   .three-fourths {
     width: 75%; } }
 
 *
+>>>>>>> destination
 {
-  font-family: Arial, sans;
+  font-family: 'Source Sans Pro', sans-serif;
   font-size: 16px;
 }
 
 body
 {
   margin: 0;
   line-height: 1.5;
 }
@@ -133,81 +134,301 @@
 .sprite
 {
   display: inline-block;
   font-size: 0px; /* fix for IE6 height bug */
   background-image: url(../img/sprite-main.png);
   background-repeat: no-repeat;
 }
 
-nav ul
+/*******************************************************************************
+ * #navbar
+ ******************************************************************************/
+
+#navbar
 {
-  list-style: none;
-  margin: 0;
-  padding: 0;
+  height: 4em;
+  background-color: #c70d2c;
+}
+
+#navbar ul
+{
+  margin: 0em;
+  padding: 0em;
+}
+
+#navbar li
+{
+  list-style-type: none;
 }
 
-nav a:link, nav a:visited
+#navbar .container
+{
+  padding: 0em;
+}
+
+@media(max-width: 1199px)
 {
-  color: #7d7d7d;
+  #navbar .container
+  {
+    width: 100%;
+  }
+}
+
+/* #navbar #logo
+ ******************************************************************************/
+
+#logo
+{
+  padding-left: 1em;
+  padding-right: 1em;
+  color: #fff;
+}
+
+#logo:hover,
+#logo:active,
+#logo:focus
+{
+  background-color: #AE0013;
   text-decoration: none;
 }
 
-nav a:hover
-{
-  text-decoration: underline;
-}
-
-header
+#logo,
+#logo > *
 {
   display: block;
-  position: relative;
-  background: white;
-  border: 1px solid #d9d9d9;
-  border-top: none;
-  box-shadow: 1px 1px 0 0 #d9d9d9;
-  z-index: 1;
+  float: left;
 }
 
-header nav li
+[dir="rtl"] #logo,
+[dir="rtl"] #logo > *
 {
-  padding: 0px 5px;
+  float: right;
 }
 
-header nav li.selected
+#logo img
 {
-  color: #db1313;
-  text-shadow: 1px 1px 1px #eee;
-  cursor: default;
+  height: 3em;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+  margin-right: 1em;
 }
 
-header nav li.install-link a
+[dir="rtl"] #logo > img
 {
-  color: #048e48;
+  margin-left: 1em;
 }
 
-header nav li.install-link .install-link-icon
+#logo > span
 {
-  display: inline-block;
-  width: 12px;
-  height: 12px;
-  background-position: -167px -13px;
+  line-height: 2.909090em;
+  font-size: 1.375em;
 }
 
-.language-entry a
+/* #navbar #menu-toggle
+ ******************************************************************************/
+
+#menu-toggle
 {
   display: block;
 }
 
-#logo
+#menu-toggle,
+#menu-toggle > img
+{
+  float: right;
+}
+
+[dir="rtl"] #menu-toggle,
+[dir="rtl"] #menu-toggle > img
+{
+  float: left;
+}
+
+#menu-toggle > img
+{
+  display: inline-block;
+  height: 2em;
+  padding: 1em 1em;
+}
+
+#menu-toggle:hover,
+#menu-toggle:active,
+#menu-toggle:focus
+{
+  background-color: #AE0013;
+}
+
+@media(min-width: 992px)
+{
+  #menu-toggle
+  {
+    display: none;
+  }
+}
+
+/* #navbar #navbar-menu
+ ******************************************************************************/
+
+#navbar-menu a
+{
+  color: #fff;
+  text-decoration: none;
+}
+
+/* #navbar #navbar-menu (desktop)
+ ******************************************************************************/
+
+@media(min-width: 992px)
 {
-  position: absolute;
-  width: 128px;
-  height: 128px;
-  background-position: -83px -83px;
+  #navbar-menu
+  {
+    float: right;
+  }
+
+  [dir="rtl"] #navbar-menu
+  {
+    float: left;
+  }
+
+  #navbar-menu > li,
+  #navbar-menu > li > a
+  {
+    display: inline-block;
+  }
+
+  #navbar-menu > li > a
+  {
+    padding-right: 1em;
+    padding-left: 1em;
+    line-height: 4em;
+  }
+
+  #navbar-menu > li > a:hover,
+  #navbar-menu > li > a:active,
+  #navbar-menu > li > a:focus
+  {
+    background-color: #AE0013;
+  }
+
+  /* #navbar #navbar-menu #locale-menu
+   ****************************************************************************/
+
+  #locale-menubar
+  {
+    position: relative;
+  }
+
+  #locale-menu
+  {
+    position: absolute;
+    display: none;
+    min-width: 16em;
+    max-height: 20em;
+    max-height: 50vh;
+    top: 100%;
+    right: 0px;
+    overflow: auto;
+    z-index: 1000;
+    background-color: #292929;
+  }
+
+  [dir="rtl"] #locale-menu
+  {
+    right: auto;
+    left: 0px;
+  }
+
+  #locale-menu.visible
+  {
+    display: block;
+  }
+
+  #locale-menu > li,
+  #locale-menu > li > a
+  {
+    display: block;
+    white-space: nowrap;
+  }
+
+  #locale-menu > li > a
+  {
+    padding-left: 1em;
+    padding-right: 1em;
+    line-height: 3em;
+    text-decoration: none;
+  }
+
+  #locale-menu > li > a:hover,
+  #locale-menu > li > a:active,
+  #locale-menu > li > a:focus
+  {
+    background-color: #434343;
+  }
+
+  /* caret */
+  #locale-selected::after
+  {
+    display: inline-block;
+    width: 0;
+    height: 0;
+    margin-left: .255em;
+    vertical-align: .255em;
+    content: "";
+    border-top: .3em solid;
+    border-right: .3em solid transparent;
+    border-left: .3em solid transparent;
+  }
+}
+
+/* #navbar #navbar-menu (mobile)
+ ******************************************************************************/
+
+@media(max-width: 991px)
+{
+  #navbar-menu
+  {
+    display: none;
+    float: left;
+    background-color: #292929;
+  }
+
+  #navbar-menu.visible,
+  #navbar-menu li,
+  #navbar-menu li a
+  {
+    display: block;
+  }
+
+  #navbar-menu li a
+  {
+    line-height: 3em;
+    padding-left: 1em;
+    padding-right: 1em;
+  }
+
+  #navbar-menu li a:hover,
+  #navbar-menu li a:active,
+  #navbar-menu li a:focus
+  {
+    background-color: #434343;
+  }
+
+  /* locales appear inline in mobile menu */
+  #locale-menu li,
+  #locale-menu  a
+  {
+    display: inline-block;
+  }
+
+  /* selected locale does not appear in mobile menu */
+  #navbar-menu #locale-selected
+  {
+    display: none;
+  }
 }
 
 #content h1
 {
   font-size: 30px;
 }
 
 #content h2