Attachment 58680 Details for Bug 16239 – Bug 16239: Update css files

[patch] Bug 16239: Update css files

Bug-16239-Update-css-files.patch (text/plain), 12.98 KB, created by Owen Leonard on 2017-01-09 14:36:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2017-01-09 14:36:22 UTC

Size: 12.98 KB

patch

obsolete

>From 812c7f7eef7a65862e1bd570cd3c3b627ef2e07d Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Thu, 10 Nov 2016 09:58:37 +0000
>Subject: [PATCH] Bug 16239: Update css files
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> koha-tmpl/intranet-tmpl/prog/css/cateditor.css    |  11 +-
> koha-tmpl/intranet-tmpl/prog/css/datatables.css   |  24 ++-
> koha-tmpl/intranet-tmpl/prog/css/humanmsg.css     |   5 +
> koha-tmpl/intranet-tmpl/prog/css/mainpage.css     |   1 +
> koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 182 +++++++++++++++++-----
> 5 files changed, 174 insertions(+), 49 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
>index bb92094b..6840d0c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
>@@ -181,7 +181,6 @@ body {
>     border: solid 2px #b9d8d9;
>     border-bottom-style: none;
>     border-radius: 6px 6px 0 0;
>-    height: 18px;
>     margin-bottom: -32px;
>     overflow: auto;
>     padding: 4px;
>@@ -206,14 +205,16 @@ body {
> 
> /*> Search */
> 
>-#advanced-search-ui, #search-results-ui, #macro-ui {
>-    padding: 5px;
>+#advanced-search-ui .modal-lg, #search-results-ui .modal-lg, #macro-ui .modal-lg {
>     width: 90%;
> }
> 
> .modal-body {
>     max-height: none;
>-    padding: 0;
>+}
>+
>+.modal-lg .modal-body {
>+    overflow-y: auto;
> }
> 
> #quicksearch-overlay {
>@@ -282,7 +283,7 @@ body {
>     width: 14em;
> }
> 
>-.icon-loading {
>+.fa.fa-spinner {
>     display: inline-block;
>     height: 16px;
>     width: 16px;
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/css/datatables.css
>index c42e553..71fdb6b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/datatables.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/datatables.css
>@@ -45,8 +45,19 @@ div.dataTables_info,
> div.dataTables_paginate {
>     float: left;
>     padding : .3em .5em .3em .5em;
>+}
> 
>+div.dataTables_filter label,
>+div.dataTables_length label,
>+div.dataTables_info label,
>+div.dataTables_paginate label,
>+div.dataTables_filter input,
>+div.dataTables_length input,
>+div.dataTables_info input,
>+div.dataTables_paginate input {
>+    padding: 0;
> }
>+
> div.dataTables_length {
>     border-right : 1px solid #686868;
>     line-height:1.9em;
>@@ -60,8 +71,11 @@ div.dataTables_filter {
>     border-left : 1px solid #FFF;
>     border-right : 1px solid #AAAAAA;
> }
>+div.dataTables_length label {
>+    display: inline;
>+}
> div.dataTables_filter {
>-    line-height : 1.9em;
>+    line-height : inherit;
> }
> div.dataTables_paginate {
>     padding : 0;
>@@ -219,15 +233,13 @@ div.dataTables_paginate.paging_four_button {
>     box-shadow: 2px 2px 3px 1px rgba(0, 0, 0, 0.2);
>     color: #333;
>     font-size: 14px;
>-    height: 30px;
>     left: 50%;
>     margin-left: -125px;
>     margin-top: -15px;
>-    padding: 14px 0 2px;
>+    padding: 10px 14px 12px;
>     position: fixed;
>     text-align: center;
>     top: 50%;
>-    width: 250px;
> }
> 
> tr.odd.selected td {
>@@ -263,3 +275,7 @@ table.group tr.even td {
>     background-color: #FFF;
>     border-right : 1px solid #BCBCBC;
> }
>+
>+button.dt-button, div.dt-button, a.dt-button {
>+    margin: 3px 3px 0;
>+}
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/humanmsg.css b/koha-tmpl/intranet-tmpl/prog/css/humanmsg.css
>index cb6fa8a..40caac9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/humanmsg.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/humanmsg.css
>@@ -22,6 +22,7 @@ html, body {
> 	display: none;
> 	opacity: 0;
> 	z-index: 100000;
>+        padding: 20px;
> }
> 
> .humanError {
>@@ -47,6 +48,10 @@ html, body {
> 	display: none;
> 	}
> 
>+.humanMsg ul li {
>+        list-style-type: none;
>+        }
>+
> #humanMsgLog {
> 	font: normal 10px Helvetica, Arial, Sans-Serif;
> 	color: white;
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
>index ded0003..5661fa8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/mainpage.css
>@@ -74,6 +74,7 @@ ul.biglinks-list li a.icon_general {
>     /* Class used for each module link */
>     background-image:url('../img/staff-home-icons-sprite.png');
>     display: block;
>+    box-sizing: content-box;
>     float: left;
> 
>     width: 83%;
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>index f423dba..1c183f9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
>@@ -9,11 +9,21 @@ input:focus, textarea:focus {
> ::selection      { background:#538200; color:#ffffff; /* Safari and Opera */ }
> ::-moz-selection  { background:#538200; color:#ffffff; /* Firefox */ }
> 
>-a, a:link, a:visited {
>+a, a:link, a:visited,
>+a.btn:link, a.btn:visited {
>     color : #004d99;
>     text-decoration: none;
> }
> 
>+.btn-group {
>+    white-space: nowrap;
>+}
>+
>+.btn-group .btn {
>+    float: none;
>+    display: inline-block;
>+}
>+
> a:hover, a:active {
>     color : #538200;
>     text-decoration: none;
>@@ -107,8 +117,31 @@ em strong {
> 
> input, textarea {
>     padding : 2px 4px;
>+    line-height: normal;
>+}
>+
>+input[type="checkbox"], input[type="radio"] {
>+    vertical-align: middle;
>+    margin: 0;
> }
> 
>+label, .label {
>+    font-weight: normal;
>+    font-size: inherit;
>+    padding: 0;
>+    color: black;
>+    margin-bottom: 0;
>+    vertical-align: middle;
>+}
>+
>+label input[type="checkbox"],
>+label input[type="radio"],
>+.label input[type="checkbox"],
>+.label input[type="radio"] {
>+    margin-top: 0;
>+}
>+
>+
> .subfield-label {
>     font-style : italic;
> }
>@@ -300,9 +333,10 @@ td.total {
> }
> 
> caption {
>-	font-size : 133.9%;
>-	font-weight : bold;
>-	margin : .3em 0;
>+    font-size : 133.9%;
>+    font-weight : bold;
>+    margin : .3em 0;
>+    color: black;
> }
> 
> .problem {
>@@ -328,12 +362,13 @@ fieldset.lastchecked {
> }
> 
> legend {
>-	font-size : 123.1%;
>-	font-weight : bold;
>+    font-size : 123.1%;
>+    font-weight : bold;
>     border:2px solid #b9d8d9;
>     background-color:#ffffff;
>     border-radius:3px;
>     padding: 0.2em 0.5em;
>+    width: auto;
> }
> 
> #floating-save {
>@@ -356,6 +391,10 @@ legend {
> 	margin-top : 1em;
> }
> 
>+#header>.container-fluid {
>+    padding: 0;
>+}
>+
> div.justify {
>     text-align: justify;
> }
>@@ -421,6 +460,7 @@ div#toolbar,
> .btn-toolbar {
>     background-color : #EDF4F6;
>     padding: 5px 5px 5px 5px;
>+    margin: 0;
>     border-radius: 5px 5px 0 0;
>     border: 1px solid #E6F0F2;
> }
>@@ -542,6 +582,7 @@ div.yui-b fieldset.brief li.radio {
> 	padding : .7em 0;
> }
> div.yui-b fieldset.brief li.radio label,
>+div.yui-b fieldset.brief li.checkbox label,
> div.yui-b fieldset.brief li.dateinsert label,
> div.yui-b fieldset.brief li.dateinsert span.label,
> div.yui-b fieldset.brief li.radio span.label {
>@@ -561,13 +602,23 @@ div.yui-b fieldset.brief fieldset legend {
> 	font-size : 85%;
> }
> 
>+#tools_holidays fieldset.brief li.radio input,
>+#tools_holidays fieldset.brief li.checkbox input{
>+    margin-left: 0;
>+}
>+
>+#tools_holidays fieldset.brief li.radio label,
>+#tools_holidays fieldset.brief li.checkbox label {
>+    margin-left: 20px;
>+}
>+
> fieldset.rows {  
> border-width : 1px;
> border:2px solid #b9d8d9;
> float : left;
> font-size : 90%;
> clear : left;
>-margin: .9em 0 0 0;  
>+margin: .9em 0 0 0;
> padding: 0;
> width: 100%; 
> }
>@@ -603,6 +654,10 @@ fieldset.rows fieldset {
> 	width: 9em;  
> }
> 
>+.yui-b fieldset.rows td label, .yui-b fieldset.rows td span.label {
>+        width: auto;
>+}
>+
> .yui-b fieldset.rows div.hint {
> 	margin-left : 10.5em;
> }
>@@ -651,13 +706,27 @@ fieldset.rows li.radio label {
> fieldset.rows ol.radio label {
> 	width : auto;
> 	float : none;
>-	margin-right : 0;
>+	margin-right : 30px;
>+        margin-left: 20px;
>+        padding-left: 0;
>+        vertical-align: middle;
>+}
>+
>+fieldset.rows li.radio input + label {
>+    margin-left: 0;
>+    padding-left: 0;
>+}
>+
>+fieldset.rows ol.radio input[type="checkbox"],
>+fieldset.rows ol.radio input[type="radio"] {
>+    margin-left: -20px;
> }
> 
> fieldset.rows ol.radio label.radio {
> 	float : left;
>-	width : 12em;
>+	width : 9em;
> 	margin-right : 1em;
>+        margin-top: 0;
> }
> 
> fieldset.rows caption {
>@@ -693,12 +762,16 @@ fieldset.rows label.error {
> 
> fieldset.action, div.action {
>     background-color: transparent;
>-	clear : both;
>-	float : none;
>+    clear : both;
>+    float : none;
>     border : 0px;
>-  margin: 0;
>-     padding: .4em .4em .4em .1em;
>-  width: auto;
>+    margin: 0.9em 0 0 0;
>+    padding: 0.4em;
>+    width: auto;
>+}
>+
>+.btn-toolbar fieldset.action {
>+    margin-top: 0;
> }
> 
> div.rows+div.rows {
>@@ -717,9 +790,14 @@ width: 100%;
> div.rows span.label {  
> 	float: left;  
> 	font-weight : bold;
>-	width: 9em;  
>+	width: 9em;
> 	margin-right: 1em;  
> 	text-align: left;
>+        padding-top: 0;
>+}
>+
>+.rows .label {
>+    white-space: normal;
> }
> 
> div.rows ol {  
>@@ -760,7 +838,7 @@ fieldset.rows label.inline {
> fieldset.rows .inputnote {
> 	clear : left;
> 	float : left;
>-	margin : .5em 0 0 11em;
>+	margin : 1em 0 0 11em;
> }
> 
> .checkedout {
>@@ -1670,7 +1748,6 @@ span.permissiondesc {
> #marcPreview th { background-color : #FFF; border: 0; white-space: nowrap; text-align:left; vertical-align: top; padding: 2px; }
> #marcPreview td { border: 0; padding : 2px; vertical-align: top; }
> #marcPreview tbody tr:nth-child(2n+1) td { background-color: #FFF; }
>-#marcPreview { width : 80%; margin-left : -40%; }
> @media (max-width: 767px) { #marcPreview { margin: 0; width : auto; } }
> 
> #cartDetails {
>@@ -2322,13 +2399,7 @@ button,
>     border : 0;
> }
> 
>-.btn-small .caret {
>-    margin-top : .6em;
>-}
>-
>-#toolbar .btn,
> #toolbar .dropdown-menu,
>-.btn-toolbar .btn,
> .btn-toolbar .dropdown-menu {
>     font-size: 13px;
> }
>@@ -2336,6 +2407,11 @@ a.btn:link,
> a.btn:visited{
>     color: #333333;
> }
>+
>+a.btn-link:hover {
>+    color : #538200;
>+}
>+
> .dropdown-menu li {
>     list-style: none outside none;
> }
>@@ -2349,6 +2425,31 @@ a.disabled {
> 
> .navbar {
>     color: #333;
>+    min-height: 20px;
>+}
>+
>+#header.navbar {
>+    margin-bottom: 0;
>+}
>+
>+#header.navbar-default {
>+    background: #e6f0f2;
>+    box-shadow: none;
>+    border: none;
>+}
>+
>+#changelanguage .navbar-text {
>+    margin: 0;
>+}
>+
>+#changelanguage .navbar-text span {
>+   display: block;
>+   line-height: 20px;
>+}
>+
>+#changelanguage .dropdown-menu > li > a,
>+#changelanguage .dropdown-menu > li > span {
>+    padding: 5px 15px;
> }
> 
> .navbar .nav > li > a, .loggedout {
>@@ -2367,12 +2468,6 @@ a.disabled {
>     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;
>@@ -2411,19 +2506,17 @@ a.disabled {
>     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;
>+.navbar .nav li.dropdown.open > .dropdown-toggle:focus,
>+.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
>+.navbar .nav li.dropdown.open.active > .dropdown-toggle:focus {
>+    background: #e6f0f2 none;
>+    box-shadow: none;
> }
> 
> .tooltip.bottom .tooltip-arrow {
>@@ -2465,8 +2558,8 @@ a.close:hover {
> /* Redefine a new style for Bootstrap's class "close" since we use that already */
> /* Use <a class="closebtn" href="#">&times;</a> */
> .alert .closebtn{position:relative;top:-2px;right:-21px;line-height:20px;}
>-.modal-header .closebtn{margin-top:2px;}
>-.closebtn{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.closebtn:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);}
>+.modal-header .closebtn{margin-top:-2px;}
>+.closebtn{float: right;font-size: 21px;font-weight: bold;line-height: 1;color: #000;text-shadow: 0 1px 0 #fff;filter: alpha(opacity=20);opacity: .2;}.closebtn:hover,.closebtn:focus{color:#000;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);}
> button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}
> 
> .btn-group label,
>@@ -2681,7 +2774,9 @@ span.browse-button {
> }
> 
> #i18nMenu a:hover,
>-#i18nMenu a:active {
>+#i18nMenu a:active,
>+#i18nMenu .dropdown-menu a:hover,
>+#i18nMenu .dropdown-menu a:focus {
>     color : #538200;
>     font-weight: normal;
> }
>@@ -2693,7 +2788,6 @@ span.browse-button {
> 
> #i18nMenu .dropdown-menu a:hover,
> #i18nMenu .dropdown-menu a:focus {
>-    color : #FFF;
> }
> 
> #circ_circulation_issue .onsite_checkout-select label,
>@@ -2798,3 +2892,11 @@ div[class$="_table_controls"] {
> .modal-textarea {
>     width: 98%;
> }
>+
>+fieldset.rows + fieldset.action {
>+    padding-top: 20px;
>+}
>+
>+.yui-u .rows li p label.widelabel {
>+    width: auto;
>+}
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 16239: 56159 | 56160 | 56161 | 56162 | 56163 | 56201 | 56329 | 56330 | 56331 | 56332 | 56333 | 56334 | 56335 | 56529 | 56530 | 56531 | 56532 | 56533 | 56534 | 56535 | 56536 | 56537 | 56538 | 56539 | 56563 | 56729 | 56730 | 56731 | 56732 | 57016 | 57017 | 57018 | 57019 | 57020 | 57021 | 57022 | 57374 | 57375 | 57376 | 57377 | 57378 | 57379 | 57381 | 57416 | 57417 | 57418 | 57419 | 57420 | 57772 | 57773 | 57774 | 57775 | 57776 | 58067 | 58068 | 58069 | 58070 | 58071 | 58317 | 58318 | 58319 | 58320 | 58321 | 58322 | 58323 | 58678 | 58679 | 58680 | 58681 | 58682 | 58683 | 58691 | 58697 | 58722 | 58729 | 58731 | 58732 | 58733 | 58734 | 58735 | 58736 | 58737 | 58738