diff --git a/tailbone/static/css/forms.css b/tailbone/static/css/forms.css index d33f4cc8..b3cec279 100644 --- a/tailbone/static/css/forms.css +++ b/tailbone/static/css/forms.css @@ -54,7 +54,6 @@ div.field-wrapper.error { } div.field-wrapper label { - color: #000000; display: block; float: left; width: 15em; diff --git a/tailbone/static/css/theme-better.css b/tailbone/static/css/theme-better.css new file mode 100644 index 00000000..923cc613 --- /dev/null +++ b/tailbone/static/css/theme-better.css @@ -0,0 +1,120 @@ + +/********************************************************************** + * 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; +} + +.newgrid-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 h1 { + border-bottom: 1px solid lightgrey; + 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%; +} diff --git a/tailbone/templates/base.mako b/tailbone/templates/base.mako index 3dcd5621..77b7271f 100644 --- a/tailbone/templates/base.mako +++ b/tailbone/templates/base.mako @@ -135,9 +135,13 @@ ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.js'))} %def> -<%def name="core_styles()"> +<%def name="core_styles(jquery_theme=None)"> ${h.stylesheet_link(request.static_url('tailbone:static/css/normalize.css'))} - ${self.jquery_theme()} + % if jquery_theme: + ${jquery_theme()} + % else: + ${self.jquery_smoothness_theme()} + % endif ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.menubar.css'))} ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.loadmask.css'))} ${h.stylesheet_link(request.static_url('tailbone:static/css/jquery.ui.timepicker.css'))} @@ -150,7 +154,7 @@ ${h.stylesheet_link(request.static_url('tailbone:static/css/newgrids.css'))} %def> -<%def name="jquery_theme()"> +<%def name="jquery_smoothness_theme()"> ${h.stylesheet_link('https://code.jquery.com/ui/1.11.4/themes/smoothness/jquery-ui.min.css')} %def> diff --git a/tailbone/templates/themes/better/base.mako b/tailbone/templates/themes/better/base.mako new file mode 100644 index 00000000..1c5c21bf --- /dev/null +++ b/tailbone/templates/themes/better/base.mako @@ -0,0 +1,132 @@ +## -*- coding: utf-8 -*- +<%namespace name="base" file="tailbone:templates/base.mako" /> +<%namespace file="/menu.mako" import="main_menu_items" /> +<%namespace file="/newgrids/nav.mako" import="grid_index_nav" /> + + +
+ +