Bugzilla – Attachment 56163 Details for
Bug 16239
Upgrade Bootstrap in the staff client
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16239: Update css files
Bug-16239-Update-css-files.patch (text/plain), 8.50 KB, created by
Josef Moravec
on 2016-10-11 09:57:01 UTC
(
hide
)
Description:
Bug 16239: Update css files
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2016-10-11 09:57:01 UTC
Size:
8.50 KB
patch
obsolete
>From 281888e2545938ec2454c40362d31af1ebeecbd6 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Tue, 11 Oct 2016 09:37:27 +0200 >Subject: [PATCH] Bug 16239: Update css files > >Test plan: >1) Apply the patch >2) Try to go through interface to find problems, inconsistencies, etc. >3) Read the diff > >Migration guide for bootstrap: > >http://getbootstrap.com/migration/ >--- > koha-tmpl/intranet-tmpl/prog/css/cateditor.css | 1 - > koha-tmpl/intranet-tmpl/prog/css/datatables.css | 6 +- > 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 | 109 ++++++++++++++++------ > 5 files changed, 89 insertions(+), 33 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css >index bb92094b..a854854 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; >diff --git a/koha-tmpl/intranet-tmpl/prog/css/datatables.css b/koha-tmpl/intranet-tmpl/prog/css/datatables.css >index c42e553..d7facb6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/datatables.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/datatables.css >@@ -45,7 +45,6 @@ div.dataTables_info, > div.dataTables_paginate { > float: left; > padding : .3em .5em .3em .5em; >- > } > div.dataTables_length { > border-right : 1px solid #686868; >@@ -60,8 +59,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; >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 52ee8d4..cc8c26b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css >@@ -9,7 +9,8 @@ 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; > } >@@ -109,6 +110,30 @@ input, textarea { > padding : 2px 4px; > } > >+input[type="checkbox"], input[type="radio"] { >+ margin-right: 4px; >+ position:relative; >+ top: 4px; >+} >+ >+.checkbox label input[type="checkbox"], >+.checkbox-inline label input[type="checkbox"], >+.radio label input[type="radio"], >+.radio-inline label input[type="radio"], >+label input[type="checkbox"], >+label input[type="radio"] { >+ margin-top: -4px; >+ position: relative; >+} >+ >+label, .label { >+ font-weight: normal; >+ font-size: inherit; >+ padding: 0; >+ color: black; >+ margin-bottom: 0; >+} >+ > .subfield-label { > font-style : italic; > } >@@ -328,12 +353,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 +382,10 @@ legend { > margin-top : 1em; > } > >+#header>.container-fluid { >+ padding: 0; >+} >+ > div.justify { > text-align: justify; > } >@@ -421,6 +451,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; > } >@@ -567,7 +598,7 @@ 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%; > } >@@ -658,6 +689,7 @@ fieldset.rows ol.radio label.radio { > float : left; > width : 12em; > margin-right : 1em; >+ margin-top: 0; > } > > fieldset.rows caption { >@@ -693,12 +725,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; >+ width: auto; >+} >+ >+.btn-toolbar fieldset.action { >+ margin-top: 0; > } > > div.rows+div.rows { >@@ -2314,13 +2350,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; > } >@@ -2328,6 +2358,11 @@ a.btn:link, > a.btn:visited{ > color: #333333; > } >+ >+a.btn-link:hover { >+ color : #538200; >+} >+ > .dropdown-menu li { > list-style: none outside none; > } >@@ -2341,6 +2376,28 @@ 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; >+ padding: 0 0.6em; >+} >+ >+#changelanguage .navbar-text span { >+ padding: 0.4em 0.3em; >+ display: block; >+ line-height: 20px; > } > > .navbar .nav > li > a, .loggedout { >@@ -2359,12 +2416,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; >@@ -2403,19 +2454,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 { >@@ -2457,8 +2506,8 @@ a.close:hover { > /* Redefine a new style for Bootstrap's class "close" since we use that already */ > /* Use <a class="closebtn" href="#">×</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, >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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