Issue 5634 - Replaced logo and refactored navbar width and colors

static/css/main.css

-/*******************************************************************************
- * Base styles
- ******************************************************************************/
-html {
-  color: #212121;
-  background-color: #fff;
-  font-family: sans-serif;
-  line-height: 1.5; }
-
-/**
- * Stretch content full-width
- */
-.full-width {
-  display: block;
-  width: 100%;
-  margin: 1em 0px; }
-
-/**
- * Center content within a (responsive) fixed width
- */
-.container {
-  width: auto;
-  max-width: 100%;
-  margin: 0px auto;
-  padding: 0px 1em; }
-
-@media (min-width: 768px) {
-  .container {
-    width: 720px; } }
-
-@media (min-width: 1200px) {
-  .container {
-    width: 1170px; } }
-
-/*******************************************************************************
- * Grid component
- ******************************************************************************/
-/**
- * - .row contains one or more .column(s)
- * - .row clears .column(s)
- * - .row negates the left & right padding of it's left-most & right-most
- *   .column(s) while preserving consistent padding between .column(s)
- */
-.row {
-  margin: 0px -1em; }
-
-.row:after {
-  display: block;
-  clear: both;
-  content: ""; }
-
-/**
- * - .column is 100% width by default
- * - Modifier classes are applied to .column to change it's width
- * - Modifier classes behave differently on different device widths
- */
-.column {
-  position: relative;
-  width: 100%;
-  min-height: 1px;
-  padding: 0px 1em; }
-
-/* - .column(s) within .row .reverse appear in reverse order
- * - .column(s) within [dir=rtl] appear in reverse order respectively
- */
-.column,
-[dir="rtl"] .reverse .column {
-  float: left; }
-
-.row,
-.column {
-  box-sizing: border-box; }
-
-.reverse .column,
-[dir="rtl"] .column {
-  float: right; }
-
-@media (min-width: 768px) {
-  .one-half,
-  .one-fourth {
-    width: 50%; } }
-
-@media (min-width: 1200px) {
-  .one-third {
-    width: 33.333333%; }
-  .two-thirds {
-    width: 66.666667%; }
-  .one-fourth {
-    width: 25%; }
-  .three-fourths {
-    width: 75%; } }
-
 *
