From 8a9806d2b1babe5eabdef2ae7c07190a00e26a51 Mon Sep 17 00:00:00 2001 From: Loic Date: Thu, 12 Mar 2015 11:03:47 +0200 Subject: [PATCH] [#1265] Fixing conflict --- akvo/rsr/static/rsr/v3/css/src/main.css | 62 +++++++++---------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/akvo/rsr/static/rsr/v3/css/src/main.css b/akvo/rsr/static/rsr/v3/css/src/main.css index ec4e0ce3e6..c876c62f04 100755 --- a/akvo/rsr/static/rsr/v3/css/src/main.css +++ b/akvo/rsr/static/rsr/v3/css/src/main.css @@ -11,7 +11,7 @@ Author: Loïc Sans, loic@akvo.org /*---------------------------------------------------------------------------------*/ - /* Colours +/* Colours ---------------------------------------------------------------------------------*/ /* Akvo Primary Colours: */ /* Akvo Purplish Blue */ @@ -47,19 +47,14 @@ body { color: #394c50; line-height: 1.42857; text-rendering: optimizelegibility; - font-family: "Open Sans", "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: 'Open Sans', 'Source Sans Pro', "Helvetica Neue", Helvetica, Arial, sans-serif; padding-top: 80px; } @media only screen and (max-width: 768px) { body { padding-top: 65px; } } -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; +h1, h2, h3, h4, h5, h6 { + font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: normal; color: #2c2a74; } @@ -97,7 +92,7 @@ img { padding: 0; } em { - font-family: "Baskerville", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif; + font-family: 'Baskerville', "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif; font-size: 1.2em; margin: 0 5px 0em 0em; font-style: italic; } @@ -141,6 +136,7 @@ a.moreLink { .col-ty-12 { float: none; width: 100%; } } + a.btn-primary, button.btn-primary { border: 1px solid #00aaff; color: white; @@ -203,12 +199,11 @@ span.twitter-typeahead .tt-suggestion > p { padding: 3px 20px; clear: both; font-weight: normal; - line-height: 1.42857143; + line-height: 1.42857; color: #333; white-space: nowrap; } -span.twitter-typeahead .tt-suggestion > p:hover, -span.twitter-typeahead .tt-suggestion > p:focus { +span.twitter-typeahead .tt-suggestion > p:hover, span.twitter-typeahead .tt-suggestion > p:focus { color: #ffffff; text-decoration: none; outline: 0; @@ -315,7 +310,7 @@ nav.navbar-fixed-top { padding-top: 3px; } nav.navbar-fixed-top .navbar-nav li a { color: #00aaff; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif; border: thin solid transparent; } nav.navbar-fixed-top .navbar-nav li a:hover { color: #ff5500; } @@ -418,37 +413,29 @@ nav.navbar-fixed-top { @media only screen and (min-width: 768px) and (max-width: 1024px) { .navbar-header { float: none; } - .navbar-left, .navbar-right { float: none !important; } - .navbar-toggle { display: block; } - .navbar-collapse { border-top: 1px solid transparent; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); } - .navbar-fixed-top { top: 0; border-width: 0 0 1px; } - .navbar-collapse.collapse { display: none !important; } - .navbar-nav { float: none !important; margin-top: 7.5px; } - .navbar-nav > li { float: none; } - .navbar-nav > li > a { padding-top: 10px; padding-bottom: 10px; } - .collapse.in { display: block !important; } } + .navbar-inverse .navbar-collapse { border-color: #e4e4e4; } @@ -458,6 +445,7 @@ nav.navbar-fixed-top { @media only screen and (max-width: 768px) { body > .navbar > .container .navbar-brand { margin-left: 0; } } + /* My RSR stuff */ .btnHeader { padding: 15px 0 25px 0; } @@ -472,7 +460,7 @@ nav.navbar-fixed-top { background: rgba(32, 32, 36, 0.05); } .myRsrMenu nav[role=navigation] ul li a { color: #00aaff; - font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: 'Montserrat', "Helvetica Neue", Helvetica, Arial, sans-serif; padding-top: 15px; padding-bottom: 15px; } @media only screen and (max-width: 768px) { @@ -683,8 +671,8 @@ h4.detailedInfo { position: relative; } .searchContainer #search .showFilters { /*background-color: rgba(white,0.2); - border: 1px solid rgba($rsrGreen, 0); - color: white;*/ + border: 1px solid rgba($rsrGreen, 0); + color: white;*/ color: white; border: 1px solid rgba(255, 255, 255, 0.2); transition: all 0.4s ease-in; } @@ -958,7 +946,7 @@ h4.detailedInfo { .main-list.organisations ul li img { filter: gray; -webkit-filter: grayscale(100%); - filter: url("data:image/svg+xml;utf8,#grayscale"); + filter: url("data:image/svg+xml;utf8,#grayscale"); filter: grayscale(100%); transition: all 0.2s ease-in; } .main-list.organisations ul li:hover img { @@ -1107,7 +1095,7 @@ div.projectTopRow { width: 80%; filter: gray; -webkit-filter: grayscale(100%); - filter: url("data:image/svg+xml;utf8,#grayscale"); + filter: url("data:image/svg+xml;utf8,#grayscale"); filter: grayscale(100%); transition: all 0.2s ease-in; } div.projectTopRow .projectSideInfo ul li.projectPartners a.logoImg img:hover { @@ -1240,9 +1228,7 @@ div.textBlock { -webkit-border-radius: 5px; border-radius: 5px; } -.project-hierarchy-window:hover, -.project-hierarchy-window._jsPlumb_source_hover, -.project-hierarchy-window._jsPlumb_target_hover { +.project-hierarchy-window:hover, .project-hierarchy-window._jsPlumb_source_hover, .project-hierarchy-window._jsPlumb_target_hover { border: 1px solid orange; color: orange; } @@ -1317,9 +1303,7 @@ div.textBlock { width: 95%; max-width: 450px; text-align: justify; } - .projectDonate .paymentOption, - .projectDonate .donateTitle, - .projectDonate h3 { + .projectDonate .paymentOption, .projectDonate .donateTitle, .projectDonate h3 { text-align: center; } } .projectDonate .donateButton { margin-bottom: 2em; } @@ -1340,10 +1324,10 @@ div.textBlock { clear: both; } .projectDonate .paymentSystemInfo { background-color: #f2f0e6; } -@media only screen and (min-width: 768px) and (max-width: 992px) { - .projectDonate h3 { - font-size: 1.3em; } } - + @media only screen and (min-width: 768px) { + @media only screen and (max-width: 992px) { + .projectDonate h3 { + font-size: 1.3em; } } } @media only screen and (max-width: 768px) { .projectDonate .paymentOption { margin-top: 3em; } @@ -1410,5 +1394,3 @@ div.textBlock { border: none; } #versionBanner div button.closeBtn:hover { background: #ff5500; } - -/*# sourceMappingURL=main.css.map */