diff options
Diffstat (limited to 'web/css')
-rw-r--r-- | web/css/_main.scss | 4 | ||||
-rw-r--r-- | web/css/core.css | 84 | ||||
-rw-r--r-- | web/css/core.scss | 66 | ||||
-rw-r--r-- | web/css/main.css | 4 |
4 files changed, 111 insertions, 47 deletions
diff --git a/web/css/_main.scss b/web/css/_main.scss index 19d9b5a40..b4e4a13f0 100644 --- a/web/css/_main.scss +++ b/web/css/_main.scss @@ -161,11 +161,11 @@ select, input, textarea { #footer { clear: both; text-align: center; - border-top: solid 2px $header_back; + border-top: solid 2px #ccc; width: 50%; margin: 1em auto 0; padding: 0; - color: $header_darker; + color: #333333; .l, .r { margin-top: 0; diff --git a/web/css/core.css b/web/css/core.css index ac29dfe7a..88181e3e8 100644 --- a/web/css/core.css +++ b/web/css/core.css @@ -172,21 +172,38 @@ #mysociety form#mapForm #map { cursor: pointer; } #mysociety form#mapForm .olTileImage { - cursor: crosshair; } -#mysociety #compass { - background-color: #ffffff; - border: solid 1px #000000; - border-width: 0 1px 1px 0; - color: #000000; - position: absolute; - top: 0px; - left: 0px; } - #mysociety #compass img { - border: 0; } + cursor: crosshair; +} #mysociety #text_map { - margin-top: 0.5em; - margin-bottom: 1em; - font-size: 110%; } + margin: 0 530px 1em 0; + padding: 5px; + text-align: center; + position: relative; + padding-left: 0.5em; + text-align: left; + margin-top: 0; + font-size: 110%; + background-color: #eeeeee; + -moz-border-radius-topleft: 1em; + -moz-border-radius-bottomleft: 1em; + -webkit-border-top-left-radius: 1em; + -webkit-border-bottom-left-radius: 1em; + border-top-left-radius: 1em; + border-bottom-left-radius: 1em; +} +#mysociety #text_map_arrow { + display: block; + position: absolute; + top: 0; + right: -28px; + width: 0; + height: 0; + line-height: 0; + font-size: 0; + border-style: solid; + border-width: 26px 14px 26px 14px; + border-color: #fff #fff #fff #eee; +} #mysociety #text_no_map { margin-top: 0; } #mysociety #sub_map_links { @@ -206,7 +223,24 @@ text-align: center; position: relative; background-color: #ffcccc; - border: solid 2px #990000; } + border: solid 2px #990000; +} +#mysociety #closed { + margin: 0 530px 1em 0; + padding: 5px; + text-align: center; + position: relative; + background-color: #ccccff; + border: solid 2px #000099; +} +#mysociety #progress { + margin: 0 530px 1em 0; + padding: 5px; + text-align: center; + position: relative; + background-color: #ffffcc; + border: solid 2px #999900; +} #mysociety #updates div { padding: 0 0 0.5em; margin: 0 0 0.25em; @@ -218,18 +252,19 @@ #mysociety #updates p { margin: 0; } #mysociety #nearby_lists h2 { - margin-top: 0.5em; - margin-bottom: 0; } + margin-top: 1em; + margin-bottom: 0; +} #mysociety #nearby_lists li small { color: #666666; } #mysociety #alert_links { float: right; } #mysociety #alert_links_area { - background-color: #ffeecc; - border: solid 1px #ff9900; - border-width: 1px 0; - padding: 3px 10px; - margin: 0; } + padding-left: 0.5em; + margin: 0; + color: #666; + font-size: smaller; +} #mysociety #rss_alert { text-decoration: none; } #mysociety #rss_alert span { @@ -303,6 +338,11 @@ bottom: 3px !important; left: 3px; } +.olControlPermalink { + bottom: 3px !important; + right: 3px; +} + @media print { #mysociety #map_box { float: none; diff --git a/web/css/core.scss b/web/css/core.scss index 4e8d732d5..b962b38ae 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -276,24 +276,34 @@ $map_width: 500px; cursor: crosshair; } - #compass { - background-color: #ffffff; - border: solid 1px #000000; - border-width: 0 1px 1px 0; - color: #000000; - position: absolute; - top: 0px; - left: 0px; - img { - border: 0; - } - } - #text_map { - margin-top: 0.5em; - margin-bottom: 1em; + @include problem-banner; + padding-left: 0.5em; + text-align: left; + margin-top: 0; font-size: 110%; + background-color: #eeeeee; + -moz-border-radius-topleft: 1em; + -moz-border-radius-bottomleft: 1em; + -webkit-border-top-left-radius: 1em; + -webkit-border-bottom-left-radius: 1em; + border-top-left-radius: 1em; + border-bottom-left-radius: 1em; + } + #text_map_arrow { + display: block; + position: absolute; + top: 0; + right: -28px; + width: 0; + height: 0; + line-height: 0; + font-size: 0; + border-style: solid; + border-width: 26px 14px 26px 14px; + border-color: #fff #fff #fff #eee; } + #text_no_map { margin-top: 0; // background-color: #ffeecc; @@ -320,6 +330,18 @@ $map_width: 500px; border: solid 2px #990000; } + #closed { + @include problem-banner; + background-color: #ccccff; + border: solid 2px #000099; + } + + #progress { + @include problem-banner; + background-color: #ffffcc; + border: solid 2px #999900; + } + #updates { div { padding: 0 0 0.5em; @@ -339,7 +361,7 @@ $map_width: 500px; } #nearby_lists h2 { - margin-top: 0.5em; + margin-top: 1em; margin-bottom: 0; } @@ -351,12 +373,10 @@ $map_width: 500px; float: right; } #alert_links_area { - background-color: #ffeecc; - border: solid 1px #ff9900; - border-width: 1px 0; - padding: 3px 10px; - // padding: 0 3px; + padding-left: 0.5em; margin: 0; + color: #666; + font-size: smaller; } #rss_alert { text-decoration: none; @@ -517,6 +537,10 @@ $map_width: 500px; bottom: 3px !important; left: 3px; } +.olControlPermalink { + bottom: 3px !important; + right: 3px; +} // Printing, SCSS doesn't handle @media nesting diff --git a/web/css/main.css b/web/css/main.css index 65fd5eae3..a3fe3b400 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -156,11 +156,11 @@ select, input, textarea { #footer { clear: both; text-align: center; - border-top: solid 2px #e3d595; + border-top: solid 2px #ccc; width: 50%; margin: 1em auto 0; padding: 0; - color: #4e451b; + color: #333333; } #footer .l, #footer .r { margin-top: 0; |