From 5cd0c9a0edd66d8b9c0bbdd854110a7b6849c82b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 23 Apr 2018 13:14:57 +0000 Subject: [PATCH] Bug 19474: (follow-up) Bring scss up to date with latest CSS changes This patch catches the scss up to the latest changes in master: Bug 19946, Bug 20045, Bug 20343, Bug 18327, Bug 20322, Bug 18799, and Bug 20622. --- .../intranet-tmpl/prog/css/src/staff-global.scss | 120 ++++++++++++++++++--- 1 file changed, 104 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index e4bd5f1..6132919 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -111,6 +111,8 @@ a { &.document { background-position: left middle; background-repeat: no-repeat; + display: inline-block; + min-height: 20px; padding-left: 20px; } @@ -936,7 +938,7 @@ fieldset { font-weight: bold; margin-right: 1em; text-align: right; - width: 6em; + width: 9em; .error { float: none; @@ -1070,6 +1072,16 @@ fieldset { } } +#multi_receiving { + fieldset { + &.rows { + label { + width: 50%; + } + } + } +} + .yui-u { div { .hint { @@ -1120,6 +1132,34 @@ legend { width: auto; } +details { + > summary { + cursor: pointer; + + &::before { + content: "\f0da"; + display: inline-block; + font-family: FontAwesome; + width: 1em; + } + + &.checkouts-by-itemtype { + li { + display: inline-block; + } + } + } +} + +details[open] { + > summary { + &::before { + content: "\f0d7"; + } + } +} + + #floating-save { background-color: rgba(185, 216, 217, .6); bottom: 3%; @@ -1659,16 +1699,6 @@ dd { } } - label { - width: 9em; - } - - span { - &.label { - width: 9em; - } - } - td { label { width: auto; @@ -1740,11 +1770,6 @@ dd { overflow-y: auto; } -#z3950_search_targets_auth { - height: 348px; - overflow-y: auto; -} - .z3950checks { padding-left: 1em; } @@ -3332,9 +3357,14 @@ label { } .modal-body { + background-color: #FFF; overflow-y: auto; } +.modal-content { + background-color : #EDF4F6; +} + .btn-group { label, select { @@ -3527,6 +3557,21 @@ span { } } + +.result-biblio-itemtype { + float: right; + padding: .5em; + margin: .5em; + font-size: 85%; + text-align: center; + + img { + display: block; + margin: auto; + margin-bottom: 2px; + } +} + .browse-label, .browse-prev-next { border: 1px solid #B9D8D9; @@ -3899,6 +3944,49 @@ span { } } +/* ==== MODULE LINKS - Start ==== */ + +ul { + &.buttons-list { + /* List containing the module links */ + padding: 0; + margin-bottom: 30px; + + li { + /* Standard attributes for the list elements */ + list-style-type:none; + + a { + &.circ-button { + /* Class used for each module link */ + background-color: #F4F8F9; + background-position: 5px 3px; + background-repeat: no-repeat; + border: solid 2px #b9d8d9; + border-radius: 6px; + box-sizing: content-box; + color: #000000; + display: block; + font-size: 110%; + font-weight: bold; + max-width: 260px; + margin: .5em 0; + padding: 8px; + text-decoration: none; + + &:hover { + /* Class used for each module link hover state */ + border-color: #538200; + color: #538200; + } + } + } + } + } +} + +/* ==== MODULE LINKS - End ==== */ + @media (min-width: 200px) { .navbar-nav > li { float: left; -- 2.1.4