From 99a7753dbe324d8f4afa66f16d183ae440358e5a Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 8 Nov 2016 10:15:30 +0100 Subject: [PATCH] ActionBar CSS: in common.css & lx-office-erp.css aufgeteilt --- css/common.css | 116 +++++++++++++++++++++++++++++++++++++ css/lx-office-erp/main.css | 100 +------------------------------- 2 files changed, 118 insertions(+), 98 deletions(-) diff --git a/css/common.css b/css/common.css index 34f1b8db8..9982723ac 100644 --- a/css/common.css +++ b/css/common.css @@ -76,3 +76,119 @@ input.grow_on_focus:focus { width: 150px } /* orderitems */ .shipped { color: green } .not_shipped { color: red } + +/* actionbar styling */ +div.layout-actionbar { + position: fixed; + height: 28px; + top: 20px; + z-index: 20; + width: 100%; + padding: 2px; +} + +div.layout-actionbar-action { + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + -khtml-user-select: none; /* Konqueror */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; /* don't select text on double click */ +} + +div.layout-actionbar ~ div:first { + padding-top: 25px; +} + +div.layout-actionbar > div + div { + margin-left: 2px; +} + +div.layout-actionbar-separator { + display: inline-block; + width: 20px; +} + +div.layout-actionbar div.layout-actionbar-submit, +div.layout-actionbar div.layout-actionbar-scriptbutton, +div.layout-actionbar div.layout-actionbar-submit:focus, +div.layout-actionbar div.layout-actionbar-scriptbutton:focus { + display: inline-block; + width: 120px; + box-sizing: border-box; + text-align: center; + border: 1px; + border-style: solid; + padding: 4px 4px; + cursor: default; +} + +div.layout-actionbar div.layout-actionbar-submit:hover, +div.layout-actionbar div.layout-actionbar-scriptbutton:hover { + border: 1px; + border-style: solid; +} + +div.layout-actionbar-combobox { + position: relative; + display: inline-block; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head div { + width: 100px +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head span { + display: inline-block; + border-width: 1px 1px 1px 1px; + border-style: solid; + padding: 4px; + width: 14px; + height: 15px; + position: absolute; + top: 0; + right: 0; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:after { + content: ""; + width: 0; + height: 0; + position: absolute; + right: 8px; + top: 50%; + margin-top: -3px; + border-width: 3px 3px 0 3px; + border-style: solid; +} + +div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head span:after { + border-width: 0 3px 3px 3px; +} + + +div.layout-actionbar-combobox div.layout-actionbar-combobox-head { + padding-right: 20px; + white-space: nowrap; + display: block; +} + +div.layout-actionbar-combobox div.layout-actionbar-combobox-list { + position: absolute; + display: none; + min-width: 120px; +} + +div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list { + display: inline-block; + z-index: 10; +} + +div.layout-actionbar-combobox-list div.layout-actionbar-action { + white-space: nowrap; + display: block; + position: relative; + width: 100%; + text-align: left; + padding: 4px; +} diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css index 40263f351..1615de612 100644 --- a/css/lx-office-erp/main.css +++ b/css/lx-office-erp/main.css @@ -533,62 +533,24 @@ a.red { /* actionbar styling */ div.layout-actionbar { - position: fixed; - height: 25px; - top: 20px; - z-index: 20; background-color: #d0cfc9; - width: 100%; - padding: 2px; -} - -div.layout-actionbar-action { - -webkit-touch-callout: none; /* iOS Safari */ - -webkit-user-select: none; /* Chrome/Safari/Opera */ - -khtml-user-select: none; /* Konqueror */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* Internet Explorer/Edge */ - user-select: none; /* don't select text on double click */ -} - -div.layout-actionbar ~ div { - padding-top: 25px; -} - -div.layout-actionbar > div + div { - margin-left: 2px; -} - -div.layout-actionbar-separator { - display: inline-block; - width: 20px; } div.layout-actionbar div.layout-actionbar-submit, div.layout-actionbar div.layout-actionbar-scriptbutton, div.layout-actionbar div.layout-actionbar-submit:focus, div.layout-actionbar div.layout-actionbar-scriptbutton:focus { - display: inline-block; - width: 120px; - box-sizing: border-box; - text-align: center; - border: 1px; border-color: darkgray; - border-style: solid; - padding: 4px 4px; + background-color: whitesmoke; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - background-color: whitesmoke; - cursor: default; } div.layout-actionbar div.layout-actionbar-submit:hover, div.layout-actionbar div.layout-actionbar-scriptbutton:hover { - border: 1px; background-color: lightgray; border-color: gray; - border-style: solid; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; @@ -601,33 +563,15 @@ div.layout-actionbar div.layout-actionbar-action-disabled:hover { border-color: lightgray; } -div.layout-actionbar-combobox { - position: relative; - display: inline-block; -} - -div.layout-actionbar-combobox div.layout-actionbar-combobox-head div { - width: 100px -} - div.layout-actionbar-combobox div.layout-actionbar-combobox-head span { - display: inline-block; - border-width: 1px 1px 1px 1px; - border-style: solid; border-color: darkgray; - padding: 4px; - width: 14px; - height: 15px; - position: absolute; - top: 0; - right: 0; + background-color: whitesmoke; -webkit-border-top-right-radius: 2px; -webkit-border-bottom-right-radius: 2px; -moz-border-radius-topright: 2px; -moz-border-radius-bottomright: 2px; border-top-right-radius: 2px; border-bottom-right-radius: 2px; - background-color: whitesmoke; } div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover { @@ -635,45 +579,5 @@ div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:hover { } div.layout-actionbar-combobox div.layout-actionbar-combobox-head span:after { - content: ""; - width: 0; - height: 0; - position: absolute; - right: 8px; - top: 50%; - margin-top: -3px; - border-width: 3px 3px 0 3px; - border-style: solid; border-color: black transparent; } - -div.layout-actionbar-combobox.active div.layout-actionbar-combobox-head span:after { - border-width: 0 3px 3px 3px; -} - - -div.layout-actionbar-combobox div.layout-actionbar-combobox-head { - padding-right: 20px; - white-space: nowrap; - display: block; -} - -div.layout-actionbar-combobox div.layout-actionbar-combobox-list { - position: absolute; - display: none; - min-width: 120px; -} - -div.layout-actionbar-combobox.active div.layout-actionbar-combobox-list { - display: inline-block; - z-index: 10; -} - -div.layout-actionbar-combobox-list div.layout-actionbar-action { - white-space: nowrap; - display: block; - position: relative; - width: 100%; - text-align: left; - padding: 4px; -} -- 2.20.1