Bugzilla – Attachment 91336 Details for
Bug 23259
Remove reset-fonts-grids.css
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23259: Remove reset-fonts-grids.css
Bug-23259-Remove-reset-fonts-gridscss.patch (text/plain), 13.59 KB, created by
Nadine Pierre
on 2019-07-05 17:33:43 UTC
(
hide
)
Description:
Bug 23259: Remove reset-fonts-grids.css
Filename:
MIME Type:
Creator:
Nadine Pierre
Created:
2019-07-05 17:33:43 UTC
Size:
13.59 KB
patch
obsolete
>From ec0583563675070d08608a4ba21b5f7f0fb5a69d Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 3 Jul 2019 18:30:38 +0000 >Subject: [PATCH] Bug 23259: Remove reset-fonts-grids.css > >This patch removes the CSS file reset-fonts-grids.css which was required >when the staff client templates used YUI grids. Now that all staff >client templates have been converted to Bootstrap grid markup the file >can be deleted. > >Because the YUI CSS also did set some baseline properties for different >tags the global SCSS file is modified in this patch in order to keep >things looking consistent. Most of these updates change font-size >declarations to preserve the previous appearance. > >Some styling has been added to (non Bootstrap-classed) <input> and ><button> tags in order to keep button style consistent. > >Removed from staff-global.scss: YUI-specific CSS which has been made >obsolete by the template conversions. > >To test, apply the patch and rebuild the staff client CSS >(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). >Clear your browser cache if necessary. > >Browse through various pages of thes staff client to confirm that the >changes work well. > >Signed-off-by: Nadine Pierre <nadine.pierre@inLibro.com> >--- > .../lib/yui/reset-fonts-grids.css | 9 - > .../prog/css/src/staff-global.scss | 230 +++--------------- > 2 files changed, 29 insertions(+), 210 deletions(-) > delete mode 100644 koha-tmpl/intranet-tmpl/lib/yui/reset-fonts-grids.css > >diff --git a/koha-tmpl/intranet-tmpl/lib/yui/reset-fonts-grids.css b/koha-tmpl/intranet-tmpl/lib/yui/reset-fonts-grids.css >deleted file mode 100644 >index a21e2c4458..0000000000 >--- a/koha-tmpl/intranet-tmpl/lib/yui/reset-fonts-grids.css >+++ /dev/null >@@ -1,9 +0,0 @@ >-/* >-Copyright (c) 2007, Yahoo! Inc. All rights reserved. >-Code licensed under the BSD License: >-http://developer.yahoo.net/yui/license.txt >-version: 2.3.0 >-*/ >-/*reset.css*/body{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup,sub{line-height:-1px;vertical-align:text-top;}sub{vertical-align:text-bottom;}input, textarea, select{font-family:inherit;font-size:inherit;font-weight:inherit;} >-/*fonts.css*/body {font:13px/1.22 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:99%;} >-/*grids.css*/body{text-align:center;}#ft{clear:both;}#doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.301em;min-width:750px;}#doc2{width:73.074em;*width:71.313em;}#doc3{margin:auto 10px;width:auto;}#doc4{width:74.923em;*width:73.117em;}.yui-b{position:relative;}.yui-b{_position:static;}#yui-main .yui-b{position:static;}#yui-main{width:100%;}.yui-t1 #yui-main,.yui-t2 #yui-main,.yui-t3 #yui-main{float:right;margin-left:-25em;}.yui-t4 #yui-main,.yui-t5 #yui-main,.yui-t6 #yui-main{float:left;margin-right:-25em;}.yui-t1 .yui-b{float:left;width:12.3207em;*width:12.0106em;}.yui-t1 #yui-main .yui-b{margin-left:13.3207em;*margin-left:13.0106em;}.yui-t2 .yui-b{float:left;width:13.8456em;*width:13.512em;}.yui-t2 #yui-main .yui-b{margin-left:14.8456em;*margin-left:14.512em;}.yui-t3 .yui-b{float:left;width:23.0759em;*width:22.52em;}.yui-t3 #yui-main .yui-b{margin-left:24.0759em;*margin-left:23.52em;}.yui-t4 .yui-b{float:right;width:13.8456em;*width:13.512em;}.yui-t4 #yui-main .yui-b{margin-right:14.8456em;*margin-right:14.512em;}.yui-t5 .yui-b{float:right;width:18.4608em;*width:18.016em;}.yui-t5 #yui-main .yui-b{margin-right:19.4608em;*margin-right:19.016em;}.yui-t6 .yui-b{float:right;width:23.0759em;*width:22.52em;}.yui-t6 #yui-main .yui-b{margin-right:24.0759em;*margin-right:23.52em;}.yui-t7 #yui-main .yui-b{display:block;margin:0 0 1em 0;}#yui-main .yui-b{float:none;width:auto;}.yui-gb .yui-g,.yui-gb .yui-gb,.yui-gb .yui-u,.yui-g .yui-gb .yui-u,.yui-gb .yui-gc,.yui-gb .yui-gd,.yui-gb .yui-ge,.yui-gb .yui-gf,.yui-gc .yui-u,.yui-gc .yui-g,.yui-gd .yui-u{float:left;margin-left:2%;width:32%;}.yui-gb .yui-gb .yui-u,.yui-gb .yui-gc .yui-u{_margin-left:1.2%;*margin-left:1.7%;}.yui-g .yui-gb .yui-u{_margin-left:.8%;}.yui-gb .yui-u{margin-left:2%;width:32%;float:right;*width:31.8%;}.yui-gb div.first{margin-left:0;*margin-right:1px;float:left;}.yui-gb .yui-gb div.first{*margin-right:0;width:31.7%;}.yui-gb .yui-gc div.first,.yui-gb .yui-gd div.first{*margin-right:0;}.yui-g .yui-gc div.first,.yui-g .yui-ge div.first{float:left;}.yui-gb .yui-gd .yui-u{*width:66%;_width:61.2%;}.yui-gb .yui-gd div.first{*width:31%;_width:29.5%;}.yui-gb .yui-gc .yui-u,.yui-g .yui-gc .yui-u{_float:right;width:32%;_width:29.9%;}.yui-gb .yui-gc div.first{width:66%;*width:64.5%;*float:left;*margin-left:0;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf .yui-u{margin:0;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf,.yui-gc .yui-u,.yui-gd .yui-g,.yui-g .yui-gc .yui-u,.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf .yui-g,.yui-gf .yui-u{float:right;display:inline;}.yui-g div.first,.yui-g div.first,.yui-gc div.first,.yui-gc div.first div.first,.yui-gd div.first,.yui-ge div.first,.yui-gf div.first{float:left;}.yui-g .yui-g .yui-u,.yui-gb .yui-g .yui-u,.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u,.yui-ge .yui-g .yui-u,.yui-gf .yui-g .yui-u{width:48.1%;*margin-left:0;}.yui-g .yui-g div.first{*margin:0;}.yui-gb .yui-g div.first{*margin-right:1px;}.yui-gb .yui-gb .yui-u{_margin-left:.7%;}.yui-gb .yui-g div.first,.yui-gb .yui-gb div.first{*margin-left:0;}.yui-gc .yui-g .yui-u,.yui-gd .yui-g .yui-u{_width:48.1%;*width:48.1%;*margin-left:0;}.yui-g .yui-u,.yui-g .yui-g,.yui-g .yui-gb,.yui-g .yui-gc,.yui-g .yui-gd,.yui-g .yui-ge,.yui-g .yui-gf{width:49.1%;}.yui-g .yui-gb div.first,.yui-gb div.first,.yui-gc div.first,.yui-gd div.first{margin-left:0;}.yui-g .yui-gc div.first,.yui-gc div.first,.yui-gd .yui-g,.yui-gd .yui-u{width:66%;}.yui-gd div.first,.yui-gb .yui-gd div.first{width:32%;}.yui-g .yui-gd div.first{_width:29.9%;}.yui-ge .yui-u,.yui-ge .yui-g,.yui-gf div.first{width:24%;}.yui-ge div.first,.yui-gf .yui-g,.yui-gf .yui-u{width:74.2%;}.yui-gb .yui-ge .yui-u,.yui-gb .yui-gf div.first{*width:24%;_width:20%;}.yui-gb .yui-ge div.first,.yui-gb .yui-gf .yui-u{*width:73.5%;_width:65.5%;}#bd:after,.yui-g:after,.yui-gb:after,.yui-gc:after,.yui-gd:after,.yui-ge:after,.yui-gf:after{content:".";display:block;height:0;clear:both;visibility:hidden;}#bd,.yui-g,.yui-gb,.yui-gc,.yui-gd,.yui-ge,.yui-gf{zoom:1;} >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 1eeb84451c..cef9e874c1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -1,16 +1,25 @@ >-@import url("../../lib/yui/reset-fonts-grids.css") screen; >- > $font-main: Arial, Verdana, Helvetica, sans-serif; > $font-monospace: "Courier New", Courier, monospace; > $language-footer-min-height: 20px; > > @mixin default-button { >- background: linear-gradient(to bottom, #FFFFFF 0%, #F7F7F7 35%, #E0E0E0 100%); >- border: 1px outset #999999; >- border-left-color: #666; >- border-top-color: #666; >+ background-image: linear-gradient(to bottom, #FFF 0, #E0E0E0 100%); >+ border-color: #ADADAD #ADADAD #949494; >+ border-radius: 4px; >+ border-width: 1px; > color: #333333; >- padding: .25em; >+ display: inline-block; >+ font-size: inherit; >+ line-height: 1.42857143; >+ padding: .3em .8em; >+ text-align: center; >+ text-shadow: 0 1px 0 #fff; >+ vertical-align: middle; >+ white-space: nowrap; >+ >+ &:hover { >+ background: #E0E0E0 none; >+ } > } > > @mixin disabled-button { >@@ -163,7 +172,8 @@ aside { > padding: .5em 0; > > legend { >- font-size: 85%; >+ font-size: 95%; >+ margin: 0; > } > } > >@@ -206,7 +216,6 @@ aside { > } > > ol { >- font-size: 85%; > margin: 0; > padding: 0; > } >@@ -244,17 +253,6 @@ main { > content: " "; > display: table; > } >- >- .yui-b { >- fieldset { >- &.brief { >- [type="text"], >- select { >- width: auto; >- } >- } >- } >- } > } > > table { >@@ -355,6 +353,8 @@ th { > > body { > font-family: $font-main; >+ font-size: 13px; >+ line-height: 1.22; > padding: 0 0 4em; > text-align: left; > } >@@ -452,13 +452,9 @@ cite { > > input, > textarea { >- line-height: normal; >- padding: 2px 4px; >- > &:focus { > border-color: #538200; > border-radius: 4px; >- border-style: solid; > } > } > >@@ -582,13 +578,6 @@ label, > } > } > >-#doc, >-#doc1, >-#doc2, >-#doc3 { >- padding-top: 1em; >-} >- > .main { > margin-bottom: $language-footer-min-height * 1.5; > margin-top: 1em; >@@ -1185,46 +1174,6 @@ fieldset { > } > } > >-.yui-u { >- div { >- &.hint { >- margin-bottom: .4em; >- } >- } >- >- fieldset { >- &.rows { >- div { >- &.hint { >- margin-left: 7.5em; >- } >- } >- >- label { >- width: 10em; >- } >- >- span { >- &.label { >- width: 10em; >- } >- } >- } >- } >- >- .rows { >- li { >- p { >- label { >- &.widelabel { >- width: auto; >- } >- } >- } >- } >- } >-} >- > legend { > background-color: #FFFFFF; > border: 2px solid #B9D8D9; >@@ -1274,7 +1223,6 @@ details[open] { > #breadcrumbs { > background-color: #E6F0F2; > clear: both; >- font-size: 90%; > margin: 0; > padding: .2em .5em .4em 10px; > } >@@ -1395,7 +1343,8 @@ div { > } > > input { >- font-size: 80%; >+ font-size: 90%; >+ padding: .2em .6em; > } > } > >@@ -1513,10 +1462,9 @@ div { > margin: .3em 0 .5em; > > input { >- font-size: 1.3em; >- >- &.submit { >- font-size: 1em; >+ &[type="submit"] { >+ border-radius: 3px; >+ padding: .2em .8em; > } > } > >@@ -1578,11 +1526,11 @@ div { > display: block; > } > } >-} >- > >-.head-searchbox { >- width: 30em; >+ .head-searchbox { >+ font-size: 1.3em; >+ width: 30em; >+ } > } > > #reserves, >@@ -1593,7 +1541,6 @@ div { > > .tip { > color: #808080; >- font-size: 93%; > } > > .single-line { >@@ -1755,125 +1702,6 @@ dd { > font-size: 95%; > } > >-.yui-b { >- fieldset { >- &.brief { >- padding: .4em .7em; >- >- fieldset { >- margin: 0 .3em; >- padding: .5em; >- >- legend { >- font-size: 85%; >- } >- } >- >- li { >- >- &.checkbox { >- >- input { >- #tools_holidays & { >- margin-left: 0; >- } >- } >- >- label { >- display: inline; >- >- #tools_holidays & { >- margin-left: 20px; >- } >- } >- } >- >- &.dateinsert { >- label { >- display: inline; >- } >- >- span { >- &.label { >- display: inline; >- } >- } >- } >- >- &.radio { >- padding: .7em 0; >- >- input { >- padding: .3em 0; >- >- #tools_holidays & { >- margin-left: 0; >- } >- } >- >- label { >- display: inline; >- >- #tools_holidays & { >- margin-left: 20px; >- } >- >- span { >- &.label { >- display: inline; >- } >- } >- } >- } >- } >- >- ol { >- font-size: 85%; >- margin: 0; >- padding: 0; >- } >- >- select, >- [type=text] { >- width: 100%; >- } >- } >- >- &.rows { >- div { >- &.hint { >- margin-left: 10.5em; >- } >- } >- >- td { >- label { >- width: auto; >- } >- >- span { >- &.label { >- width: auto; >- } >- } >- } >- } >- } >-} >- >-#yui-main { >- .yui-b { >- fieldset { >- &.brief { >- select, >- [type=text] { >- width: auto; >- } >- } >- } >- } >-} >- > .dropdown-menu { > li { > list-style-type: none; >-- >2.17.1
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 23259
:
91334
|
91336
|
91388