diff --git a/css/default_site.css b/css/default_site.css index 2bdb00f5..4eb861b4 100644 --- a/css/default_site.css +++ b/css/default_site.css @@ -356,25 +356,10 @@ li.ui-state-error { background: url(../images/desc.gif) no-repeat right; } -table tr.odd { - background-color: #eeeeee; - border: none; -} - .report-grid .ui-widget td { padding: 0 0.3em; } -.report-grid .single img { - width: 100px; - margin: 2px; -} - -.report-grid .multi img { - width: 50px; - margin: 1px; -} - #verification-grid .report-grid .single img { width: 40px; } diff --git a/css/theme-bootstrap-3.css b/css/theme-bootstrap-3.css index 8e4c2d7a..4a8f4b19 100644 --- a/css/theme-bootstrap-3.css +++ b/css/theme-bootstrap-3.css @@ -1,4 +1,24 @@ /* Theme extension to the default_site.css file which provides Bootstrap 3 optimised style output */ +/* Accessible colour ranges from colorbrewer */ +table.report-grid { + /* Sizing of thumbnails in image columns */ } + table.report-grid tr { + /* Odd row colouration */ + /* Workflow related styling */ } + table.report-grid tr.odd { + background-color: #eeeeee; + border: none; } + table.report-grid tr.overdue { + border-left: solid 8px #d7191c; } + table.report-grid tr.overdue-soon { + border-left: solid 8px #fdae61; } + table.report-grid .single img { + width: 100px; + margin: 2px; } + table.report-grid .multi img { + width: 50px; + margin: 1px; } + /* Reintroduce spacing that is removed from the last control in a list */ #controls > div { padding-bottom: 15px; } diff --git a/css/theme-bootstrap-3.css.map b/css/theme-bootstrap-3.css.map index e6fcd75c..0c98bda4 100644 --- a/css/theme-bootstrap-3.css.map +++ b/css/theme-bootstrap-3.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": "AAAA,oGAAoG;ACApG,yEAAyE;AACzE,eAAgB;EACd,cAAc,ECFW,IAAI;;ADI/B,WAAY;EAIV,kEAAkE;EAHlE,0BAAe;IACb,WAAW,EAAE,CAAC;EAGhB,sBAAa;IACX,aAAa,ECVU,IAAI;EDY7B,kCAAuB;IACrB,WAAW,EAAE,GAAG;IAChB,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,IAAI", -"sources": ["../scss/theme-bootstrap-3.scss","../scss/bootstrap-3/_form-controls.scss","../scss/bootstrap-3/_variables.scss"], +"mappings": "AAAA,oGAAoG;ACApG,+CAA+C;ACA/C,iBAAkB;EAehB,2CAA2C;EAd3C,oBAAG;IACD,yBAAyB;IAKzB,8BAA8B;IAJ9B,wBAAM;MACJ,gBAAgB,EAAE,OAAO;MACzB,MAAM,EAAE,IAAI;IAGd,4BAAU;MACR,WAAW,EAAE,iBAA2B;IAE1C,iCAAe;MACb,WAAW,EAAE,iBAA2B;EAI5C,6BAAY;IACV,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,GAAG;EAEb,4BAAW;IACT,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG;;ACtBf,yEAAyE;AACzE,eAAgB;EACd,cAAc,ECFW,IAAI;;ADI/B,WAAY;EAIV,kEAAkE;EAHlE,0BAAe;IACb,WAAW,EAAE,CAAC;EAGhB,sBAAa;IACX,aAAa,ECVU,IAAI;EDY7B,kCAAuB;IACrB,WAAW,EAAE,GAAG;IAChB,YAAY,EAAE,GAAG;IACjB,SAAS,EAAE,IAAI", +"sources": ["../scss/theme-bootstrap-3.scss","../scss/common/_variables.scss","../scss/common/_report-grid.scss","../scss/bootstrap-3/_form-controls.scss","../scss/bootstrap-3/_variables.scss"], "names": [], "file": "theme-bootstrap-3.css" } diff --git a/css/theme-generic.css b/css/theme-generic.css index 9c0d5036..2af3c214 100644 --- a/css/theme-generic.css +++ b/css/theme-generic.css @@ -1,22 +1,72 @@ /* Theme extension to the default_site.css file which provides the default Indicia style output */ -label, form label { width: 160px; display: -moz-inline-stack; display: inline-block; zoom: 1; *display: inline; vertical-align: top; margin: 8px 0; font-weight: bold; } +/* Accessible colour ranges from colorbrewer */ +table.report-grid { + /* Sizing of thumbnails in image columns */ } + table.report-grid tr { + /* Odd row colouration */ + /* Workflow related styling */ } + table.report-grid tr.odd { + background-color: #eeeeee; + border: none; } + table.report-grid tr.overdue { + border-left: solid 8px #d7191c; } + table.report-grid tr.overdue-soon { + border-left: solid 8px #fdae61; } + table.report-grid .single img { + width: 100px; + margin: 2px; } + table.report-grid .multi img { + width: 50px; + margin: 1px; } -form input:not([type="submit"]), form select, form textarea, #form-params textarea, .timeEntry_control, .inline-control, button.inline-control, input.inline-control { vertical-align: top; margin: 4px 0; display: inline; padding: 4px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } +label, form label { + width: 160px; + display: -moz-inline-stack; + display: inline-block; + zoom: 1; + *display: inline; + vertical-align: top; + margin: 8px 0; + font-weight: bold; } -.helpText { margin-left: 164px; } +form input:not([type="submit"]), form select, form textarea, #form-params textarea, .timeEntry_control, +.inline-control, button.inline-control, input.inline-control { + vertical-align: top; + margin: 4px 0; + display: inline; + padding: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } + +.helpText { + margin-left: 164px; } /* Required asterisk can be large */ -.deh-required { font-size: 150%; } +.deh-required { + font-size: 150%; } /* Control box is div class used to group controls with a single label, e.g. hierarchical select. */ -.control-box { display: inline-block; zoom: 1; *display: inline; } +.control-box { + display: inline-block; + zoom: 1; + *display: inline; } /* Some default button spacing. */ -.indicia-button { padding: 0.3em 1.5em; margin: 0.25em; min-height: 23px; width: auto; line-height: 1.5; } +.indicia-button { + padding: 0.3em 1.5em; + margin: 0.25em; + min-height: 23px; + width: auto; + line-height: 1.5; } /* Find-me icon position inside edge of sref control */ -input.findme { padding-right: 18px; } +input.findme { + padding-right: 18px; } -#findme-icon { margin: 8px 0 0 -18px; vertical-align: top; padding-right: 2px; } +#findme-icon { + margin: 8px 0 0 -18px; + vertical-align: top; + padding-right: 2px; } /*# sourceMappingURL=theme-generic.css.map */ diff --git a/css/theme-generic.css.map b/css/theme-generic.css.map index 481c74d1..4e84f624 100644 --- a/css/theme-generic.css.map +++ b/css/theme-generic.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": "AAAA,kGAAkG;ACAlG,iBAAkB,GAChB,KAAK,ECDO,KAAK,EDEjB,OAAO,EAAC,iBAAiB,EACzB,OAAO,EAAC,YAAY,EACpB,IAAI,EAAC,CAAC,EACN,QAAQ,EAAC,MAAM,EACf,cAAc,EAAE,GAAG,EACnB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,IAAI;;AAGnB,oKACiE,GAC/D,cAAc,EAAE,GAAG,EACnB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,OAAO,ECdS,GAAG,EDenB,qBAAqB,EChBN,GAAG,EDiBlB,kBAAkB,ECjBH,GAAG,EDkBlB,aAAa,EClBE,GAAG;;ADqBpB,SAAU,GACR,WAAW,EAAE,KAA+B;;AAG9C,oCAAoC;AACpC,aAAc,GACZ,SAAS,EAAE,IAAI;;AAGjB,oGAAoG;AACpG,YAAa,GACX,OAAO,EAAC,YAAY,EACpB,IAAI,EAAC,CAAC,EACN,QAAQ,EAAC,MAAM;;AAGjB,kCAAkC;AAClC,eAAgB,GACd,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,IAAI,EAChB,KAAK,EAAE,IAAI,EACX,WAAW,EAAE,GAAG;;AAGlB,uDAAuD;AACvD,YAAa,GACX,aAAa,EAAE,IAAI;;AAGrB,YAAa,GACX,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,GAAG,EACnB,aAAa,EAAE,GAAG", -"sources": ["../scss/theme-generic.scss","../scss/generic/_form-controls.scss","../scss/generic/_variables.scss"], +"mappings": "AAAA,kGAAkG;ACAlG,+CAA+C;ACA/C,iBAAkB;EAehB,2CAA2C;EAd3C,oBAAG;IACD,yBAAyB;IAKzB,8BAA8B;IAJ9B,wBAAM;MACJ,gBAAgB,EAAE,OAAO;MACzB,MAAM,EAAE,IAAI;IAGd,4BAAU;MACR,WAAW,EAAE,iBAA2B;IAE1C,iCAAe;MACb,WAAW,EAAE,iBAA2B;EAI5C,6BAAY;IACV,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE,GAAG;EAEb,4BAAW;IACT,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG;;ACtBf,iBAAkB;EAChB,KAAK,ECDO,KAAK;EDEjB,OAAO,EAAC,iBAAiB;EACzB,OAAO,EAAC,YAAY;EACpB,IAAI,EAAC,CAAC;EACN,QAAQ,EAAC,MAAM;EACf,cAAc,EAAE,GAAG;EACnB,MAAM,EAAE,KAAK;EACb,WAAW,EAAE,IAAI;;AAGnB;4DACiE;EAC/D,cAAc,EAAE,GAAG;EACnB,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,MAAM;EACf,OAAO,ECdS,GAAG;EDenB,qBAAqB,EChBN,GAAG;EDiBlB,kBAAkB,ECjBH,GAAG;EDkBlB,aAAa,EClBE,GAAG;;ADqBpB,SAAU;EACR,WAAW,EAAE,KAA+B;;AAG9C,oCAAoC;AACpC,aAAc;EACZ,SAAS,EAAE,IAAI;;AAGjB,oGAAoG;AACpG,YAAa;EACX,OAAO,EAAC,YAAY;EACpB,IAAI,EAAC,CAAC;EACN,QAAQ,EAAC,MAAM;;AAGjB,kCAAkC;AAClC,eAAgB;EACd,OAAO,EAAE,WAAW;EACpB,MAAM,EAAE,MAAM;EACd,UAAU,EAAE,IAAI;EAChB,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,GAAG;;AAGlB,uDAAuD;AACvD,YAAa;EACX,aAAa,EAAE,IAAI;;AAGrB,YAAa;EACX,MAAM,EAAE,aAAa;EACrB,cAAc,EAAE,GAAG;EACnB,aAAa,EAAE,GAAG", +"sources": ["../scss/theme-generic.scss","../scss/common/_variables.scss","../scss/common/_report-grid.scss","../scss/generic/_form-controls.scss","../scss/generic/_variables.scss"], "names": [], "file": "theme-generic.css" } diff --git a/scss/common/_report-grid.scss b/scss/common/_report-grid.scss new file mode 100644 index 00000000..54b35ba9 --- /dev/null +++ b/scss/common/_report-grid.scss @@ -0,0 +1,25 @@ +table.report-grid { + tr { + /* Odd row colouration */ + &.odd { + background-color: #eeeeee; + border: none; + } + /* Workflow related styling */ + &.overdue { + border-left: solid 8px $colour-range-1-a; + } + &.overdue-soon { + border-left: solid 8px $colour-range-1-b; + } + } + /* Sizing of thumbnails in image columns */ + .single img { + width: 100px; + margin: 2px; + } + .multi img { + width: 50px; + margin: 1px; + } +} \ No newline at end of file diff --git a/scss/common/_variables.scss b/scss/common/_variables.scss new file mode 100644 index 00000000..ebfea96f --- /dev/null +++ b/scss/common/_variables.scss @@ -0,0 +1,5 @@ +/* Accessible colour ranges from colorbrewer */ +$colour-range-1-a: #d7191c; +$colour-range-1-b: #fdae61; +$colour-range-1-c: #abd9e9; +$colour-range-1-d: #2c7bb6; \ No newline at end of file diff --git a/scss/theme-bootstrap-3.scss b/scss/theme-bootstrap-3.scss index 2d3f0ffc..aa3ce8f1 100644 --- a/scss/theme-bootstrap-3.scss +++ b/scss/theme-bootstrap-3.scss @@ -1,3 +1,5 @@ /* Theme extension to the default_site.css file which provides Bootstrap 3 optimised style output */ +@import "common/variables"; @import "bootstrap-3/variables"; +@import "common/report-grid"; @import "bootstrap-3/form-controls"; \ No newline at end of file diff --git a/scss/theme-generic.scss b/scss/theme-generic.scss index 3c241e44..3473b867 100644 --- a/scss/theme-generic.scss +++ b/scss/theme-generic.scss @@ -1,3 +1,5 @@ /* Theme extension to the default_site.css file which provides the default Indicia style output */ +@import "common/variables"; @import "generic/variables"; +@import "common/report-grid"; @import "generic/form-controls"; \ No newline at end of file