Merge pull request inasafe#282 from MariaSolovyeva/develop

Menu fix to match the blog menu, monochrome logo, new favicon

docs/themes/inasafe-theme/static/blog.css

@@ -1213,32 +1213,38 @@ pre code {
 }
 .container {
     margin-left: auto;
-    margin-right: auto;
+	margin-right: auto;
+	padding-left: 15px;
+	padding-right: 15px;
 }
-@media (min-width: 768px) {
-.container {
-    width: 753px;
+@media (min-width: 768px) and (max-width: 991px) {
+body .container {
+    width: 750px;
 }
-.span9 {
+body .span9 {
 	width: 500px;
 }
 body {
 	padding-top: 95px !important;
 }
 }
-@media (min-width: 992px) {
-.container {
+@media (min-width: 992px)  and (max-width: 1199px) {
+body .container {
     width: 940px;
 }
-.span9 {
-	width: 700px;
+body .span9 {
+	width: 660px;
 }
 }
 @media (min-width: 1200px) {
-.container {
+body .container {
     width: 1170px;
 }
+body .span9 {
+	width: 840px;
+}
 }
+
 .container-fluid {
     margin-left: auto;
     margin-right: auto;
@@ -4450,20 +4456,12 @@ a.list-group-item-danger.active, a.list-group-item-danger.active:hover, a.list-g
     min-height: 20px;
     padding: 19px;
 }
-.developer .well a,
-.user .well a,
-.orange .well a {
+.well a {
 	color: #2f3338;
 }
-.developer .well a:hover {
-	color: #3d9d45;
-}
-.user .well a:hover {
+.well a:hover {
 	color: #2f87a6;
 }
-.orange .well a:hover {
-	color: #f76926;
-}
 .well li {
 	margin-bottom: 5px;
 }

docs/themes/inasafe-theme/static/custom-jquery.js

@@ -35,24 +35,6 @@ jQuery(document).ready(function() {
 		 }
 	  });	
 
-	  //verify the current folder to show the sub-menu 
-	  if (window.location.href.indexOf("developer-docs") >= 0) {
-		  jQuery("body").addClass("developer");
-		  jQuery("span.dropdown").show();
-		  jQuery("#menu-coders").show();
-		  jQuery("li.menu-for-contributors").addClass("active");
-	  }
+	  jQuery('body').addClass('user');
 
-
-	  else if (window.location.href.indexOf("user-docs") >= 0 || window.location.href.indexOf("training") >= 0) {
-    	  jQuery("body").addClass("user");
-		  jQuery("#menu-for-users").show();
-		  jQuery(".menu-for-users").addClass("active");
-      }
-	  else {
-		  jQuery("body").addClass("orange");
-		  jQuery("#menu-about").show();
-		  jQuery(".menu-about").addClass("active");
-	  } 
-
 });	

docs/themes/inasafe-theme/static/theme.css

@@ -202,15 +202,9 @@ a:hover, a:active {
 outline: 0;
 }
 a {
-color: #f76926;
+color: #2f87a6;
 text-decoration: none;
 }
-.developer a {
-	color: #3d9d45;
-}
-.user a {
-	color: #2f87a6;
-}
 .guilabel {
 color: #FBAD5A;
 }
@@ -404,10 +398,10 @@ footer.content-info {
 	padding-top: 15px;
 }
 footer.content-info a {
-	color: #f15a2b;
+	color: #3DB2DD;
 }
 footer.content-info a:hover {
-	color: #ffffff;
+	color: #fafafa;
 }
 
 #banner-header {
@@ -488,7 +482,7 @@ button:focus {
 .navbar .navbar-brand.logo {
     height: 39px !important;
 	width: 100px !important;
-	background-image: url(img/logo.png);
+	background-image: url(img/logo-inverted.png);
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: 100px 39px;
@@ -639,15 +633,9 @@ button:focus {
     text-decoration: none;
     color: #fff !important;
 }
-.developer .second-menu {
-	background: #50cf5c;
-}
-.user .second-menu {
+.second-menu {
 	background: #3db2dd;
 }
-.orange .second-menu {
-	background: #f57d35;
-}
 .second-menu span {
     display: inline-block;
     line-height: 39px;