aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChris Mytton <self@hecticjeff.net>2013-09-25 11:50:26 +0100
committerChris Mytton <self@hecticjeff.net>2013-09-25 11:50:26 +0100
commit0efb806e7dbfc6681230041751ed49552ec3ba5b (patch)
tree9bf58000568f1376b309e9aade9c0fc601637750 /web
parent8e5005fd26b4396443f0aac1d7bb8f05f8357bd6 (diff)
parentf26fe9ff49a22eb532d4dea94158952d0bc01022 (diff)
Merge branch 'master' into oxfordshire-usability-recommendations
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/bromley/bromley.scss3
-rw-r--r--web/cobrands/fixmindelo/layout.scss4
-rw-r--r--web/cobrands/zurich/layout.scss5
3 files changed, 12 insertions, 0 deletions
diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss
index 91ec75fea..eee4359de 100644
--- a/web/cobrands/bromley/bromley.scss
+++ b/web/cobrands/bromley/bromley.scss
@@ -108,3 +108,6 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif;
clear: both;
}
+.issue-list-a li .text small {
+ display: inline;
+}
diff --git a/web/cobrands/fixmindelo/layout.scss b/web/cobrands/fixmindelo/layout.scss
index 6a52b3b1e..ec8086af3 100644
--- a/web/cobrands/fixmindelo/layout.scss
+++ b/web/cobrands/fixmindelo/layout.scss
@@ -75,3 +75,7 @@ body.frontpage {
}
}
+body.admin table {
+ background: white; // force bg colour since it may overhang the colourful background
+}
+
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index 0c42924d4..7984de0b9 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -37,6 +37,11 @@ body.mappage.admin .nav-wrapper-2 {
@include box-shadow(none);
}
+/* Fix positioning of images in the admin */
+body.admin .admin-nav-wrapper {
+ z-index: 1;
+}
+
// Different header and logo
#site-header .container {
height: 99px;