->>>>>>> destination
-{
-  font-family: 'Source Sans Pro', sans-serif;
+{
+  font-family: Arial, sans;
   font-size: 16px;
 }
 
 body
 {
   margin: 0;
   line-height: 1.5;
 }
 
 a img
@@ skipping 23 matching lines @@
   border: 1px solid black;
   overflow: auto;
 }
 
 .sprite
 {
   display: inline-block;
   font-size: 0px; /* fix for IE6 height bug */
   background-image: url(../img/sprite-main.png);
   background-repeat: no-repeat;
-}
-
-/*******************************************************************************
- * #navbar
- ******************************************************************************/
-
-#navbar
-{
-  height: 4em;
-  background-color: #c70d2c;
-}
-
-#navbar ul
-{
-  margin: 0em;
-  padding: 0em;
-}
-
-#navbar li
-{
-  list-style-type: none;
-}
-
-#navbar .container
-{
-  padding: 0em;
-}
-
-@media(max-width: 1199px)
-{
-  #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;
-}
-
-#logo,
-#logo > *
-{
-  display: block;
-  float: left;
-}
-
-[dir="rtl"] #logo,
-[dir="rtl"] #logo > *
-{
-  float: right;
-}
-
-#logo img
-{
-  height: 3em;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
-  margin-right: 1em;
-}
-
-[dir="rtl"] #logo > img
-{
-  margin-left: 1em;
-}
-
-#logo > span
-{
-  line-height: 2.909090em;
-  font-size: 1.375em;
-}
-
-/* #navbar #menu-toggle
- ******************************************************************************/
-
-#menu-toggle
-{
-  display: block;
-}
-
-#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)
-{
-  #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
-{
-  font-weight: bold;
-  font-size: 25px;
-}
-
-#content h3
-{
-  font-size: 20px;
 }
 
 #adblock-browser-notification
 {
   text-align: center;
 }
 
 #adblock-browser-notification a
 {
   font-weight: bold;
@@ skipping 143 matching lines @@
 
 [dir="ltr"] .alert
 {
   border-left: 5px solid #d14841;
 }
 
 [dir="rtl"] .alert
 {
   border-right: 5px solid #d14841;
 }
+
+/******************************************************************************
+ * .content
+ *****************************************************************************/
+
+.content h1,
+.content h2,
+.content h3,
+.content h4,
+.content h5
+{
+  font-weight: bold;
+  margin: 32px 0px;
+  margin: 2rem 0rem;
+}
+
+.content h1 { font-size: 2.4em; }
+.content h2 { font-size: 1.6em; }
+.content h3 { font-size: 1.3em; }
+.content h4 { font-size: 1.2em; }
+.content h5 { font-size: 1.1em; }
+
+/*******************************************************************************
+ * #navbar
+ ******************************************************************************/
+
+#navbar
+{
+  height: 4em;
+  background-color: #c70d2c;
+}
+
+#navbar li
+{
+  list-style-type: none;
+}
+
+/* padding provided by navbar contents */
+.navbar-container
+{
+  width: 1170px;
+  margin: 0 auto;
+}
+
+/* full-width under .container max-width */
+@media(max-width: 1199px)
+{
+  .navbar-container
+  {
+    width: 100%;
+  }
+}
+
+/* #navbar #navbar-logo
+ ******************************************************************************/
+
+#navbar-logo
+{
+  /* padding is visible in hover background-color change */
+  padding: 0em 1em;
+  color: #fff;
+}
+
+#navbar-logo:hover,
+#navbar-logo:active,
+#navbar-logo:focus
+{
+  background-color: #AE0013;
+  text-decoration: none;
+}
+
+#navbar-logo,
+#navbar-logo > *
+{
+  float: left;
+}
+
+[dir="rtl"] #navbar-logo,
+[dir="rtl"] #navbar-logo > *
+{
+  float: right;
+}
+
+#navbar-logo img
+{
+  height: 4em;
+  padding: 0.5em 0em;
+  margin: 0em 1em 0em 0em;
+}
+
+[dir="rtl"] #navbar-logo > img
+{
+  margin: 0em  0em 0em 1em;
+}
+
+#navbar-logo > span
+{
+  /* full-height: 2.91 * 1.375 = ~4em */
+  line-height: 2.91em;
+  font-size: 1.375em;
+}
+
+/* #navbar #navbar-menu-toggle
+ ******************************************************************************/
+
+#navbar-menu-toggle
+{
+  float: right;
+  padding: 1em;
+}
+
+[dir="rtl"] #navbar-menu-toggle
+{
+  float: left;
+}
+
+/* show on mobile */
+#navbar-menu-toggle,
+#navbar-menu-toggle > img
+{
+  display: block;
+}
+
+/* hide on desktop */
+@media(min-width: 992px)
+{
+  #navbar-menu-toggle
+  {
+    display: none;
+  }
+}
+
+#navbar-menu-toggle > img
+{
+  /* plus 2em padding = 4em */
+  height: 2em;
+}
+
+#navbar-menu-toggle:hover,
+#navbar-menu-toggle:active,
+#navbar-menu-toggle:focus
+{
+  background-color: #AE0013;
+}
+
+/* #navbar #navbar-menu
+ ******************************************************************************/
+
+#navbar-menu a
+{
+  display: block;
+  color: #fff;
+  text-decoration: none;
+}
+
+/* #navbar #navbar-menu #navbar-locale-menu
+ ******************************************************************************/
+
+/* caret */
+#navbar-locale-selected:after
+{
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin: 0em 0em 0em 0.255em;
+  vertical-align: .255em;
+  content: "";
+  border-top: .3em solid;
+  border-right: .3em solid transparent;
+  border-left: .3em solid transparent;
+}
+
+[dir="rtl"] #navbar-locale-selected:after
+{
+  margin: 0em 0.255em 0em 0em;
+}
+
+#navbar-locale-menu
+{
+  display: none;
+}
+
+#navbar-locale-menu.visible
+{
+  display: block;
+}
+
+#navbar-locale-menu > li > a
+{
+  padding: 0.75em 1em;
+}
+
+#navbar-locale-menu > li > a:hover,
+#navbar-locale-menu > li > a:active,
+#navbar-locale-menu > li > a:focus
+{
+  background-color: #434343;
+}
+
+/* #navbar #navbar-menu (desktop)
+ ******************************************************************************/
+
+@media(min-width: 992px)
+{
+  #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: 0em 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 #navbar-locale-menu
+   ****************************************************************************/
+
+  #navbar-locale-menubar
+  {
+    position: relative;
+  }
+
+  #navbar-locale-menu
+  {
+    position: absolute;
+    min-width: 16em;
+    max-height: 20em;
+    max-height: 50vh;
+    top: 100%;
+    right: 0px;
+    overflow: auto;
+    z-index: 9001;
+    background-color: #292929;
+  }
+
+  [dir="rtl"] #navbar-locale-menu
+  {
+    right: auto;
+    left: 0px;
+  }
+}
+
+/* #navbar #navbar-menu (mobile)
+ ******************************************************************************/
+
+@media(max-width: 991px)
+{
+  #navbar-menu
+  {
+    display: none;
+    float: left;
+    clear: both;
+    width: 100%;
+    background-color: #292929;
+  }
+
+  #navbar-menu.visible
+  {
+    display: block;
+  }
+
+  #navbar-menu li a
+  {
+    padding: 0.75em 1em;
+  }
+
+  #navbar-menu li a:hover,
+  #navbar-menu li a:active,
+  #navbar-menu li a:focus
+  {
+    background-color: #434343;
+  }
+}