aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-10-09 11:31:49 +0100
committerMatthew Somerville <matthew@mysociety.org>2015-10-09 11:31:49 +0100
commit1fd04b16f19a7372bd6a5b7052bb4ec7bfcfff85 (patch)
treee2d1d48c92d9408979422da925658722f0f03f5f /web
parent0a19721641de51a6b1e1ba79fd84bcd9ea62fdb2 (diff)
[Hart] Fix missing menu class, tidy remaining.
The changes in 99610f1 missed out adding a class to the footer menu, and a few subsequent changes to the CSS.
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/eastsussex/layout.scss41
-rw-r--r--web/cobrands/hart/hart.scss26
-rw-r--r--web/cobrands/sass/_layout.scss2
-rw-r--r--web/cobrands/stevenage/layout.scss8
4 files changed, 15 insertions, 62 deletions
diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss
index 3ccfb3f6a..d90a617f1 100644
--- a/web/cobrands/eastsussex/layout.scss
+++ b/web/cobrands/eastsussex/layout.scss
@@ -211,42 +211,6 @@ body.twothirdswidthpage .content aside {
margin-top: 3em; /* required to push "Your Reports" visible on Safari/IE */
}
-#main-nav {
- margin-top: 106px;
- ul {
- margin-left: 157px;
- float: none;
- }
-}
-
-#main-nav ul li {
- text-align: center;
- text-transform: uppercase;
- padding: 0 15px;
- font-size: 16px;
- border-right: solid 1px white;
- line-height: 1.5em;
-}
-
-#main-nav ul li a {
- padding: 0;
- font-size: inherit;
-}
-
-#main-nav ul li:last-child {
- border-right: none;
-}
-
-#main-nav ul li a:link, #main-nav ul li a:visited {
- color: #fff;
-}
-
-#main-nav ul li:hover, #main-nav ul li:hover a, {
- background-color: white;
- color: black;
- text-decoration: none;
-}
-
.main-menu-wrapper {
display: none;
}
@@ -254,11 +218,6 @@ body.twothirdswidthpage .content aside {
@media only screen and (max-width: 61em) {
- #main-nav {
- padding-left: 0px;
- float:none;
- }
-
#site-header {
height: auto;
}
diff --git a/web/cobrands/hart/hart.scss b/web/cobrands/hart/hart.scss
index 0823a4bc5..7cd7306cc 100644
--- a/web/cobrands/hart/hart.scss
+++ b/web/cobrands/hart/hart.scss
@@ -76,14 +76,13 @@ body.frontpage .nav-wrapper-2 {
#main-nav {
margin-top: 106px;
-
- ul {
- margin-left: 157px;
- float: none;
- }
+ }
+ .nav-menu {
+ margin-left: 157px;
+ float: none;
}
- #main-nav ul li {
+ .nav-menu li {
text-align: center;
text-transform: uppercase;
padding: 0 15px;
@@ -91,21 +90,16 @@ body.frontpage .nav-wrapper-2 {
border-right: solid 1px white;
line-height: 1.5em;
}
-
- #main-nav ul li a {
- padding: 0;
- font-size: inherit;
- }
-
- #main-nav ul li:last-child {
+ .nav-menu li:last-child {
border-right: none;
}
- #main-nav ul li a:link, #main-nav ul li a:visited {
- color: #fff;
+ .nav-menu a {
+ padding: 0;
+ font-size: inherit;
}
- #main-nav ul li:hover, #main-nav ul li:hover a, {
+ .nav-menu li:hover, .nav-menu li:hover a, {
background-color: white;
color: black;
text-decoration: none;
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 806f1408c..c9cc3610d 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -1116,7 +1116,7 @@ body.frontpage {
// Left padding is to ensure no overlap of the site-logo
// Background styling replicates header styling
- #main-nav{
+ #main-nav {
width: auto;
float: $right;
padding-#{$left}: 180px;
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index 49529dd49..17ef6a4c3 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -37,10 +37,8 @@
}
// d523b431
-#main-nav {
- ul {
- float: none;
- }
+.nav-menu {
+ float: none;
}
.nav-menu a, .nav-menu span {
margin: 0;
@@ -224,7 +222,9 @@ body.frontpage {
// d523b431
#main-nav {
float: left;
+ padding-left: 0;
}
+
.nav-wrapper {
.nav-wrapper-2 {
@include background(linear-gradient(#222, #555 30%, #555 60%, #222));