diff --git a/static/villejuif/_custom.scss b/static/villejuif/_custom.scss index e237fa2d..dd7a15f7 100644 --- a/static/villejuif/_custom.scss +++ b/static/villejuif/_custom.scss @@ -1,43 +1,41 @@ -$header-width: 992px; -$header-height: 230px; +$header-width: 1140px; +$header-height: 109px; body { - background: #E3E3E1; + font-family: 'Open Sans', Helvetica, sans-serif; + background: #fff; } -#header-wrapper { - border-top: 10px solid #636361; - background: #ccc; +div#main-content-wrapper, +div#nav{ + max-width: 1140px; } div#header { - background: url(header.png) top left no-repeat; height: $header-height; @include vendor-prefix('transition', 'all 0.3s ease'); - @media screen and (min-width: $header-width - 100px) { + @media screen and (min-width: $header-width) { max-width: $header-width; left: 50%; margin-left: -$header-width/2; } - @media screen and (max-width: $header-width - 100px) { - width: calc(100% + #{$header-width / 12}); + @media screen and (max-width: $header-width) { + width: calc(100% + #{$header-width / 19}); overflow: hidden; - left: - $header-width / 12; + left: 0; } @media screen and (max-width: $mobile-limit) { - height: 100px; - background-position: 60px -70px; + height: $header-height +10px; + left: -78px; } } - #logo a { display: inline-block; - background: url(logoVillejuif.png) 20px 10px no-repeat; + background: url(header.png) no-repeat; padding-top: 70px; - margin-left: 100px; - min-width: 250px; + min-width: 421px; color: white; font-weight: normal; text-indent: -9999px; @@ -50,12 +48,29 @@ div#nav { margin-top: 0; margin-bottom: 0; } + /*background-color: #fff;*/ + background-color: $primary-color; + border-top: 2px solid $primary-color; + border-left: 1px solid $primary-color; } div#nav #nav-button .icon-bar{ border-color: $primary-color; } +div#nav #nav-button + ul li a{ + font-style: normal; + font-weight: 700; + line-height: 1; + text-transform: uppercase; + transition: background-color 0.2s ease, color 0.2s ease; + font-size: 14px; + padding: 15px 15px 15px; + color: #fff; + background-color: $primary-color; + border-left: 1px solid $primary-color; + border-right: 1px solid $primary-color; +} div#nav #nav-button + ul li.selected > a, div#nav #nav-button + ul li:hover > a { background-color: $primary-color; } @@ -84,12 +99,11 @@ div.widget div.title{ font-weight: bold; } -div#nav #nav-button + ul li{ - border-right: 1px solid #fff; -} - div#nav #nav-button + ul li.selected > a, div#nav #nav-button + ul li:hover > a{ - background-color: #aa004b; + /*background-color: $primary-color; + color:#fff;*/ + background-color: #fff; + color:$primary-color; } div.message{ @@ -104,7 +118,13 @@ form h4{ } #footer-wrapper{ - background-color: #ccc; + background-color: $primary-color; + height: 50px; + padding: 30px 0; + color: #fff; +} +#footer-wrapper a{ + color:#fff; } div.infonotice::before, div.warningnotice::before, div.errornotice::before { @@ -131,7 +151,7 @@ div.widget div.title{ } div.widget div.content{ - border-left: 1px solid #C7004B; + border-left: 1px solid $primary-color; padding-left: 5px; padding-top: 5px; } diff --git a/static/villejuif/_vars.scss b/static/villejuif/_vars.scss index 0c6ea9eb..9fc2d607 100644 --- a/static/villejuif/_vars.scss +++ b/static/villejuif/_vars.scss @@ -1,4 +1,4 @@ -$primary-color: #c7004b; +$primary-color: #1ba39c; $width: 980px; $font-color: #222; diff --git a/static/villejuif/header.png b/static/villejuif/header.png index 3b26df5a..2ce49d30 100644 Binary files a/static/villejuif/header.png and b/static/villejuif/header.png differ diff --git a/static/villejuif/logoVillejuif.png b/static/villejuif/logoVillejuif.png deleted file mode 100644 index beed473e..00000000 Binary files a/static/villejuif/logoVillejuif.png and /dev/null differ diff --git a/themes.json b/themes.json index 50c36fe7..efc4bad3 100644 --- a/themes.json +++ b/themes.json @@ -438,7 +438,7 @@ "variables": { "css_variant": "villejuif", "no_extra_js": true, - "theme_color": "#c7004b" + "theme_color": "#1ba39c" } } , {"id": "villeurbanne",