From 0aa4e59e5a9e011b9bab40a6e1715687a62d3f94 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Sun, 4 Aug 2013 17:02:32 +0100 Subject: add admin info/warning styles --- web/cobrands/sass/_layout.scss | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 07f944ffa..efe25a427 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1033,6 +1033,21 @@ $button_bg_col: #a1a1a1; // also search bar (tables) padding: 3px 0.5em; } } + .fms-admin-warning, .fms-admin-info { + padding: 1em; + font-size: 80%; + border-style: solid; + border-width: 1px; + border-left-width: 1em; + } + .fms-admin-warning { + border-color: #f99; + background-color: #ffe1e1; + } + .fms-admin-info { + border-color: #9f9; + background-color: #e1ffe1; + } } -- cgit v1.2.3 From e237198173f3307fdf8c6866831116ae2f1f9f4a Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 12:50:25 +0100 Subject: move new admin styles into _layout.scss this is probably better practice since we can use sass Maybe need to bring the other style declarations in header into scss file too --- web/cobrands/sass/_layout.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index efe25a427..9f7057587 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1048,6 +1048,11 @@ $button_bg_col: #a1a1a1; // also search bar (tables) border-color: #9f9; background-color: #e1ffe1; } + .admin-open311-only { + border:1px solid #666; + padding:1em; + margin: 1em 0; + } } -- cgit v1.2.3 From 75419ceb142852db15d0d72e05400b163c40caf6 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 14:18:32 +0100 Subject: add display-on-click hints --- web/cobrands/sass/_layout.scss | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 9f7057587..f745e266f 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1053,10 +1053,48 @@ $button_bg_col: #a1a1a1; // also search bar (tables) padding:1em; margin: 1em 0; } + .admin-hint { + cursor: pointer; + display: inline-block; + float:left; + overflow: hidden; + padding: 0.2em; + margin-right: 0.666em; + text-align: center; + color: #fff; + font-weight: bold; + background-color: #f93; + -moz-border-radius: 0.333em; + -webkit-border-radius: 0.333em; + border-radius: 0.333em; + p { + display:none; + } + &:before { content: "?" } + &.admin-hint-show { + text-align: left; + display: block; + float:none; + margin:1em 0; + &:before { content: "" } + background-color: inherit !important; + p { + font-weight: normal; + display: block; + font-size: 80%; + background-color: #ff9; + color: #000; + border-style: solid; + border-width: 1px; + border-left-width: 1em; + border-color: #f93; + padding:1em; + margin: 0; + } + } + } } - - /* MEDIA QUERIES */ @media only screen and (min-width: 48em) and (max-width: 61em) { .container { -- cgit v1.2.3 From 1105cd1f0df1de0569d9f1530a86c21ca34ea775 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 16:11:59 +0100 Subject: tweaks to admin hint CSS --- web/cobrands/sass/_layout.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index f745e266f..658fa095b 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1035,7 +1035,7 @@ $button_bg_col: #a1a1a1; // also search bar (tables) } .fms-admin-warning, .fms-admin-info { padding: 1em; - font-size: 80%; + font-size: 90%; border-style: solid; border-width: 1px; border-left-width: 1em; @@ -1054,6 +1054,7 @@ $button_bg_col: #a1a1a1; // also search bar (tables) margin: 1em 0; } .admin-hint { + font-size: 80%; // little question marks are small cursor: pointer; display: inline-block; float:left; @@ -1072,6 +1073,7 @@ $button_bg_col: #a1a1a1; // also search bar (tables) } &:before { content: "?" } &.admin-hint-show { + font-size: 90%; text-align: left; display: block; float:none; @@ -1081,7 +1083,6 @@ $button_bg_col: #a1a1a1; // also search bar (tables) p { font-weight: normal; display: block; - font-size: 80%; background-color: #ff9; color: #000; border-style: solid; -- cgit v1.2.3 From 4ad30bf9594876373e91a0f67b8dddffc2c22467 Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Wed, 7 Aug 2013 18:14:02 +0100 Subject: move those divs out of the paragraphs! added bottom margin to info boxes to fix layout on body form (hint div floating beneath it) --- web/cobrands/sass/_layout.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 658fa095b..f865d5bbe 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1039,6 +1039,7 @@ $button_bg_col: #a1a1a1; // also search bar (tables) border-style: solid; border-width: 1px; border-left-width: 1em; + margin-bottom: 1em; } .fms-admin-warning { border-color: #f99; @@ -1056,7 +1057,7 @@ $button_bg_col: #a1a1a1; // also search bar (tables) .admin-hint { font-size: 80%; // little question marks are small cursor: pointer; - display: inline-block; + display: block; float:left; overflow: hidden; padding: 0.2em; -- cgit v1.2.3 From 3793f4aa12875cb423f9061db115524c694a215d Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 8 Aug 2013 12:13:43 +0100 Subject: add no-bullets style declaration to default admin CSS --- web/cobrands/sass/_layout.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index f865d5bbe..8bcb6fed6 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1095,6 +1095,12 @@ $button_bg_col: #a1a1a1; // also search bar (tables) } } } + .no-bullets { + margin-left: 0; + > li { + list-style: none; + } + } } /* MEDIA QUERIES */ -- cgit v1.2.3 From 9ec2ecbfdb23161c455b6ab1354f28f717f7e30d Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Thu, 8 Aug 2013 14:20:45 +0100 Subject: indicated deleted categories clearly on the body admin this has been catching me out for years :-) --- web/cobrands/sass/_layout.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 8bcb6fed6..4d32f6062 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1032,6 +1032,12 @@ $button_bg_col: #a1a1a1; // also search bar (tables) border: none; padding: 3px 0.5em; } + tr.is-deleted { + background-color: #ffdddd; + td.contact-category { + text-decoration: line-through; + } + } } .fms-admin-warning, .fms-admin-info { padding: 1em; -- cgit v1.2.3 From 04b187d5347dd2d26874a83902e51c2532ef8a2f Mon Sep 17 00:00:00 2001 From: Dave Whiteland Date: Fri, 6 Sep 2013 10:56:49 +0100 Subject: add show-admin-notes class to body making the admin-notes functionality easier to suppress on installations that don't want it; it's in the default header, i.e., on for new installations --- web/cobrands/sass/_layout.scss | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'web/cobrands/sass/_layout.scss') diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 4d32f6062..126e44685 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1039,6 +1039,19 @@ $button_bg_col: #a1a1a1; // also search bar (tables) } } } + .no-bullets { + margin-left: 0; + > li { + list-style: none; + } + } + .fms-admin-warning, .fms-admin-info, .admin-hint { + display: none; // don't display admin-notes unless .show-admin-notes class is present + } + &.show-admin-notes { + .fms-admin-warning, .fms-admin-info, .admin-hint { + display: block; + } .fms-admin-warning, .fms-admin-info { padding: 1em; font-size: 90%; @@ -1101,14 +1114,10 @@ $button_bg_col: #a1a1a1; // also search bar (tables) } } } - .no-bullets { - margin-left: 0; - > li { - list-style: none; - } - } + } } + /* MEDIA QUERIES */ @media only screen and (min-width: 48em) and (max-width: 61em) { .container { -- cgit v1.2.3