From: Sven Schöling Date: Tue, 18 Nov 2014 14:11:13 +0000 (+0100) Subject: Stylesheets: Aufräumaktion X-Git-Tag: release-3.2.0beta~243 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7ee5fab89c8ef14f442e686a23635e4a6fd3f2ee;p=kivitendo-erp.git Stylesheets: Aufräumaktion - gemeinsame stylesheets aus den kivitendo/lx-office-erp Verzeichnissen genommen - README aktualisiert - rp/bwa nicht mehr hartcodiert in kivitendo laden --- diff --git a/SL/Form.pm b/SL/Form.pm index 171b5fff4..e35464a57 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -467,7 +467,7 @@ sub header { # standard css for all # this should gradually move to the layouts that need it $layout->use_stylesheet("$_.css") for qw( - main menu list_accounts jquery.autocomplete + main menu common list_accounts jquery.autocomplete jquery.multiselect2side ui-lightness/jquery-ui jquery-ui.custom diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index c2ca6939d..02023f532 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -1849,6 +1849,7 @@ sub generate_bwa { $form->{title} = $locale->text('BWA'); + $::request->layout->add_stylesheets('bwa.css'); $form->header; print $form->parse_html_template('rp/bwa'); diff --git a/css/README.stylesheets b/css/README.stylesheets index 388672ac0..5478cea71 100644 --- a/css/README.stylesheets +++ b/css/README.stylesheets @@ -1,16 +1,33 @@ -2012-03-02 - Stylesheet normalization +Some notes about stylesheets: -After this, the stylesheets follow these conventions: +* NOT every directory in css/ is considered a style to be chosen. The available + stylesheets are hardcoded in at least 3 places: + - SL/Auth.pm:read_user + - SL/Controller/Admin.pm:init_stylesheets + - bin/mozilla/am.pl:config + yes it sucks. change it, if you like. -* Every directory in css/ is considered a style to be chosen. -* lx-office-erp is used as the fallback style if no style was found or the - style chosen was invalid. -* Missing stylesheets for the other styles have been - linked from lx-office-erp, so that they will used like before. -* If you edit a file, make sure it's not a symlink. -* The previous named stylesheets are now main.css in their respective directories. -* menuv3 and menuv4 are now distict so that it's possible to include both - without overriding each other. -* All relative image links needed to get bumped an additional ../ -* If you add another style, be sure to test tabs, calendars, all menus, - autocompletion, charts, and multiselect. +* If a stylesheet is requests from controller code, it is searched in this order: + - css// + - css/ + - + + so common libraries can be put higher here, to be included by any stylesheet + +* 'kivitendo' is used as the fallback style if no style was found or the style + chosen was invalid. + +* Pay attention to the position of relative image urls. Most should not be + included in css anyway but should use the generated icon maps. For the rest, + a couple of ../ may be needed to get the right path. + +* If you edit another styles, these are things that are known to get broken. + Be sure to test them thoroughly: + - tabs + - calendars + - all menus + - autocompletion (parts/customers) + - charts of accounts + - multiselect + - ckeeditor + - jquery-ui widgets (i hate those things) diff --git a/css/background_jobs.css b/css/background_jobs.css new file mode 100644 index 000000000..e390bb5a4 --- /dev/null +++ b/css/background_jobs.css @@ -0,0 +1,14 @@ +/* Jobverwaltung */ +.background_job_list tbody pre, +.background_job_details tbody pre { + margin: 0px; +} + +.background_job_details tbody th { + text-align: right; + vertical-align: top; +} + +.background_job_details tbody td { + vertical-align: top; +} diff --git a/css/bwa.css b/css/bwa.css new file mode 100644 index 000000000..4357a97df --- /dev/null +++ b/css/bwa.css @@ -0,0 +1,64 @@ +/* Allgemeine Schriftdefinition */ +th,td { + font-family: Arial, Verdana, Helvetica, Sans-serif; + font-size:small; +} + +@page { + size: landscape; + margin: 0.5cm; +} + +/* Definition Tabellenueberschrift */ + +.left { text-align:left; } +.center { text-align:center; } +.right { text-align:right; } + +tr.headline { border:0; } +tr.headline td { border:0; } +h3 { font-size:120%; } +h3 { font-size:100%; } + +/* Tabellenkopf */ +th { + font-weight: bold; + border-bottom: solid thin black; + padding:0 10px; + text-align:right; +} + +th.left { border-left: solid thin black; } +th.right { border-right: solid thin black; } + +.querkopf th.right { text-align:center; } +.querkopf th { + border-top: solid thin black; + border-bottom:0; +} + +/* Tabelleninhalt */ +td { + text-align:right; + padding:0 0.5em; +} +td.left { border-left: solid thin black; } +td.right { border-right: solid thin black; } + + +/* jede zweite Zeile grau hinterlegen */ +tr.grey { + background:#f0f0f0; +} + +/* letzte Zeile in der Tabelle */ +#last td{ border-bottom: solid thin black; } + +/* Zwischensumme/-ueberschriften */ +tr.subtotal td { font-weight: bold; } + +/* Fusszeile unter der Tabelle */ +td.footer { + text-align:right; + font-size:smaller; +} diff --git a/css/common.css b/css/common.css new file mode 100644 index 000000000..ffb5e1829 --- /dev/null +++ b/css/common.css @@ -0,0 +1,52 @@ + +/* class for numeric columns in tables */ +.numeric { text-align: right } + +/* various oneshot decoration for legacy purpose. dont use */ +.small-text { font-size: 70% } +.bold { font-weight: bold } + +.float-left { float: left } +.float-right { float: right } + +/* quirk to force certain constructs to block context */ +.block-context { overflow: hidden } + +/* position */ +.position-relative { position: relative } +.position-absolute { position: absolute } + + +/* media stuff */ +@media screen { .noscreen { display: none } } +@media print { .noprint { display: none } } +@media handheld { .nomobile { display: none } } + +body { behavior:url("csshover.htc") } + +/* class to fix container around floats */ +.clearfix:after { + clear:both; + content:"."; + display:block; + font-size:0; + height:0; + visibility:hidden; +} + +/* CTI */ +a.cti_call_action { + display: inline-block; + padding-left: 18px; + height: 16px; + position: relative; + top: 2px; + vertical-align: center; + background-image: url(../../image/icons/16x16/phone.png); + background-repeat: no-repeat; +} + +/* the cvars table in the 2. row */ +.row2-cvars-table tr { vertical-align: top } +.row2-cvars-table th { text-align: right; padding-left: 15px; padding-right: 0 } +.row2-cvars-table td, .row2-cvars-table th { padding-top: 10px } diff --git a/css/csshover.htc b/css/csshover.htc new file mode 100644 index 000000000..e2dcced3e --- /dev/null +++ b/css/csshover.htc @@ -0,0 +1,121 @@ + + \ No newline at end of file diff --git a/css/jquery.autocomplete.css b/css/jquery.autocomplete.css new file mode 100644 index 000000000..91b622833 --- /dev/null +++ b/css/jquery.autocomplete.css @@ -0,0 +1,48 @@ +.ac_results { + padding: 0px; + border: 1px solid black; + background-color: white; + overflow: hidden; + z-index: 99999; +} + +.ac_results ul { + width: 100%; + list-style-position: outside; + list-style: none; + padding: 0; + margin: 0; +} + +.ac_results li { + margin: 0px; + padding: 2px 5px; + cursor: default; + display: block; + /* + if width will be 100% horizontal scrollbar will apear + when scroll mode will be used + */ + /*width: 100%;*/ + font: menu; + font-size: 12px; + /* + it is very important, if line-height not setted or setted + in relative units scroll will be broken in firefox + */ + line-height: 16px; + overflow: hidden; +} + +.ac_loading { + background: white url('indicator.gif') right center no-repeat; +} + +.ac_odd { + background-color: #eee; +} + +.ac_over { + background-color: #0A246A; + color: white; +} diff --git a/css/jquery.contextMenu.css b/css/jquery.contextMenu.css old mode 100755 new mode 100644 diff --git a/css/jquery.multiselect2side.css b/css/jquery.multiselect2side.css new file mode 100644 index 000000000..53352fc3a --- /dev/null +++ b/css/jquery.multiselect2side.css @@ -0,0 +1,57 @@ +/* multiselect2side plugin */ +.ms2side__div { + clear: left; + width: 100%; + padding: 1px; + float: left; + background : url('') repeat-x; /* HACK FOR CHROME */ +} + +.ms2side__select { + float: left; +} + +.ms2side__header { + color: blue; + background-color: #EEEEFF; +} + +.ms2side__options, .ms2side__updown { + float: left; + font-size: 10pt; + margin: 0; + padding: 0 8px; + width: 40px; + color: black; + text-align: center; + overflow: hidden; +} + +.ms2side__updown { + font-size: 9pt; +} + +.ms2side__options p, .ms2side__updown p { + margin: 2px 0; + padding: 0; + cursor: pointer; + border: 1px solid black; +} + +.ms2side__options p.ms2side_hover, .ms2side__updown p.ms2side_hover { + background-color: #F0F0FF; + border-color: #0000FF; + cursor: pointer; +} + +.ms2side__options p.ms2side__hide, .ms2side__updown p.ms2side__hide { + cursor: default; + color: grey; + border: 1px solid grey; + background-color: #F0F0F0; +} + +.ms2side__div select { + width: 400px; + float: left; +} diff --git a/css/kivitendo/background_jobs.css b/css/kivitendo/background_jobs.css deleted file mode 120000 index 8031c949e..000000000 --- a/css/kivitendo/background_jobs.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/background_jobs.css \ No newline at end of file diff --git a/css/kivitendo/bwa.css b/css/kivitendo/bwa.css deleted file mode 100644 index 4357a97df..000000000 --- a/css/kivitendo/bwa.css +++ /dev/null @@ -1,64 +0,0 @@ -/* Allgemeine Schriftdefinition */ -th,td { - font-family: Arial, Verdana, Helvetica, Sans-serif; - font-size:small; -} - -@page { - size: landscape; - margin: 0.5cm; -} - -/* Definition Tabellenueberschrift */ - -.left { text-align:left; } -.center { text-align:center; } -.right { text-align:right; } - -tr.headline { border:0; } -tr.headline td { border:0; } -h3 { font-size:120%; } -h3 { font-size:100%; } - -/* Tabellenkopf */ -th { - font-weight: bold; - border-bottom: solid thin black; - padding:0 10px; - text-align:right; -} - -th.left { border-left: solid thin black; } -th.right { border-right: solid thin black; } - -.querkopf th.right { text-align:center; } -.querkopf th { - border-top: solid thin black; - border-bottom:0; -} - -/* Tabelleninhalt */ -td { - text-align:right; - padding:0 0.5em; -} -td.left { border-left: solid thin black; } -td.right { border-right: solid thin black; } - - -/* jede zweite Zeile grau hinterlegen */ -tr.grey { - background:#f0f0f0; -} - -/* letzte Zeile in der Tabelle */ -#last td{ border-bottom: solid thin black; } - -/* Zwischensumme/-ueberschriften */ -tr.subtotal td { font-weight: bold; } - -/* Fusszeile unter der Tabelle */ -td.footer { - text-align:right; - font-size:smaller; -} diff --git a/css/kivitendo/csshover.htc b/css/kivitendo/csshover.htc deleted file mode 100644 index e2dcced3e..000000000 --- a/css/kivitendo/csshover.htc +++ /dev/null @@ -1,121 +0,0 @@ - - \ No newline at end of file diff --git a/css/kivitendo/jquery.autocomplete.css b/css/kivitendo/jquery.autocomplete.css deleted file mode 120000 index dc1123169..000000000 --- a/css/kivitendo/jquery.autocomplete.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.autocomplete.css \ No newline at end of file diff --git a/css/kivitendo/jquery.multiselect2side.css b/css/kivitendo/jquery.multiselect2side.css deleted file mode 120000 index 270f1a248..000000000 --- a/css/kivitendo/jquery.multiselect2side.css +++ /dev/null @@ -1 +0,0 @@ -../lx-office-erp/jquery.multiselect2side.css \ No newline at end of file diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css index c11c5fe5a..c66187ea6 100644 --- a/css/kivitendo/main.css +++ b/css/kivitendo/main.css @@ -309,19 +309,6 @@ fieldset { color: black; font-weight: bolder; } -/* media stuff */ -@media screen { -.noscreen { -/* items with this class won't display */ - display: none; -} -} -@media print { -.noprint { -/* items with this class won't print */ - display: none; -} -} .filecontent { border: 1px solid blue; padding-left: 2px; @@ -334,13 +321,6 @@ label { .unbalanced_ledger { background-color: #ffa0a0; } -.clearfix:after { - clear: both; - content: "."; - display: block; - height: 0; - visibility: hidden; -} .flash_message_error { background-color: #FFD6D6; border: 1px solid #AE0014; @@ -377,33 +357,6 @@ label { margin-right: 6px; } -.small-text { - font-size: 0.75em; -} - -.float-left { - float: left; -} -.float-right { - float: right; -} - -.block-context { - overflow: hidden; -} - -.position-relative { - position: relative; -} - -.position-absolute { - position: absolute; -} - -.part_picker { - padding-right: 16px; -} - .customer-vendor-picker-undefined, .partpicker-undefined { color: red; @@ -449,20 +402,3 @@ div.ppp_line span.ppp_block_sellprice { span.toggle_selected { font-weight: bold; } - -/* CTI */ -a.cti_call_action { - display: inline-block; - padding-left: 18px; - height: 16px; - position: relative; - top: 2px; - vertical-align: center; - background-image: url(../../image/icons/16x16/phone.png); - background-repeat: no-repeat; -} - -/* the cvars table in the 2. row */ -.row2-cvars-table tr {vertical-align: top;} -.row2-cvars-table th {text-align: right; padding-left: 15px; padding-right: 0;} -.row2-cvars-table td, .row2-cvars-table th {padding-top: 10px;} diff --git a/css/lx-office-erp/background_jobs.css b/css/lx-office-erp/background_jobs.css deleted file mode 100644 index e390bb5a4..000000000 --- a/css/lx-office-erp/background_jobs.css +++ /dev/null @@ -1,14 +0,0 @@ -/* Jobverwaltung */ -.background_job_list tbody pre, -.background_job_details tbody pre { - margin: 0px; -} - -.background_job_details tbody th { - text-align: right; - vertical-align: top; -} - -.background_job_details tbody td { - vertical-align: top; -} diff --git a/css/lx-office-erp/csshover.htc b/css/lx-office-erp/csshover.htc deleted file mode 100644 index e2dcced3e..000000000 --- a/css/lx-office-erp/csshover.htc +++ /dev/null @@ -1,121 +0,0 @@ - - \ No newline at end of file diff --git a/css/lx-office-erp/jquery.autocomplete.css b/css/lx-office-erp/jquery.autocomplete.css deleted file mode 100644 index 91b622833..000000000 --- a/css/lx-office-erp/jquery.autocomplete.css +++ /dev/null @@ -1,48 +0,0 @@ -.ac_results { - padding: 0px; - border: 1px solid black; - background-color: white; - overflow: hidden; - z-index: 99999; -} - -.ac_results ul { - width: 100%; - list-style-position: outside; - list-style: none; - padding: 0; - margin: 0; -} - -.ac_results li { - margin: 0px; - padding: 2px 5px; - cursor: default; - display: block; - /* - if width will be 100% horizontal scrollbar will apear - when scroll mode will be used - */ - /*width: 100%;*/ - font: menu; - font-size: 12px; - /* - it is very important, if line-height not setted or setted - in relative units scroll will be broken in firefox - */ - line-height: 16px; - overflow: hidden; -} - -.ac_loading { - background: white url('indicator.gif') right center no-repeat; -} - -.ac_odd { - background-color: #eee; -} - -.ac_over { - background-color: #0A246A; - color: white; -} diff --git a/css/lx-office-erp/jquery.multiselect2side.css b/css/lx-office-erp/jquery.multiselect2side.css deleted file mode 100644 index 53352fc3a..000000000 --- a/css/lx-office-erp/jquery.multiselect2side.css +++ /dev/null @@ -1,57 +0,0 @@ -/* multiselect2side plugin */ -.ms2side__div { - clear: left; - width: 100%; - padding: 1px; - float: left; - background : url('') repeat-x; /* HACK FOR CHROME */ -} - -.ms2side__select { - float: left; -} - -.ms2side__header { - color: blue; - background-color: #EEEEFF; -} - -.ms2side__options, .ms2side__updown { - float: left; - font-size: 10pt; - margin: 0; - padding: 0 8px; - width: 40px; - color: black; - text-align: center; - overflow: hidden; -} - -.ms2side__updown { - font-size: 9pt; -} - -.ms2side__options p, .ms2side__updown p { - margin: 2px 0; - padding: 0; - cursor: pointer; - border: 1px solid black; -} - -.ms2side__options p.ms2side_hover, .ms2side__updown p.ms2side_hover { - background-color: #F0F0FF; - border-color: #0000FF; - cursor: pointer; -} - -.ms2side__options p.ms2side__hide, .ms2side__updown p.ms2side__hide { - cursor: default; - color: grey; - border: 1px solid grey; - background-color: #F0F0F0; -} - -.ms2side__div select { - width: 400px; - float: left; -} diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index 09ba80409..812879ade 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -296,10 +296,6 @@ div.admin { color: green; } -td.numeric { /* class for numeric columns in tables */ - text-align: right -} - h2.confirm { color: blue; font-size: 14pt; @@ -316,19 +312,6 @@ fieldset { font-weight: bolder; } -/* media stuff */ - -@media screen { - .noscreen { /* items with this class won't display */ - display: none; - } -} - -@media print { - .noprint { /* items with this class won't print */ - display: none; - } -} .filecontent { border: 1px solid blue; @@ -344,15 +327,6 @@ label { background-color: #ffa0a0; } -.clearfix:after { - clear:both; - content:"."; - display:block; - font-size:0; - height:0; - visibility:hidden; -} - .flash_message_error { background-color:#FFD6D6; border: 1px solid #AE0014; @@ -429,29 +403,6 @@ label { margin-right: 6px; } -.small-text { - font-size: 0.75em; -} - -.float-left { - float: left; -} -.float-right { - float: right; -} - -.block-context { - overflow: hidden; -} - -.position-relative { - position: relative; -} - -.position-absolute { - position: absolute; -} - .part_picker { padding-right: 16px; } @@ -498,20 +449,3 @@ div.ppp_line span.ppp_block_sellprice { span.toggle_selected { font-weight: bold; } - -/* CTI */ -a.cti_call_action { - display: inline-block; - padding-left: 18px; - height: 16px; - position: relative; - top: 2px; - vertical-align: center; - background-image: url(../../image/icons/16x16/phone.png); - background-repeat: no-repeat; -} - -/* the cvars table in the 2. row */ -.row2-cvars-table tr {vertical-align: top;} -.row2-cvars-table th {text-align: right; padding-left: 15px; padding-right: 0;} -.row2-cvars-table td, .row2-cvars-table th {padding-top: 10px;} diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css index 42eb844f7..5ebbd85c1 100644 --- a/css/lx-office-erp/menu.css +++ b/css/lx-office-erp/menu.css @@ -25,10 +25,6 @@ body.menunew { margin:0px; } -body { -behavior:url("csshover.htc"); -} - #menuv3 { width:99.8%; float:left; diff --git a/templates/webpages/rp/bwa.html b/templates/webpages/rp/bwa.html index 52d291e2c..50c323fa0 100644 --- a/templates/webpages/rp/bwa.html +++ b/templates/webpages/rp/bwa.html @@ -2,8 +2,6 @@ [%- USE HTML %] [%- USE LxERP %] - -
[% company %]