From 1116ef6d9f395aeeaf1580c4cd03b7ca5501d2c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sol=C3=A8ne=20Desvaux?= Date: Mon, 25 Jul 2022 16:37:41 +0200 Subject: [PATCH] Bug 30952: Staff interface redesign (toolbar) --- .../intranet-tmpl/prog/css/src/_toolbar.scss | 71 ++++++++++++++++ .../prog/css/src/staff-global.scss | 83 +------------------ 2 files changed, 72 insertions(+), 82 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss new file mode 100644 index 0000000000..3c3cd1f322 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_toolbar.scss @@ -0,0 +1,71 @@ +#toolbar, +.btn-toolbar { + display: flex; + justify-content: flex-end; + flex-wrap: wrap; + + background-color: #f3F4F4; + border: 0; + border-radius: 5px 5px 0 0; + margin: 0; + + .dropdown-menu { + border-top-width: 1px; + font-size: 13px; + } + + &.floating { + border-radius: 0; + margin-top: 0; + box-shadow: 0 3px 2px 0 rgba(0, 0, 0, .5); + z-index: 100; + } + + a.addtocart { + display: block; + } + + a.cartRemove { + padding: 6px 12px; + font-size: 12px; + display: none; + } + + a.addtocart.incart { + display: none; + } + + a.cartRemove.incart { + display: block; + } + + .btn.btn-default { + font-weight: normal; + text-align: center; + white-space: nowrap; + vertical-align: middle; + touch-action: manipulation; + cursor: pointer; + background-image: none; + padding: 6px 12px; + box-shadow: none; + border-radius: 4px; + user-select: none; + font-size: 100%; + background-color: transparent; + border: 0; + display: inline-block; + color: #696969; + + &:hover, &:focus { + text-decoration: none; + background-color: #DADADA; + color: #696969; + padding: 6px 12px; + } + + &:active { + border: 0; + } + } +} 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 24389aee58..ca583b6995 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -543,19 +543,6 @@ ul { } } - .toolbar { - padding-left: 0; - - button { - padding-bottom: 2px; - } - - li { - display: inline; - list-style: none; - } - } - &.budget_hierarchy { margin-left: 0; padding-left: 0; @@ -1331,44 +1318,6 @@ dd { padding: .2em .2em .2em 2.5em; } -#toolbar, -.btn-toolbar { - background-color: #EDF4F6; - border: 1px solid #E6F0F2; - border-radius: 5px 5px 0 0; - margin: 0; - padding: 5px; - - .dropdown-menu { - border-top-width: 1px; - font-size: 13px; - } - - &.floating { - border-radius: 0; - margin-top: 0; - z-index: 300; - } - - a.addtocart { - display: block; - } - - a.cartRemove { - padding: 6px 12px; - font-size: 12px; - display: none; - } - - a.addtocart.incart { - display: none; - } - - a.cartRemove.incart { - display: block; - } -} - #disabled { a { color: #999; @@ -1528,18 +1477,6 @@ dd { } } -.btn-toolbar { - fieldset { - &.action { - margin-top: 0; - } - } - - .dropdown-menu { - font-size: 13px; - } -} - .rows { .label { white-space: normal; @@ -3294,18 +3231,6 @@ button, } } -#toolbar { - .dropdown-menu { - border-top-width: 1px; - font-size: 13px; - } - - &.floating { - border-radius: 0; - margin-top: 0; - } -} - #changelanguage { background: #FFF none; border-top: 1px solid #EEE; @@ -3638,13 +3563,6 @@ progress { } } -// Class to be added to toolbar when it starts being fixed at the top of the screen - -.floating { - box-shadow: 0 3px 2px 0 rgba(0, 0, 0, .5); - z-index: 100; -} - .inline { display: inline; } @@ -4576,6 +4494,7 @@ div .suggestion_note { } @import "header"; +@import "toolbar"; @media (min-width: 200px) { -- 2.30.2