Merge 'better' theme into base templates

i.e. for now there is no 'better' (or any other) theme
This commit is contained in:
Lance Edgar 2017-08-13 19:11:53 -05:00
parent c0a28716f5
commit 7d0bb80a90
15 changed files with 241 additions and 423 deletions

View file

@ -13,7 +13,7 @@ body {
}
a {
color: #3D6E1C;
color: #0972a5;
text-decoration: none;
}
@ -76,6 +76,11 @@ div.error-messages div.ui-state-error {
margin-bottom: 8px;
}
.flash-messages,
.error-messages {
margin: 0.5em 0 0 0;
}
div.error {
color: #dd6666;
font-weight: bold;

View file

@ -36,6 +36,10 @@ div.fieldset {
margin-top: 10px;
}
.form {
padding-left: 5em;
}
/******************************
* Fieldsets

View file

@ -21,6 +21,11 @@
white-space: nowrap;
}
.grid-wrapper .grid-header #context-menu {
float: none;
margin: 0;
}
.grid-wrapper .grid-header td.tools {
margin: 0;
padding: 0;

View file

@ -57,6 +57,59 @@ body > #body-wrapper {
margin-left: 0.5em;
}
/* new stuff from 'better' theme begins here */
header .global {
background-color: #eaeaea;
height: 60px;
}
header .global a.home,
header .global a.global,
header .global span.global {
display: block;
float: left;
font-size: 2em;
font-weight: bold;
line-height: 60px;
margin-left: 10px;
}
header .global a.home img {
display: block;
float: left;
padding: 5px 5px 5px 30px;
}
header .global .grid-nav {
display: inline-block;
font-size: 16px;
font-weight: bold;
line-height: 60px;
margin-left: 5em;
}
header .global .grid-nav .ui-button,
header .global .grid-nav span.viewing {
margin-left: 1em;
}
header .global .feedback {
float: right;
line-height: 60px;
margin-right: 1em;
}
header .page {
border-bottom: 1px solid lightgrey;
padding: 0.5em;
}
header .page h1 {
margin: 0;
padding: 0 0 0 0.5em;
}
/******************************
* Logo
******************************/
@ -67,6 +120,29 @@ body > #body-wrapper {
}
/****************************************
* content
****************************************/
body > #body-wrapper {
margin: 0px;
position: relative;
}
.content-wrapper {
height: 100%;
padding-bottom: 30px;
}
#scrollpane {
height: 100%;
}
#scrollpane .inner-content {
padding: 0 0.5em 0.5em 0.5em;
}
/******************************
* context menu
******************************/
@ -74,7 +150,9 @@ body > #body-wrapper {
#context-menu {
float: right;
list-style-type: none;
margin: 0.5em;
text-align: right;
white-space: nowrap;
}
@ -110,3 +188,19 @@ body > #body-wrapper {
overflow: auto;
padding: 5px;
}
/****************************************
* footer
****************************************/
#footer {
border-top: 1px solid lightgray;
bottom: 0;
font-size: 9pt;
height: 20px;
left: 0;
line-height: 20px;
margin: 0;
position: absolute;
width: 100%;
}

View file

@ -1,124 +0,0 @@
/**********************************************************************
* styles for 'better' theme
**********************************************************************/
/****************************************
* core overrides
****************************************/
a {
color: #0972a5;
}
.flash-messages,
.error-messages {
margin: 0.5em 0 0 0;
}
#context-menu {
margin: 0.5em;
white-space: nowrap;
}
.form {
padding-left: 5em;
}
.grid-wrapper .grid-header #context-menu {
float: none;
margin: 0;
}
/****************************************
* header
****************************************/
header .global {
background-color: #eaeaea;
height: 60px;
}
header .global a.home,
header .global a.global,
header .global span.global {
display: block;
float: left;
font-size: 2em;
font-weight: bold;
line-height: 60px;
margin-left: 10px;
}
header .global a.home img {
display: block;
float: left;
padding: 5px 5px 5px 30px;
}
header .global .grid-nav {
display: inline-block;
font-size: 16px;
font-weight: bold;
line-height: 60px;
margin-left: 5em;
}
header .global .grid-nav .ui-button,
header .global .grid-nav span.viewing {
margin-left: 1em;
}
header .global .feedback {
float: right;
line-height: 60px;
margin-right: 1em;
}
header .page {
border-bottom: 1px solid lightgrey;
padding: 0.5em;
}
header .page h1 {
margin: 0;
padding: 0 0 0 0.5em;
}
/****************************************
* content
****************************************/
body > #body-wrapper {
margin: 0px;
position: relative;
}
.content-wrapper {
height: 100%;
padding-bottom: 30px;
}
#scrollpane {
height: 100%;
}
#scrollpane .inner-content {
padding: 0 0.5em 0.5em 0.5em;
}
/****************************************
* footer
****************************************/
#footer {
border-top: 1px solid lightgray;
bottom: 0;
font-size: 9pt;
height: 20px;
left: 0;
line-height: 20px;
margin: 0;
position: absolute;
width: 100%;
}