@@ -, +, @@ --- .../intranet-tmpl/prog/en/css/staff-global.css | 140 ++++- .../prog/en/includes/doc-head-close.inc | 2 + .../intranet-tmpl/prog/en/includes/header.inc | 121 ++-- .../prog/en/includes/intranet-bottom.inc | 28 +- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 64 +- .../prog/en/lib/bootstrap/bootstrap.min.css | 616 ++++++++++++++++++++ .../prog/en/lib/bootstrap/bootstrap.min.js | 7 + .../bootstrap/img/glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../en/lib/bootstrap/img/glyphicons-halflings.png | Bin 0 -> 12799 bytes 9 files changed, 839 insertions(+), 139 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/bootstrap/bootstrap.min.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/bootstrap/bootstrap.min.js create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/bootstrap/img/glyphicons-halflings-white.png create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/bootstrap/img/glyphicons-halflings.png --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -143,6 +143,7 @@ em strong { #login_controls { position : absolute; right : .5em; + padding: .4em .5em; } ul { @@ -165,15 +166,6 @@ ol li { list-style : decimal; } -#header { - background-color : #e6f0f2; - line-height : 2em; -} - -#header a.toplinks { - font-weight: bold; -} - .gradient { background-image: linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%); background-image: -o-linear-gradient(top, rgb(230,240,242) 1%, rgb(255,255,255) 99%); @@ -1112,6 +1104,8 @@ div.alert { background: linear-gradient(top, #fef8d3 0%,#ffec91 9%,#ffed87 89%,#f9dc00 100%); /* W3C */ text-align : center; border: 1px solid #E0C726; + color : inherit; + text-shadow : none; } div.alert strong { @@ -1615,16 +1609,16 @@ a.yuimenuitemlabel:hover { vertical-align : top; } -#toplevelnav { +ul#toplevelmenu { + padding : 0; +} + +/*#toplevelnav { float : left; margin-left : .5em; width: 40%; } -ul#toplevelmenu { - padding : 0; -} - ul#toplevelmenu li { display: inline; padding : 0 .6em; @@ -1733,7 +1727,7 @@ div.lang { * html div#doc3{ height:100%; overflow:auto; - } + }*/ #CheckAll, #CheckNone, #CheckPending { font-weight : normal; @@ -1843,7 +1837,7 @@ span.permissiondesc { z-index : 50; } #cartmenulink { - background: transparent url("../../img/cart-small.gif") 0 3px no-repeat; + background: transparent url("../../img/cart-small.gif") left center no-repeat; padding-left : 15px; } #cartmenulink span#basketcount span { @@ -2404,3 +2398,117 @@ div.authorizedheading { video { width: 480px; } + +/* Bootstrap overrides */ +.btn { + border-color : #ADADAD #ADADAD #949494; + +} +#toolbar .btn, +#toolbar .dropdown-menu { + font-size: 13px; +} +a.btn:link, +a.btn:visited{ + color: #333333; +} +.dropdown-menu li { + list-style: none outside none; +} +[class^="icon-"],[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings.png");} +.icon-white,.nav-tabs>.active>a>[class^="icon-"],.nav-tabs>.active>a>[class*=" icon-"],.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"]{background-image:url("../../img/glyphicons-halflings-white.png");} +a.disabled { + color : #999999; +} + +.navbar { + color: #333; +} + +.navbar .nav > li > a { + color: #004D99; + font-weight: bold; + padding : .4em .2em; +} + +.navbar .nav > li { + list-style: none outside none; + padding : 0 .6em; +} + +.navbar .nav > li > a:focus, +.navbar .nav > li > a:hover { + color: #538200; +} + +.navbar .nav li.dropdown.open > .dropdown-toggle, +.navbar .nav li.dropdown.active > .dropdown-toggle, +.navbar .nav li.dropdown.open.active > .dropdown-toggle { + background: transparent none; +} + +.navbar-static-top .navbar-inner { + background: #E6F0F2 none; + border: 0; + box-shadow: none; + min-height: 0; + padding-left: 0; +} +.navbar-fixed-bottom .navbar-inner { + min-height: 0; + padding : .4em 0; +} + +.navbar-fixed-bottom .nav > li > a { + font-weight: normal; + padding : .05em .3em; +} + +.navbar-fixed-bottom .nav > li { + border-right : 1px solid #CCC; +} + +.navbar-fixed-bottom .nav > li:last-child { + border-right : 0; +} + +.navbar-fixed-bottom .nav > li.navbar-text { + line-height: normal; + padding : 0.4em 0.7em; +} +.navbar .nav > li { + list-style: none outside none; + padding : 0 .6em; +} +.navbar .nav > li > a { + color: #004D99; + font-weight: bold; + padding : .4em .3em; +} +.navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { + background: transparent none; +} + +.navbar .nav > li > a:focus, +.navbar .nav > li > a:hover { + color: #538200; +} + +.navbar .nav li.dropdown.open > .dropdown-toggle, +.navbar .nav li.dropdown.active > .dropdown-toggle, +.navbar .nav li.dropdown.open.active > .dropdown-toggle { + background: transparent none; +} + +.tooltip.bottom .tooltip-arrow { + border-bottom-color: #EEE; +} +.tooltip.bottom .tooltip-inner { + background-color : #FFF; + border: 1px solid rgba(0, 0, 0, 0.2); + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + color: #000; + padding : 1em; + font-size : 120%; +} +.separator { color : #666; padding : 0 .2em; } --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -1,6 +1,7 @@ + [% IF ( intranetstylesheet ) %] @@ -13,6 +14,7 @@ + [% IF ( login ) %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -1,20 +1,16 @@ - [% IF ( intranetbookbag ) %]