From 8da629f158ac50f179f0d00b4ae551f80c21dab6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 9 Aug 2018 14:04:51 +0000 Subject: [PATCH] Bug 20427: (follow-up) Bring SCSS up to date with latest LESS changes This patch catches the SCSS up to the latest changes in master: Changes to opac.less: Bug 20756 Bug 20559 Bug 7547 Changes to print.less: Bug 16575 --- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 57 ++++++++++-------------- koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss | 21 +++++++-- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss index dec3007..1f13274 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -148,13 +148,7 @@ a { padding-left: 27px; } - &.deleteshelf { - @extend %initial_icon; - &.disabled { - @extend %initial_icon; - } - } &.detail { @extend %initial_icon; @@ -226,7 +220,7 @@ a { &.print-large { @extend %initial_icon; - background-position: -5px -186px; /* Toolbar print */ + background-position: 0 -187px; /* Toolbar print */ padding-left: 35px; } @@ -259,6 +253,12 @@ a { padding-left: 28px; } + &.sharelist { + @extend %initial_icon; + background-position: 2px -1148px; /* List share */ + padding-left: 26px; + } + &.tag_add { @extend %initial_icon; background-position: 3px -1111px; /* Tag results */ @@ -580,6 +580,16 @@ th { padding: 5px 10px; } +.buttons-print { + @extend %initial_icon; + background-color: transparent; + background-position: 0 -184px; /* Toolbar print */ + border: 0; + color: #0076B2; + font-size: 100%; + padding-left: 35px; +} + .form-inline { display: inline; margin: 0; @@ -928,31 +938,6 @@ ul { /* end jQueryUI core */ -/* jQueryUI autocomplete */ - -.ui-autocomplete { - @include shadowed; - cursor: default; - position: absolute; - - &.ui-widget-content .ui-state-hover { - background: #E6F0F2 none; - border: 1px solid #AAA; - color: #212121; - font-weight: normal; - } -} - -.ui-autocomplete-loading { - background: #FFF url( "../../img/loading-small.gif" ) right center no-repeat; -} - -.ui-menu li { - list-style: none; -} - -/* end jQueryUI autocomplete */ - .item-thumbnail { max-width: none; } @@ -1716,7 +1701,7 @@ input { &.editshelf { @extend %initial_icon; background-color: transparent; - background-position: 2px -735px; /* List edit */ + background-position: 2px -734px; /* List edit */ border: 0; color: #006699; cursor: pointer; @@ -1750,7 +1735,7 @@ input { .deleteshelf { @extend %initial_icon; background-color: transparent; - background-position: 2px -688px; /* Delete */ + background-position: 2px -687px; /* Delete */ border: 0; color: #006699; cursor: pointer; @@ -1766,6 +1751,10 @@ input { &:hover { color: #990033; } + + &.disabled { + background-position: 0 -712px; /* Delete */ + } } .links a { diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss index 9636cac..6eec50e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss @@ -146,32 +146,41 @@ body#basket a { } body#basket table { - border-left: 1px solid #EEE; - border-top: 1px solid #EEE; + border-collapse: collapse; } body#basket td, body#basket th { background-color: transparent; + border: 0; padding: 2px; } body#basket th { background-color: #EEE; + border: 0; } body#basket th, body#basket th[scope=col] { + border: 0; text-align: center; vertical-align: middle; } body#basket th[scope=row] { + border: 0; font-size: 89%; text-align: right; vertical-align: top; width: 10%; } +#basket { + tr { + border-bottom: 1px solid #DDD; + } +} + body#basket p { font-size: 85%; margin: .2em 0; @@ -237,7 +246,8 @@ a[href]:after, fieldset.action, h2 span.hint, input, -td.resultscontrol { +td.resultscontrol, +.cart-control { display: none; } @@ -249,3 +259,8 @@ td.resultscontrol { #ulactioncontainer { display: none; } + +.main, +.table-bordered { + border: 0; +} -- 2.1.4