diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/cobrands/angus/base.scss | 5 | ||||
| -rw-r--r-- | web/cobrands/fiksgatami/base.scss | 7 | ||||
| -rw-r--r-- | web/cobrands/fiksgatami/layout.scss | 27 | ||||
| -rw-r--r-- | web/cobrands/fixamingata/layout.scss | 12 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet.com/layout.scss | 66 | ||||
| -rw-r--r-- | web/cobrands/sass/_base.scss | 16 | ||||
| -rw-r--r-- | web/cobrands/sass/_layout.scss | 47 |
7 files changed, 62 insertions, 118 deletions
diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss index 31ba13a11..0d44ed205 100644 --- a/web/cobrands/angus/base.scss +++ b/web/cobrands/angus/base.scss @@ -36,11 +36,6 @@ label[for=pc] { color: $nav_fg; } - -.nav-menu--mysoc { - display: none; -} - .angus_nav, .wrapper__main_menu { display: none; } diff --git a/web/cobrands/fiksgatami/base.scss b/web/cobrands/fiksgatami/base.scss index 84784d552..7af473460 100644 --- a/web/cobrands/fiksgatami/base.scss +++ b/web/cobrands/fiksgatami/base.scss @@ -4,3 +4,10 @@ @import "../sass/base"; + +.nav-menu--mysoc { + a { + color: $primary_text; + background-color: $primary; + } +} diff --git a/web/cobrands/fiksgatami/layout.scss b/web/cobrands/fiksgatami/layout.scss index 69e455aa5..c3c36fa12 100644 --- a/web/cobrands/fiksgatami/layout.scss +++ b/web/cobrands/fiksgatami/layout.scss @@ -1,2 +1,29 @@ @import "_colours"; @import "../sass/layout"; + +.nav-menu--mysoc { + padding: 0em 0.5em; + margin-#{$left}: 0.25em; + background-color: $primary; + @include border-radius(0 0 0.375em 0.375em); + a { + background-color: transparent; + color: $primary_text; + text-transform: uppercase; + font-size: 0.6875em; + padding: 1.3em 0.7em 1em; + &:hover { + color: #fff; + background-color: transparent; + } + } +} + +body.frontpage { + #site-logo { + top: 3em; + width: 300px; + height: 60px; + background: url($image-sprite) -2px -108px no-repeat; + } +} diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index bd1cab41a..555e2641b 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -73,6 +73,14 @@ h3, h4, } } +body.frontpage { + #site-logo { + width: 300px; + height: 55px; + background: url($image-sprite) -2px -115px no-repeat; + } +} + #front-main { background: $primary url(/cobrands/fixamingata/images/tile-y.jpg); } @@ -115,8 +123,6 @@ h3, h4, body.fullwidthpage .container .content footer .tablewrapper { background: #fff; } -body.frontpage #site-logo { top: 0em; } - body.frontpage #site-header { height: 85px; } -body.frontpage #user-meta { margin-top: 1.2em; }
\ No newline at end of file +body.frontpage #user-meta { margin-top: 1.2em; } diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index 4b2a91c9d..87916b33a 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -93,11 +93,6 @@ body.mappage { } } -.nav-menu--mysoc { - background: #515151; - margin-top: -4px; -} - body.twothirdswidthpage, body.fullwidthpage { #front-main { @@ -150,55 +145,28 @@ body.fullwidthpage { } } } - - .container { - .content { - footer { - .tablewrapper { - background: #1a1a1a url(images/tile.jpg) 0 0 repeat; - } - } - } - } } body.frontpage { - .container { - background-color: transparent; - - .content { - background-color: transparent; - padding: 0em 0em 1em; - - > .tablewrapper { - margin: -4em 0em 0em; - padding: 1em 1em; - background-color: white; - width: auto; - } - > .form-error { - margin-top: -4em; - } - > .form-error + .tablewrapper { - margin-top: 0; - } - } - footer { - .bordered { - margin: 0em; - } - } + #site-logo { + top: 3em; + width: 300px; + height: 60px; + background: url($image-sprite) -2px -108px no-repeat; } -} -body.twothirdswidthpage { - .container { - .content { - footer { - .tablewrapper { - border: 0px; - } - } + // Because fms.com includes a .fms-pro-promo that we want to look separate + // from #front-howto and #front-recent, we move the white background and + // padding from .content to the .tablewrapper, so it visually stands alone. + .content { + background-color: transparent; + padding: 0em 0em 1em; + margin-top: -3em; // overlap the bottom of #front-main + + .tablewrapper { + @include box-sizing(border-box); + padding: 1.5em; + background-color: white; } } } diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index ab51e73c8..70e2ecc67 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -544,22 +544,6 @@ ul.error { background-color: #ccc; } } -.nav-menu--mysoc { - a { - color: $primary_text; - background-color: $primary; - } -} -#mysoc-logo { - background-origin: content-box; - background-position: $left 3px; - background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHQAAAAYCAYAAAArrNkGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABBtJREFUaN7tmT2u1DAQx/cIPgBCQUJCICH5BuQIPkIq6hzBB0AyiAP4ABQ5ghtEm54mEtVrICUNkpmsJjBvdvyR1S7hPa2lv1aJs5PEP894xjkc/tMWY+xADhRQA8iC9I7PtD6PP9xa9aC1oCnmm9lpgtHW3WiVB03HuqYeA9DlPZbJuXj8o5wgGM5os+ixLb74MeTt+Hz+kiGXva99jEDjJV7w+5Pn3aIHNoEvB/Tu7s6iejzuQAEUQRPIgxT2KTwesX+5rkvYs7yP2KDXLN7XXCKkAUgHiii3MaQuideI9x/x2GB/gxFjVZMIoY6AmtBGJ+QJluUKgdheI1LpfveuoQMciTw7XrUAbEFzot8Re4GcnwWghv23Ezx0PiejBYiBAA0/Pz7VoOV3AKnEup1LwhyBQFsr2Jkzdjy51hZyBIuwaOuFZ6fPPaaA5jQX+hvi4fS8YUC9BBzXqJOB4INXAGpAM8oAxBEUUbYSQiCD1ZWACnZGhDJIUacGaBbY34ghAxfAdHheCxBHAs6yvp7YpP/zDOgk9WHIGhMvOZ5TrjCgfUUSptigqQqg1M7A7kHhTVvWUAF8Q/r6ZObPQy4bfMf62wycoeSFOEmoPS2sQ74mdFUC1RhuHQ25QonkKurjE6CCpzTC+9CmNwBNeiHz/oGvabnweG+9E9ZDul6GDDiD53tybsoMYIMJhhQSjy/28YVzoAgKoGRt+uvHMwUaQRHkS7N/I1AjhGuuGs+2ifsOPOwKk6TLAeUe2J4DFPtG7vnsnK3MQPngTwg0ErUZoC3CPEqyWbmDJQG1cVvbCpRPmIadm6Wy5VpAeXKkpCRqQ1F/DwBAnAlQnQHaEKDzlYGGgvQWoEJy1LOx8P8SqOLJEU2uNhbhvQC0AVn76n3/9vWHpIe++/Km/fxVL17aL3ATSYU5E2h77rbkBqA2kYFHsbS7FlAhOTrJpIXwkirYRynMAEgDiignwHSgiGozCceUg5EBqs5N2hhQX8gnpDaldoquCVQn6lmV2foLbJdkSmWkANESoNPLT98UyKMUgbnIFsqWGRMxQ0JbW1G2eCHsdmQferWlMwlPxHuLnwiFa9NefU2gQiJ0UholBixm6lGV8lAEGVFDykMr6l5e5OeA1tg5ASB8wcmVMEa4rtkLqM3VnqQuDJnBmHnhT6A2oKPNBSIFuq6hoCbzCatY91Zs/ZXspED5Ws+rDu0IbZUSEps//YmQuvbrCg8NFd8I1zBl8bd66w8galBA6Q3rmWKb3YZlpIqE0Da13pLrVjtd6flxMtP7qorvse1hjyYkRfs8yMP/8E83WMIeII2wdrobnk0gG6HOnUu7WteAqRKf39QN0yagTlhf9/lwz9fNG8yzgBrmmWa3h8Ftv0HaQLi1TYlaSGX3UvsNzdBKw+waoEEAAAAASUVORK5CYII='); - background-repeat: no-repeat; - text-indent: -999999px; -} -.ie7 #mysoc-logo { - background: url($image-sprite) -240px -38px no-repeat; -} //defines where the table caption is (login stuff on mob, nav menu on desktop) .wrapper { diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 985127361..2f5e263c4 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -130,7 +130,8 @@ h1 { #{$left}: -999999px; } -#report-cta { +#report-cta, +.nav-menu__item--privacy { display: none; } @@ -142,12 +143,8 @@ h1 { .nav-menu { float: $right; li { - display: inline; float: $left; } - li.nav-menu__item--privacy { - display: none; - } a, span { display: block; color: $nav_fg; @@ -177,40 +174,6 @@ h1 { color:$primary; } } -.nav-menu--mysoc { - padding: 0em 0.5em; - margin-#{$left}: 0.25em; - background-color: $primary; - @include border-radius(0 0 0.375em 0.375em); - a { - background-color: transparent; - color: $primary_text; - text-transform: uppercase; - font-size: 0.6875em; - padding: 1.3em 0.7em 1em; - &:hover { - color: #fff; - background-color: transparent; - } - } -} -#mysoc-logo { - width:84px; - height:16px; - background-size: 100px auto; - background-position: 50% 50%; - opacity: 0.8; - &:hover { - opacity: 1; - } - // IE8 does not support background-size, so increase width to show whole image - .ie8 & { - width: 100px; - } -} -.ie7 #mysoc-logo { - background-position: -260px -43px; -} // .content Is the white box @@ -1000,12 +963,6 @@ body.frontpage { #site-header{ height:8em; } - #site-logo{ - top:3em; - width: 300px; - height: 60px; - background: url($image-sprite) -2px -108px no-repeat; - } } //logo fix .iel8 { |