Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20427: (follow-up) Bring SCSS up to date with latest LESS changes

Browse source 
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

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Owen Leonard 2018-08-09 14:04:51 +00:00 committed by Nick Clemens
parent 2df87a94f5
commit e90b452bdd
2 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
View file

@ -148,13 +148,7 @@ a {
padding-left: 27px; padding-left: 27px;
} }
&.deleteshelf {
@extend %initial_icon;
&.disabled {
@extend %initial_icon;
}
}
&.detail { &.detail {
@extend %initial_icon; @extend %initial_icon;
@ -226,7 +220,7 @@ a {
&.print-large { &.print-large {
@extend %initial_icon; @extend %initial_icon;
background-position: -5px -186px; /* Toolbar print */ background-position: 0 -187px; /* Toolbar print */
padding-left: 35px; padding-left: 35px;
} }
@ -259,6 +253,12 @@ a {
padding-left: 28px; padding-left: 28px;
} }
&.sharelist {
@extend %initial_icon;
background-position: 2px -1148px; /* List share */
padding-left: 26px;
}
&.tag_add { &.tag_add {
@extend %initial_icon; @extend %initial_icon;
background-position: 3px -1111px; /* Tag results */ background-position: 3px -1111px; /* Tag results */
@ -580,6 +580,16 @@ th {
padding: 5px 10px; 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 { .form-inline {
display: inline; display: inline;
margin: 0; margin: 0;
@ -928,31 +938,6 @@ ul {
/* end jQueryUI core */ /* 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 { .item-thumbnail {
max-width: none; max-width: none;
} }
@ -1716,7 +1701,7 @@ input {
&.editshelf { &.editshelf {
@extend %initial_icon; @extend %initial_icon;
background-color: transparent; background-color: transparent;
background-position: 2px -735px; /* List edit */ background-position: 2px -734px; /* List edit */
border: 0; border: 0;
color: #006699; color: #006699;
cursor: pointer; cursor: pointer;
@ -1750,7 +1735,7 @@ input {
.deleteshelf { .deleteshelf {
@extend %initial_icon; @extend %initial_icon;
background-color: transparent; background-color: transparent;
background-position: 2px -688px; /* Delete */ background-position: 2px -687px; /* Delete */
border: 0; border: 0;
color: #006699; color: #006699;
cursor: pointer; cursor: pointer;
@ -1766,6 +1751,10 @@ input {
&:hover { &:hover {
color: #990033; color: #990033;
} }
&.disabled {
background-position: 0 -712px; /* Delete */
}
} }
.links a { .links a {

21
koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss
View file

@ -146,32 +146,41 @@ body#basket a {
} }
body#basket table { body#basket table {
border-left: 1px solid #EEE; border-collapse: collapse;
border-top: 1px solid #EEE;
} }
body#basket td, body#basket td,
body#basket th { body#basket th {
background-color: transparent; background-color: transparent;
border: 0;
padding: 2px; padding: 2px;
} }
body#basket th { body#basket th {
background-color: #EEE; background-color: #EEE;
border: 0;
} }
body#basket th, body#basket th,
body#basket th[scope=col] { body#basket th[scope=col] {
border: 0;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
} }
body#basket th[scope=row] { body#basket th[scope=row] {
border: 0;
font-size: 89%; font-size: 89%;
text-align: right; text-align: right;
vertical-align: top; vertical-align: top;
width: 10%; width: 10%;
} }
#basket {
tr {
border-bottom: 1px solid #DDD;
}
}
body#basket p { body#basket p {
font-size: 85%; font-size: 85%;
margin: .2em 0; margin: .2em 0;
@ -237,7 +246,8 @@ a[href]:after,
fieldset.action, fieldset.action,
h2 span.hint, h2 span.hint,
input, input,
td.resultscontrol { td.resultscontrol,
.cart-control {
display: none; display: none;
} }
@ -249,3 +259,8 @@ td.resultscontrol {
#ulactioncontainer { #ulactioncontainer {
display: none; display: none;
} }
.main,
.table-bordered {
border: 0;
}