Merge branch 'css-bugfixes' of max.mehl/pmpc-website into master

site/layouts/partials/nav.html

@@ -11,9 +11,13 @@
             </button>
             <a class="page-scroll hiddenlink" href="#page-top">
               <div class="logo">
-                <img src="/img/logo.svg" alt="Logo of the campaign" />
-                <span class="logo-blue">{{ .Site.Params.static.slogan_1 }}</span>
-                <span class="logo-green">{{ .Site.Params.static.slogan_2 }}</span>
+                <div id="image">
+                  <img src="/img/logo.svg" alt="Logo of the campaign" />
+                </div>
+                <div id="text">
+                  <div id="logo-blue">{{ .Site.Params.static.slogan_1 }}</div>
+                  <div id="logo-green">{{ .Site.Params.static.slogan_2 }}</div>
+                </div>
               </div>
             </a>
         </div>

site/layouts/partials/sub-pages/navbar.html

@@ -11,9 +11,13 @@
             </button>
             <a class="hiddenlink" href="{{ "/" | relLangURL }}">
               <div class="logo">
-                <img src="/img/logo.svg" alt="Logo of the campaign" />
-                <span class="logo-blue">Public Money</span>
-                <span class="logo-green">Public Code</span>
+                <div id="image">
+                  <img src="/img/logo.svg" alt="Logo of the campaign" />
+                </div>
+                <div id="text">
+                  <div id="logo-blue">{{ .Site.Params.static.slogan_1 }}</div>
+                  <div id="logo-green">{{ .Site.Params.static.slogan_2 }}</div>
+                </div>
               </div>
             </a>
         </div>

site/static/css/bootstrap.css

@@ -4059,7 +4059,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
     border-radius: 4px;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 1000px) { /*CUSTOM*/
   .navbar-header {
     float: left;
   }
@@ -4076,7 +4076,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .navbar-collapse.in {
   overflow-y: auto;
 }
-@media (min-width: 768px) {
+@media (min-width: 1000px) { /*CUSTOM*/
   .navbar-collapse {
     width: auto;
     border-top: 0;
@@ -4201,7 +4201,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .navbar-toggle .icon-bar + .icon-bar {
   margin-top: 4px;
 }
-@media (min-width: 768px) {
+@media (min-width: 1000px) { /*CUSTOM*/
   .navbar-toggle {
     display: none;
   }
@@ -4214,7 +4214,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
   padding-bottom: 10px;
   line-height: 20px;
 }
-@media (max-width: 767px) {
+@media (max-width: 999px) { /*CUSTOM*/
   .navbar-nav .open .dropdown-menu {
     position: static;
     float: none;
@@ -4237,7 +4237,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
     background-image: none;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 1000px) { /*CUSTOM*/
   .navbar-nav {
     float: left;
     margin: 0;
@@ -4319,7 +4319,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
     margin-bottom: 0;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 1000px) { /*CUSTOM*/
   .navbar-form {
     width: auto;
     padding-top: 0;
@@ -4366,7 +4366,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
     margin-left: 15px;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 1000px) { /*CUSTOM*/
   .navbar-left {
     float: left !important;
   }

site/static/css/buttons-side.css

@@ -7,7 +7,7 @@ div.sharecolumn .share-buttons.side {
   z-index: 10;
   flex-direction: column;
 }
-@media(max-width:767px) {
+@media(max-width:839px) {
   .share-buttons.side {
     display: none !important;
   }

site/static/css/creative.css

@@ -95,29 +95,38 @@ aside {
 }
 
 .navbar .logo {
-    margin: 7px 10px;
-    height: 36px;
+    margin: 5px 10px;
+    display: flex;
+    justify-content: center;
+    width: 300px;
+    vertical-align: middle;
+}
+.navbar .logo #image {
+  height:40px;
 }
 
-.navbar .logo img {
+.navbar .logo #image img {
   height: 100%;
 }
-
-.navbar .logo .logo-blue,
-.navbar .logo .logo-green {
-    padding: 4px 7px;
+.navbar .logo #text {
+  padding: 5px 0;
+}
+.logo #text #logo-blue,
+.logo #text #logo-green {
+    padding: 5px 7px;
     color: white;
     vertical-align: middle;
     margin-left: 5px;
     text-transform: uppercase;
     font-weight: 700;
+    display: inline-block;
 }
-
-.navbar .logo .logo-blue {
-    background: #168EC1;
+.navbar .logo #logo-blue {
+  background: #168EC1;
+}
+.navbar .logo #logo-green { 
+  background: #4cbd38 
 }
-
-.navbar .logo .logo-green { background: #4cbd38 }
 
 .navbar-default {
     border-color: rgba(34,34,34,.05);

site/static/css/custom.css

@@ -9,6 +9,9 @@
 blockquote p {
   font-size: 17.5px;
 }
+.btn {
+  white-space: normal; /* wrap button words */
+}
 
 /* SUBPAGES */
 .subpage {
@@ -141,12 +144,25 @@ blockquote p {
   top: 2px;
 }
 .sign-input input, .sign-input select {
-  background: rgba(255, 255, 255, 1) none repeat scroll 0 0;
+  background-color: rgba(255, 255, 255, 1);
   border-radius: 20px;
   padding: 0 0 0 36px;
   width: 270px;
   height: 34px;
   font-weight: 600;
+  border: none;
+}
+select {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  background-position: right;
+  background-repeat: no-repeat;
+  background-image:url(/img/select-arrow.png);
+}
+/* hide browser-styling (arrow) in IE10 */
+select::-ms-expand {
+  display:none;
 }
 .sign-input.form-co input {
   width: 554px;
@@ -167,7 +183,8 @@ blockquote p {
   content: "\f003";
 }
 .form-cn select {
-  padding-left: 30px !important;
+  padding-left: 0px !important;
+  text-indent: 15px !important; /* ugly hack for Safari browsers */
   background-color: #ffffff;
 }
 .form-cn select option:first-child {