Skip to content

Commit

Permalink
CSS updates
Browse files Browse the repository at this point in the history
* Some reorganisation into scss files.
* Adds a common group of scss files for all themes.
* Some workflow related styling.
  • Loading branch information
johnvanbreda committed Nov 29, 2017
1 parent 60f4f0b commit 906bd45
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 27 deletions.
15 changes: 0 additions & 15 deletions css/default_site.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
20 changes: 20 additions & 0 deletions css/theme-bootstrap-3.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/theme-bootstrap-3.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 58 additions & 8 deletions css/theme-generic.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/theme-generic.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions scss/common/_report-grid.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
5 changes: 5 additions & 0 deletions scss/common/_variables.scss
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 2 additions & 0 deletions scss/theme-bootstrap-3.scss
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 2 additions & 0 deletions scss/theme-generic.scss
Original file line number Diff line number Diff line change
@@ -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";

0 comments on commit 906bd45

Please sign in to comment.