aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Wright <martin@mysociety.org>2014-04-17 16:49:02 +0100
committerLouise Crow <louise.crow@gmail.com>2014-04-24 15:38:16 +0100
commit8db61bb0cd10152457713765abc85e01b4398848 (patch)
tree9b7003520ebef8e04fa404d522354bd28b4cb921
parent50c91d6f02984c8d087a70a53201de6e8fc7e7f7 (diff)
tweaks and simplification of global styles
-rw-r--r--app/assets/stylesheets/responsive/_global_layout.scss2
-rw-r--r--app/assets/stylesheets/responsive/_global_style.scss26
2 files changed, 13 insertions, 15 deletions
diff --git a/app/assets/stylesheets/responsive/_global_layout.scss b/app/assets/stylesheets/responsive/_global_layout.scss
index d0892eaf0..9e44c1cb2 100644
--- a/app/assets/stylesheets/responsive/_global_layout.scss
+++ b/app/assets/stylesheets/responsive/_global_layout.scss
@@ -28,7 +28,7 @@ textarea{
#header_right {
@include grid-column(12);
@media( min-width: $main_menu-mobile_menu_cutoff ){
- @include grid-column($columns:3, $float:right);
+ @include grid-column($columns:4, $float:right);
padding-top:27px;
}
}
diff --git a/app/assets/stylesheets/responsive/_global_style.scss b/app/assets/stylesheets/responsive/_global_style.scss
index db83cc0f4..75d6b54e9 100644
--- a/app/assets/stylesheets/responsive/_global_style.scss
+++ b/app/assets/stylesheets/responsive/_global_style.scss
@@ -22,7 +22,6 @@ a {
h1, h2, h3, h4, h5, h6 {
margin-bottom: 18px;
margin-bottom: 1rem;
- margin-top: 1em;
line-height: 1.1em;
text-rendering: optimizeLegibility;
}
@@ -115,17 +114,11 @@ dt + dd {
/* Notices to the user (usually on action completion) */
#notice {
- font-size:1.4em;
- font-weight:400;
- background-color :#E9FDD3;
- color:#517704;
- border-color:#B0CA86;
- border-radius:6px;
- -moz-border-radius:6px;
- margin:15px 0;
- padding:10px 20px;
- border-style: solid;
- border-width: 1px;
+ font-size:1em;
+ background-color: lighten(#62b356, 23%);
+ border-radius:3px;
+ margin:1em 0;
+ padding:1.5em;
p:first-child {
margin-top:0;
@@ -138,7 +131,7 @@ dt + dd {
}
.big {
- font-size: larger;
+ font-size: 1.2em;
}
/* Form styling */
@@ -148,7 +141,12 @@ label.form_label {
}
.form_item_note,.form_note {
- font-size:1em;
+ font-size:0.875em;
+}
+
+p + .form_item_note {
+ position: relative;
+ top: -1.25em;
}
form input[type=text],form input[type=password] {