From: Bill Erickson Date: Wed, 4 Dec 2013 14:50:20 +0000 (-0500) Subject: web staff: drive css from templates (like tpac) X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=892587bccf8db2e5d369e33616157eabded53a45;p=working%2FEvergreen.git web staff: drive css from templates (like tpac) Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm index 57cb02b4dd..2e557db87a 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm @@ -239,7 +239,7 @@ sub find_template { my @parts = split('/', $path); my $localpath = $path; - if ($localpath =~ m|opac/css|) { + if ($localpath =~ m|/css/|) { $r->content_type('text/css; encoding=utf8'); } else { $r->content_type('text/html; encoding=utf8'); diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 new file mode 100644 index 0000000000..fc45281101 --- /dev/null +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -0,0 +1,80 @@ +/* -------------------------------------------------------------------------- + * Simple default navbar style adjustements to apply the Evergreen color. + * TODO: style other components to match EG color scheme + */ +.navbar-default { + background: -webkit-linear-gradient(#00593d, #007a54); + background-color: #007a54; + color: #fff; +} + +.navbar-default .navbar-nav>li>a { + color: #fff; +} + +.navbar-default .navbar-nav>li>a:hover { + color: #ddd; +} + +.navbar-default .navbar-nav>.dropdown>a .caret { + border-top-color: #fff; + border-bottom-color: #fff; +} +.navbar-default .navbar-nav>.dropdown>a:hover .caret { + border-top-color: #ddd; + border-bottom-color: #ddd; +} + +/* -------------------------------------------------------------------------- + * Structural modifications + */ + +#top-content-container { + /* allow the primary container to occupy most of the page, + * but leave some narrow gutters along the side, much + * narrower than the default Bootstrapp container gutters. + */ + width: 95%; +} + + +/* -------------------------------------------------------------------------- + * Temporaray local CSS required to make angular-ui-bootstrap + * version 0.6.0 look right with Bootstrap CSS 3.0 + */ +.nav, .pagination, .carousel a { cursor: pointer; } +.modal { + display: block; + height: 0; + overflow: visible; +} +.modal-body:before, +.modal-body:after { + display: table; + content: " "; +} +.modal-header:before, +.modal-header:after { + display: table; + content: " "; +} + +/* -------------------------------------------------------------------------- +/* Form Validation CSS - http://docs.angularjs.org/guide/forms + * TODO: these colors are harsh and don't fit the EG color scheme + */ +.form-validated input.ng-invalid.ng-dirty { + background-color: #FA787E; +} +.form-validated input.ng-valid.ng-dirty { + background-color: #78FA89; +} + +/* -------------------------------------------------------------------------- + * Local style + */ + +#splash-nav .panel-body div { + padding-bottom: 10px; +} + diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/t_base.tt2 index 325f1d9526..49b259ac8d 100644 --- a/Open-ILS/src/templates/staff/t_base.tt2 +++ b/Open-ILS/src/templates/staff/t_base.tt2 @@ -9,7 +9,7 @@ - + [% INCLUDE "staff/t_navbar.tt2" %] diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2 index bf8a7b7676..f27e041dea 100644 --- a/Open-ILS/src/templates/staff/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/t_splash.tt2 @@ -1,10 +1,3 @@ - -

diff --git a/Open-ILS/web/css/skin/default/staff/base.css b/Open-ILS/web/css/skin/default/staff/base.css deleted file mode 100644 index f46456026a..0000000000 --- a/Open-ILS/web/css/skin/default/staff/base.css +++ /dev/null @@ -1,71 +0,0 @@ -/* -------------------------------------------------------------------------- - * Simple default navbar style adjustements to apply the Evergreen color. - * TODO: style other components to match EG color scheme - */ -.navbar-default { - background: -webkit-linear-gradient(#00593d, #007a54); - background-color: #007a54; - color: #fff; -} - -.navbar-default .navbar-nav>li>a { - color: #fff; -} - -.navbar-default .navbar-nav>li>a:hover { - color: #ddd; -} - -.navbar-default .navbar-nav>.dropdown>a .caret { - border-top-color: #fff; - border-bottom-color: #fff; -} -.navbar-default .navbar-nav>.dropdown>a:hover .caret { - border-top-color: #ddd; - border-bottom-color: #ddd; -} - -/* -------------------------------------------------------------------------- - * Structural modifications - */ - -#top-content-container { - /* allow the primary container to occupy most of the page, - * but leave some narrow gutters along the side, much - * narrower than the default Bootstrapp container gutters. - */ - width: 95%; -} - - -/* -------------------------------------------------------------------------- - * Temporaray local CSS required to make angular-ui-bootstrap - * version 0.6.0 look right with Bootstrap CSS 3.0 - */ -.nav, .pagination, .carousel a { cursor: pointer; } -.modal { - display: block; - height: 0; - overflow: visible; -} -.modal-body:before, -.modal-body:after { - display: table; - content: " "; -} -.modal-header:before, -.modal-header:after { - display: table; - content: " "; -} - -/* -------------------------------------------------------------------------- -/* Form Validation CSS - http://docs.angularjs.org/guide/forms - * TODO: these colors are harsh and don't fit the EG color scheme - */ -.form-validated input.ng-invalid.ng-dirty { - background-color: #FA787E; -} -.form-validated input.ng-valid.ng-dirty { - background-color: #78FA89; -}