catch up with branch development
Signed-off-by: Ralf Mollik <ramollik@compex-commerce.com>
diff --git a/org.eclipse.osbp.themes/VAADIN/themes/osbp-cxo/styles.css b/org.eclipse.osbp.themes/VAADIN/themes/osbp-cxo/styles.css
index f1bb67e..39d0cec 100644
--- a/org.eclipse.osbp.themes/VAADIN/themes/osbp-cxo/styles.css
+++ b/org.eclipse.osbp.themes/VAADIN/themes/osbp-cxo/styles.css
@@ -1109,7 +1109,7 @@
.v-caption {
display: inline-block;
white-space: nowrap;
- line-height: 1.55;
+ line-height: 16px;
}
.v-captiontext {
@@ -1241,7 +1241,7 @@
.v-gridlayout-slot {
position: absolute;
- line-height: 1.55;
+ line-height: 16px;
}
.v-gridlayout-spacing-on {
@@ -1415,7 +1415,7 @@
margin: 0;
padding: 0;
border: 0;
- line-height: 1.55;
+ line-height: 16px;
}
.v-table-resizer, .v-table-sort-indicator {
@@ -7525,7 +7525,7 @@
}
.osbp-cxo.v-app, .osbp-cxo.v-app-loading {
- font: 300 16px/1.55 Arial;
+ font: 300 16px/16px Arial;
color: #474747;
background-color: #fff;
cursor: default;
@@ -7703,7 +7703,7 @@
.osbp-cxo button {
font: inherit;
font-weight: 400;
- line-height: 1.55;
+ line-height: 16px;
}
.osbp-cxo a {
@@ -10407,7 +10407,7 @@
}
.osbp-cxo .v-grid-cell > * {
- line-height: 1.55;
+ line-height: 16px;
vertical-align: middle;
}
@@ -18933,7 +18933,6 @@
:root .osbp-cxo .v-checkbox > input ~ label:before {
height: 32px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #f8f5f0;
-webkit-box-shadow: none;
box-shadow: none;
@@ -18966,7 +18965,16 @@
text-align: center;
}
-.osbp-cxo .popupContent .v-window-header {
+.osbp-cxo.v-overlay-container > .v-window {
+ height: auto !important;
+ width: auto !important;
+}
+
+.osbp-cxo.v-overlay-container > .v-window .v-widget {
+ position: relative !important;
+}
+
+.osbp-cxo.v-overlay-container > .v-window .popupContent .v-window-header {
font-size: 22.4px;
padding: 10px;
font-weight: bold;
@@ -18974,92 +18982,31 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- color: #2364aa;
- line-height: 2.17;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 224px;
+ color: #2364aa;
text-align: center;
}
-.osbp-cxo .popupContent .v-window-header .v-icon {
+.osbp-cxo.v-overlay-container > .v-window .popupContent .v-window-header .v-icon {
padding-right: 9.6px;
}
-.osbp-cxo .popupContent .v-window-outerheader:after {
+.osbp-cxo.v-overlay-container > .v-window .popupContent .v-window-outerheader:after {
border-top-width: 0px;
}
-.osbp-cxo .popupContent .v-window-contents {
- padding-top: 22.17px !important;
+.osbp-cxo.v-overlay-container > .v-window .popupContent .v-window-contents {
+ padding-top: 42.4px !important;
}
-.osbp-cxo .popupContent .v-window-closebox {
- background: transparent;
- border: 0px;
- float: right;
-}
-
-.osbp-cxo .popupContent .v-window-closebox:before {
- font-family: FontAwesome;
- font-size: 21px;
- line-height: 28px;
- content: "\2715" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
-}
-
-.osbp-cxo .popupContent .v-window-maximizebox {
- width: 38.4px !important;
- background: transparent;
- border: 0px;
- float: right;
- border-bottom-left-radius: 16px;
-}
-
-.osbp-cxo .popupContent .v-window-maximizebox:before {
- font-family: FontAwesome;
- font-size: 21px;
- line-height: 28px;
- content: "\f096" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
-}
-
-.osbp-cxo .popupContent .v-window-restorebox {
- width: 51.2px !important;
- background: transparent;
- border: 0px;
- float: right;
- -moz-transform: scale(-1, 1);
- -webkit-transform: scale(-1, 1);
- -o-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- transform: scale(-1, 1);
- border-bottom-right-radius: 16px;
-}
-
-.osbp-cxo .popupContent .v-window-restorebox:before {
- font-family: FontAwesome;
- font-size: 21px;
- line-height: 28px;
- content: "\f24d" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
-}
-
-.osbp-cxo .popupContent .v-window-closebox, .osbp-cxo .popupContent .v-window-maximizebox, .osbp-cxo .popupContent .v-window-restorebox {
- background-color: #ededed;
- height: 32px;
- color: #424242;
-}
-
-.osbp-cxo .popupContent .v-window-closebox-disabled {
+.osbp-cxo.v-overlay-container > .v-window .popupContent .v-window-closebox-disabled {
display: block;
cursor: auto;
color: #a0a0a0;
}
-.osbp-cxo .popupContent .v-table-cell-content {
+.osbp-cxo.v-overlay-container > .v-window .popupContent .v-table-cell-content {
height: 41px;
}
@@ -19163,10 +19110,9 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- color: #2364aa;
- line-height: 2.17;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 224px;
+ color: #2364aa;
}
.osbp-cxo .os-org-container {
@@ -19681,7 +19627,7 @@
.osbp-cxo .filters-panel {
width: 90000px;
overflow: hidden;
- line-height: 1.55;
+ line-height: 16px;
color: #424242;
font-style: italic;
}
@@ -19892,6 +19838,10 @@
display: none;
}
+.osbp-cxo .os-data-area .v-tabsheet-scroller {
+ right: 0px;
+}
+
.osbp-cxo .v-tabsheet-tabcontainer {
background: #b2d0e9;
height: 35px;
@@ -19959,21 +19909,47 @@
font-size: 16px;
}
-.osbp-cxo .v-slot-os-single-selection, .osbp-cxo .v-slot-os-multi-selection {
- background-color: #ededed;
+.osbp-cxo .os-top-area {
+ display: flex;
+ align-items: center;
}
-.osbp-cxo .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp-cxo .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
+.osbp-cxo .os-top-area .v-slot-os-single-selection, .osbp-cxo .os-top-area .v-slot-os-multi-selection {
+ background-color: #ededed;
+ padding: 10px;
+}
+
+.osbp-cxo .os-top-area .v-slot-os-single-selection .os-single-selection, .osbp-cxo .os-top-area .v-slot-os-single-selection .os-multi-selection, .osbp-cxo .os-top-area .v-slot-os-multi-selection .os-single-selection, .osbp-cxo .os-top-area .v-slot-os-multi-selection .os-multi-selection {
+ vertical-align: text-top;
+ margin: 0px;
+}
+
+.osbp-cxo .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp-cxo .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
padding-bottom: 0px;
}
-.osbp-cxo .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp-cxo .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
+.osbp-cxo .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp-cxo .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
margin: 10px;
margin-bottom: 0px;
}
-.osbp-cxo .v-slot-os-single-selection > .v-caption-on-top > .v-filterselect, .osbp-cxo .v-slot-os-multi-selection > .v-caption-on-top > .v-filterselect {
- margin-top: 0px;
+.osbp-cxo .os-side-area .v-caption-on-top {
+ background-color: #ededed;
+}
+
+.osbp-cxo .os-side-area .v-caption-on-top > .v-caption {
+ font-size: 22.4px;
+ padding: 10px;
+ font-weight: bold;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ color: #424242;
+ line-height: 140%;
+ letter-spacing: 0em !important;
+ color: #2364aa;
+ font-size: 16px;
+ line-height: 100%;
}
:root .osbp-cxo .v-formlayout-row .v-checkbox {
@@ -19997,7 +19973,6 @@
:root .osbp-cxo .v-formlayout-row .v-checkbox > input ~ label:before {
height: 32px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #f8f5f0;
-webkit-box-shadow: none;
box-shadow: none;
@@ -20038,7 +20013,6 @@
.osbp-cxo .v-gridlayout-slot .v-checkbox-os-box > input ~ label:before {
height: 32px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #f8f5f0;
-webkit-box-shadow: none;
box-shadow: none;
@@ -20071,9 +20045,16 @@
overflow: auto;
}
-.osbp-cxo .v-panel-os-has-focus {
- border-color: #ffd210;
- border-width: 1px;
+.osbp-cxo .v-panel-os-has-focus > .v-panel-content:after {
+ box-shadow: inset 0px 0px 8px #ffd210;
+ content: "";
+ display: block;
+ height: 100%;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 99;
}
.osbp-cxo .l-control .v-table {
@@ -20152,6 +20133,41 @@
width: 100% !important;
}
+.osbp-cxo .l-control .v-component-group .v-button, .osbp-cxo .l-control .l-beansearchfield .v-button, .osbp-cxo .toptrimbar .v-component-group .v-button, .osbp-cxo .toptrimbar .l-beansearchfield .v-button, .osbp-cxo .os-selection-area .v-component-group .v-button, .osbp-cxo .os-selection-area .l-beansearchfield .v-button {
+ cursor: pointer;
+ text-align: center;
+ width: 32px !important;
+ height: 32px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #f8f5f0;
+ color: #544834;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.osbp-cxo .l-control .v-component-group .v-button:hover, .osbp-cxo .l-control .l-beansearchfield .v-button:hover, .osbp-cxo .toptrimbar .v-component-group .v-button:hover, .osbp-cxo .toptrimbar .l-beansearchfield .v-button:hover, .osbp-cxo .os-selection-area .v-component-group .v-button:hover, .osbp-cxo .os-selection-area .l-beansearchfield .v-button:hover {
+ border-bottom-color: #ffd210 !important;
+}
+
+.osbp-cxo .l-control .v-component-group .v-button:after, .osbp-cxo .l-control .l-beansearchfield .v-button:after, .osbp-cxo .toptrimbar .v-component-group .v-button:after, .osbp-cxo .toptrimbar .l-beansearchfield .v-button:after, .osbp-cxo .os-selection-area .v-component-group .v-button:after, .osbp-cxo .os-selection-area .l-beansearchfield .v-button:after {
+ right: 0px !important;
+}
+
+.osbp-cxo .l-control .v-component-group .v-button img, .osbp-cxo .l-control .l-beansearchfield .v-button img, .osbp-cxo .toptrimbar .v-component-group .v-button img, .osbp-cxo .toptrimbar .l-beansearchfield .v-button img, .osbp-cxo .os-selection-area .v-component-group .v-button img, .osbp-cxo .os-selection-area .l-beansearchfield .v-button img {
+ display: none;
+}
+
+.osbp-cxo .l-control .v-formlayout-row .v-customcomponent .v-label, .osbp-cxo .toptrimbar .v-formlayout-row .v-customcomponent .v-label, .osbp-cxo .os-selection-area .v-formlayout-row .v-customcomponent .v-label {
+ min-height: 31px;
+ line-height: 31px;
+}
+
+.osbp-cxo .l-control .v-formlayout-row .v-slider, .osbp-cxo .toptrimbar .v-formlayout-row .v-slider, .osbp-cxo .os-selection-area .v-formlayout-row .v-slider {
+ border-bottom: 1px solid #d4d4d4;
+}
+
.osbp-cxo .l-control .v-formlayout-captioncell, .osbp-cxo .l-control .v-formlayout-errorcell, .osbp-cxo .toptrimbar .v-formlayout-captioncell, .osbp-cxo .toptrimbar .v-formlayout-errorcell, .osbp-cxo .os-selection-area .v-formlayout-captioncell, .osbp-cxo .os-selection-area .v-formlayout-errorcell {
border-bottom: 1px solid #d4d4d4;
vertical-align: bottom;
@@ -20163,10 +20179,11 @@
.osbp-cxo .l-control .v-formlayout-contentcell > .v-customcomponent, .osbp-cxo .toptrimbar .v-formlayout-contentcell > .v-customcomponent, .osbp-cxo .os-selection-area .v-formlayout-contentcell > .v-customcomponent {
width: 100%;
+ border-bottom: 1px solid #d4d4d4;
}
-.osbp-cxo .l-control .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp-cxo .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp-cxo .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-label {
- border-bottom: 1px solid #d4d4d4;
+.osbp-cxo .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-cxo .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-cxo .l-control .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp-cxo .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-cxo .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-cxo .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp-cxo .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-cxo .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-cxo .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-textfield {
+ border-bottom-width: 0px;
}
.osbp-cxo .l-control .v-textfield, .osbp-cxo .toptrimbar .v-textfield, .osbp-cxo .os-selection-area .v-textfield {
@@ -20193,6 +20210,7 @@
border-right: transparent;
-webkit-box-shadow: none;
box-shadow: none;
+ height: 32px;
}
.osbp-cxo .l-control .v-filterselect-input:focus, .osbp-cxo .l-control .v-filterselect [class*="input"]:focus, .osbp-cxo .toptrimbar .v-filterselect-input:focus, .osbp-cxo .toptrimbar .v-filterselect [class*="input"]:focus, .osbp-cxo .os-selection-area .v-filterselect-input:focus, .osbp-cxo .os-selection-area .v-filterselect [class*="input"]:focus {
@@ -20216,18 +20234,15 @@
background: transparent;
border: 0px;
float: none;
- margin-left: 0px;
- padding: 0px;
- padding-left: 8px;
- font-weight: normal;
- color: #424242;
- border-width: 0px;
- background-color: #ededed;
- border-left: 1px solid #d4d4d4;
- border-bottom: 1px solid #d4d4d4;
- outline: 0;
- height: 32px;
cursor: pointer;
+ text-align: center;
+ width: 32px !important;
+ height: 32px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #f8f5f0;
+ color: #544834;
+ outline: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
@@ -20241,6 +20256,14 @@
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
}
+.osbp-cxo .l-control .l-beansearchfield button:hover, .osbp-cxo .l-control .l-beansearchfield .v-nativebutton:hover, .osbp-cxo .toptrimbar .l-beansearchfield button:hover, .osbp-cxo .toptrimbar .l-beansearchfield .v-nativebutton:hover, .osbp-cxo .os-selection-area .l-beansearchfield button:hover, .osbp-cxo .os-selection-area .l-beansearchfield .v-nativebutton:hover {
+ border-bottom-color: #ffd210 !important;
+}
+
+.osbp-cxo .l-control .l-beansearchfield button:after, .osbp-cxo .l-control .l-beansearchfield .v-nativebutton:after, .osbp-cxo .toptrimbar .l-beansearchfield button:after, .osbp-cxo .toptrimbar .l-beansearchfield .v-nativebutton:after, .osbp-cxo .os-selection-area .l-beansearchfield button:after, .osbp-cxo .os-selection-area .l-beansearchfield .v-nativebutton:after {
+ right: 0px !important;
+}
+
.osbp-cxo .l-control .l-beansearchfield button img, .osbp-cxo .l-control .l-beansearchfield .v-nativebutton img, .osbp-cxo .toptrimbar .l-beansearchfield button img, .osbp-cxo .toptrimbar .l-beansearchfield .v-nativebutton img, .osbp-cxo .os-selection-area .l-beansearchfield button img, .osbp-cxo .os-selection-area .l-beansearchfield .v-nativebutton img {
display: none;
}
@@ -20409,10 +20432,22 @@
background: #ededed;
}
+.osbp-cxo .v-accordion-item-content .v-gridlayout-slot {
+ position: relative;
+}
+
+.osbp-cxo .v-accordion-item-content .v-formlayout-contentcell .v-gridlayout .v-gridlayout-slot {
+ position: absolute;
+}
+
.osbp-cxo .v-popupbutton-popup-os-usermenubutton.v-popupview-popup {
padding: 0px;
}
+.osbp-cxo .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion {
+ width: auto !important;
+}
+
.osbp-cxo .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion [class*='os-menutree-'] > .v-tree {
width: 100% !important;
}
@@ -20605,98 +20640,56 @@
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
}
-.osbp-cxo .v-slot-osbpsidebar .v-slot-branding {
- background-color: #b2d0e9;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .branding {
- padding-bottom: 12.8px;
- padding-top: 12.8px;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .branding .v-label {
- padding: 0px;
- padding-left: 12.8px;
- line-height: 2.17;
- font-size: 22.4px;
- font-weight: bold;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .branding .v-label span {
- font-size: 22.4px;
- margin: 0px !important;
- font-weight: bold;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
- color: #253b4e;
- letter-spacing: 0em !important;
- min-height: 48px;
- display: block;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .menu {
- width: 100%;
- padding: 16px;
- overflow: auto;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .menu .v-nativebutton {
- border: 0px;
- width: 100%;
- background-color: #fff;
- cursor: pointer;
+.osbp-cxo .osbpsidebar .menu .v-nativebutton {
height: 48px;
- white-space: inherit;
- border-bottom: 1px solid #d4d4d4;
- font-weight: normal;
- text-align: left;
+ padding: 0 21px;
+ color: #c2d4e6;
+ font-weight: 600;
+
+
+ border-radius: 4px;
+ border: 0px;
+ background: #2364aa;
+ -webkit-box-shadow: 1px 3px 7px rgba(0, 0, 0, 0.1);
+ box-shadow: 1px 3px 7px rgba(0, 0, 0, 0.1);
+ text-transform: uppercase;
+ margin-left: 6px;
+ text-align: center;
+ margin-bottom: 10px;
+ width: calc(100% - 10px);
+ cursor: pointer;
}
-.osbp-cxo .v-slot-osbpsidebar .menu .v-nativebutton .badge {
- position: relative;
- float: right;
- display: inline-block;
- line-height: 1.55;
+.osbp-cxo .osbpsidebar .menu .v-nativebutton.v-pressed {
+ background-color: #ffdf57 !important;
+ border-color: #ffdf57 !important;
+}
+
+.osbp-cxo .osbpsidebar .menu .v-nativebutton:after {
+ transition: none;
+}
+
+.osbp-cxo .osbpsidebar .menu .v-nativebutton:hover, .osbp-cxo .osbpsidebar .menu .v-nativebutton:focus, .osbp-cxo .osbpsidebar .menu .v-nativebutton:active {
+ background-color: #ffd210;
+ border-color: #ffd210;
color: #3e350e;
- padding: 0em 0.4em 0em;
- background: #ffd210;
}
-.osbp-cxo .v-slot-osbpsidebar .menu .v-nativebutton:active {
- background: rgba(0, 0, 0, 0.1);
+.osbp-cxo .osbpsidebar .menu .v-nativebutton:focus:after {
+ border-color: transparent;
+ transition: none;
}
-.osbp-cxo .v-slot-osbpsidebar .menu .v-nativebutton:focus, .osbp-cxo .v-slot-osbpsidebar .menu .v-nativebutton:hover {
+.osbp-cxo .osbpsidebar .menu .v-nativebutton:focus, .osbp-cxo .osbpsidebar .menu .v-nativebutton:hover {
outline: 0;
- border-bottom-color: #ffd210;
}
-.osbp-cxo .v-slot-osbpsidebar .user {
- display: block;
- background-color: #b2d0e9;
- padding: 7px;
+.osbp-cxo .osbpsidebar .menu {
+ padding: 32px;
+ padding-top: 0px;
}
-.osbp-cxo .v-slot-osbpsidebar .user > .v-slot {
- height: 100%;
- display: inline-block;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user :nth-child(4) {
- float: right;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-image {
- border: 1px solid #d4d4d4;
- border-width: 0px;
- vertical-align: text-top;
- border-radius: 32px;
- max-width: 45px;
- max-height: 45px;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-label {
+.osbp-cxo .osbpsidebar .branding {
font-size: 22.4px;
padding: 10px;
font-weight: bold;
@@ -20704,58 +20697,9 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- color: #2364aa;
- line-height: 2.17;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 224px;
- color: #253b4e;
- padding-top: 0px;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-menubar, .osbp-cxo .v-slot-osbpsidebar .user .v-nativebutton {
- background-image: none;
- background-color: transparent;
- border: 0px;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-menubar > .v-menubar-menuitem-icon-cog {
- vertical-align: text-top;
- height: 100%;
- display: inline !important;
- background: transparent;
- border: 0px;
- float: none;
- color: #253b4e;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-menubar > .v-menubar-menuitem-icon-cog:before {
- font-family: FontAwesome;
- font-size: 28px;
- line-height: 2.17;
- content: "\f013" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.05);
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-menubar-submenu-indicator + .v-menubar-menuitem-caption:after {
- display: none;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-nativebutton {
- font-size: 22.4px;
- color: #253b4e;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .icon-cancel:before {
- font-size: 22.4px;
- color: #253b4e;
- font-weight: bold;
- line-height: 2.17;
- color: #474747;
-}
-
-.osbp-cxo .v-slot-osbpsidebar .user .v-nativebutton-caption {
- display: none;
+ color: #2364aa;
}
.osbp-cxo .l-csslayout {
@@ -21441,7 +21385,6 @@
.osbp-cxo .o-XSuggestBox {
background-color: #f8f5f0;
- height: 32px;
}
.osbp-cxo .o-XSuggestBox > .v-textfield {
@@ -21450,6 +21393,7 @@
border-left: transparent;
border-right: transparent;
width: 332px;
+ height: 32px !important;
}
.osbp-cxo .o-XSuggestBox > .v-textfield:focus {
@@ -21463,25 +21407,36 @@
.osbp-cxo .o-XSuggestBox .enableSuggestions {
cursor: pointer;
- border-bottom: 1px solid #d4d4d4 !important;
- height: 31px;
text-align: center;
- width: 32px;
+ width: 32px !important;
+ height: 32px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #f8f5f0;
+ color: #544834;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border-bottom: 1px solid #d4d4d4;
+ height: 31px;
background: transparent;
border: 0px;
float: none;
float: right;
}
-.osbp-cxo .o-XSuggestBox .enableSuggestions:focus {
- background-color: #ffe887 !important;
- color: #ffd210;
-}
-
.osbp-cxo .o-XSuggestBox .enableSuggestions:hover {
border-bottom-color: #ffd210 !important;
}
+.osbp-cxo .o-XSuggestBox .enableSuggestions:after {
+ right: 0px !important;
+}
+
+.osbp-cxo .o-XSuggestBox .enableSuggestions img {
+ display: none;
+}
+
.osbp-cxo .o-XSuggestBox .enableSuggestions:before {
font-family: FontAwesome;
font-size: 21px;
diff --git a/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/styles.css b/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/styles.css
index 7dbfcda..822e629 100644
--- a/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/styles.css
+++ b/org.eclipse.osbp.themes/VAADIN/themes/osbp-steel/styles.css
@@ -18679,7 +18679,6 @@
:root .osbp-steel .v-checkbox > input ~ label:before {
height: 24px;
border: 0px;
- border-bottom: 1px solid #111011 !important;
background: #2b292a;
-webkit-box-shadow: none;
box-shadow: none;
@@ -18712,7 +18711,16 @@
text-align: center;
}
-.osbp-steel .popupContent .v-window-header {
+.osbp-steel.v-overlay-container > .v-window {
+ height: auto !important;
+ width: auto !important;
+}
+
+.osbp-steel.v-overlay-container > .v-window .v-widget {
+ position: relative !important;
+}
+
+.osbp-steel.v-overlay-container > .v-window .popupContent .v-window-header {
font-size: 16.8px;
padding: 8px;
font-weight: bold;
@@ -18720,91 +18728,30 @@
overflow: hidden;
white-space: nowrap;
color: #c4c3c3;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 168px;
text-align: center;
}
-.osbp-steel .popupContent .v-window-header .v-icon {
+.osbp-steel.v-overlay-container > .v-window .popupContent .v-window-header .v-icon {
padding-right: 7.2px;
}
-.osbp-steel .popupContent .v-window-outerheader:after {
+.osbp-steel.v-overlay-container > .v-window .popupContent .v-window-outerheader:after {
border-top-width: 0px;
}
-.osbp-steel .popupContent .v-window-contents {
+.osbp-steel.v-overlay-container > .v-window .popupContent .v-window-contents {
padding-top: 45.4px !important;
}
-.osbp-steel .popupContent .v-window-closebox {
- background: transparent;
- border: 0px;
- float: right;
-}
-
-.osbp-steel .popupContent .v-window-closebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\2715" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-}
-
-.osbp-steel .popupContent .v-window-maximizebox {
- width: 28.8px !important;
- background: transparent;
- border: 0px;
- float: right;
- border-bottom-left-radius: 12px;
-}
-
-.osbp-steel .popupContent .v-window-maximizebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\f096" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-}
-
-.osbp-steel .popupContent .v-window-restorebox {
- width: 38.4px !important;
- background: transparent;
- border: 0px;
- float: right;
- -moz-transform: scale(-1, 1);
- -webkit-transform: scale(-1, 1);
- -o-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- transform: scale(-1, 1);
- border-bottom-right-radius: 12px;
-}
-
-.osbp-steel .popupContent .v-window-restorebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\f24d" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-}
-
-.osbp-steel .popupContent .v-window-closebox, .osbp-steel .popupContent .v-window-maximizebox, .osbp-steel .popupContent .v-window-restorebox {
- background-color: #2b292a;
- height: 24px;
- color: #c4c3c3;
-}
-
-.osbp-steel .popupContent .v-window-closebox-disabled {
+.osbp-steel.v-overlay-container > .v-window .popupContent .v-window-closebox-disabled {
display: block;
cursor: auto;
color: #e1e1e1;
}
-.osbp-steel .popupContent .v-table-cell-content {
+.osbp-steel.v-overlay-container > .v-window .popupContent .v-table-cell-content {
height: 31px;
}
@@ -18908,9 +18855,8 @@
overflow: hidden;
white-space: nowrap;
color: #c4c3c3;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 168px;
}
.osbp-steel .os-org-container {
@@ -19604,6 +19550,10 @@
display: none;
}
+.osbp-steel .os-data-area .v-tabsheet-scroller {
+ right: 0px;
+}
+
.osbp-steel .v-tabsheet-tabcontainer {
background: #2b292a;
height: 27px;
@@ -19670,21 +19620,46 @@
font-size: 12px;
}
-.osbp-steel .v-slot-os-single-selection, .osbp-steel .v-slot-os-multi-selection {
- background-color: #2b292a;
+.osbp-steel .os-top-area {
+ display: flex;
+ align-items: center;
}
-.osbp-steel .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp-steel .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
+.osbp-steel .os-top-area .v-slot-os-single-selection, .osbp-steel .os-top-area .v-slot-os-multi-selection {
+ background-color: #2b292a;
+ padding: 8px;
+}
+
+.osbp-steel .os-top-area .v-slot-os-single-selection .os-single-selection, .osbp-steel .os-top-area .v-slot-os-single-selection .os-multi-selection, .osbp-steel .os-top-area .v-slot-os-multi-selection .os-single-selection, .osbp-steel .os-top-area .v-slot-os-multi-selection .os-multi-selection {
+ vertical-align: text-top;
+ margin: 0px;
+}
+
+.osbp-steel .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp-steel .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
padding-bottom: 0px;
}
-.osbp-steel .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp-steel .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
+.osbp-steel .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp-steel .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
margin: 8px;
margin-bottom: 0px;
}
-.osbp-steel .v-slot-os-single-selection > .v-caption-on-top > .v-filterselect, .osbp-steel .v-slot-os-multi-selection > .v-caption-on-top > .v-filterselect {
- margin-top: 0px;
+.osbp-steel .os-side-area .v-caption-on-top {
+ background-color: #2b292a;
+}
+
+.osbp-steel .os-side-area .v-caption-on-top > .v-caption {
+ font-size: 16.8px;
+ padding: 8px;
+ font-weight: bold;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ color: #c4c3c3;
+ line-height: 140%;
+ letter-spacing: 0em !important;
+ font-size: 12px;
+ line-height: 100%;
}
:root .osbp-steel .v-formlayout-row .v-checkbox {
@@ -19708,7 +19683,6 @@
:root .osbp-steel .v-formlayout-row .v-checkbox > input ~ label:before {
height: 24px;
border: 0px;
- border-bottom: 1px solid #111011 !important;
background: #2b292a;
-webkit-box-shadow: none;
box-shadow: none;
@@ -19749,7 +19723,6 @@
.osbp-steel .v-gridlayout-slot .v-checkbox-os-box > input ~ label:before {
height: 24px;
border: 0px;
- border-bottom: 1px solid #111011 !important;
background: #2b292a;
-webkit-box-shadow: none;
box-shadow: none;
@@ -19782,9 +19755,16 @@
overflow: auto;
}
-.osbp-steel .v-panel-os-has-focus {
- border-color: #5D737E;
- border-width: 1px;
+.osbp-steel .v-panel-os-has-focus > .v-panel-content:after {
+ box-shadow: inset 0px 0px 8px #5D737E;
+ content: "";
+ display: block;
+ height: 100%;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 99;
}
.osbp-steel .l-control .v-table {
@@ -19863,6 +19843,41 @@
width: 100% !important;
}
+.osbp-steel .l-control .v-component-group .v-button, .osbp-steel .l-control .l-beansearchfield .v-button, .osbp-steel .toptrimbar .v-component-group .v-button, .osbp-steel .toptrimbar .l-beansearchfield .v-button, .osbp-steel .os-selection-area .v-component-group .v-button, .osbp-steel .os-selection-area .l-beansearchfield .v-button {
+ cursor: pointer;
+ text-align: center;
+ width: 24px !important;
+ height: 24px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #2b292a;
+ color: #c4c3c3;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.osbp-steel .l-control .v-component-group .v-button:hover, .osbp-steel .l-control .l-beansearchfield .v-button:hover, .osbp-steel .toptrimbar .v-component-group .v-button:hover, .osbp-steel .toptrimbar .l-beansearchfield .v-button:hover, .osbp-steel .os-selection-area .v-component-group .v-button:hover, .osbp-steel .os-selection-area .l-beansearchfield .v-button:hover {
+ border-bottom-color: #5D737E !important;
+}
+
+.osbp-steel .l-control .v-component-group .v-button:after, .osbp-steel .l-control .l-beansearchfield .v-button:after, .osbp-steel .toptrimbar .v-component-group .v-button:after, .osbp-steel .toptrimbar .l-beansearchfield .v-button:after, .osbp-steel .os-selection-area .v-component-group .v-button:after, .osbp-steel .os-selection-area .l-beansearchfield .v-button:after {
+ right: 0px !important;
+}
+
+.osbp-steel .l-control .v-component-group .v-button img, .osbp-steel .l-control .l-beansearchfield .v-button img, .osbp-steel .toptrimbar .v-component-group .v-button img, .osbp-steel .toptrimbar .l-beansearchfield .v-button img, .osbp-steel .os-selection-area .v-component-group .v-button img, .osbp-steel .os-selection-area .l-beansearchfield .v-button img {
+ display: none;
+}
+
+.osbp-steel .l-control .v-formlayout-row .v-customcomponent .v-label, .osbp-steel .toptrimbar .v-formlayout-row .v-customcomponent .v-label, .osbp-steel .os-selection-area .v-formlayout-row .v-customcomponent .v-label {
+ min-height: 23px;
+ line-height: 23px;
+}
+
+.osbp-steel .l-control .v-formlayout-row .v-slider, .osbp-steel .toptrimbar .v-formlayout-row .v-slider, .osbp-steel .os-selection-area .v-formlayout-row .v-slider {
+ border-bottom: 1px solid #111011;
+}
+
.osbp-steel .l-control .v-formlayout-captioncell, .osbp-steel .l-control .v-formlayout-errorcell, .osbp-steel .toptrimbar .v-formlayout-captioncell, .osbp-steel .toptrimbar .v-formlayout-errorcell, .osbp-steel .os-selection-area .v-formlayout-captioncell, .osbp-steel .os-selection-area .v-formlayout-errorcell {
border-bottom: 1px solid #111011;
vertical-align: bottom;
@@ -19874,10 +19889,11 @@
.osbp-steel .l-control .v-formlayout-contentcell > .v-customcomponent, .osbp-steel .toptrimbar .v-formlayout-contentcell > .v-customcomponent, .osbp-steel .os-selection-area .v-formlayout-contentcell > .v-customcomponent {
width: 100%;
+ border-bottom: 1px solid #111011;
}
-.osbp-steel .l-control .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp-steel .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp-steel .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-label {
- border-bottom: 1px solid #111011;
+.osbp-steel .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-steel .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-steel .l-control .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp-steel .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-steel .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-steel .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp-steel .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-steel .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-steel .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-textfield {
+ border-bottom-width: 0px;
}
.osbp-steel .l-control .v-textfield, .osbp-steel .toptrimbar .v-textfield, .osbp-steel .os-selection-area .v-textfield {
@@ -19904,6 +19920,7 @@
border-right: transparent;
-webkit-box-shadow: none;
box-shadow: none;
+ height: 24px;
}
.osbp-steel .l-control .v-filterselect-input:focus, .osbp-steel .l-control .v-filterselect [class*="input"]:focus, .osbp-steel .toptrimbar .v-filterselect-input:focus, .osbp-steel .toptrimbar .v-filterselect [class*="input"]:focus, .osbp-steel .os-selection-area .v-filterselect-input:focus, .osbp-steel .os-selection-area .v-filterselect [class*="input"]:focus {
@@ -19927,18 +19944,15 @@
background: transparent;
border: 0px;
float: none;
- margin-left: 0px;
- padding: 0px;
- padding-left: 6px;
- font-weight: normal;
- color: #c4c3c3;
- border-width: 0px;
- background-color: #2b292a;
- border-left: 1px solid #111011;
- border-bottom: 1px solid #111011;
- outline: 0;
- height: 24px;
cursor: pointer;
+ text-align: center;
+ width: 24px !important;
+ height: 24px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #2b292a;
+ color: #c4c3c3;
+ outline: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
@@ -19952,6 +19966,14 @@
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
}
+.osbp-steel .l-control .l-beansearchfield button:hover, .osbp-steel .l-control .l-beansearchfield .v-nativebutton:hover, .osbp-steel .toptrimbar .l-beansearchfield button:hover, .osbp-steel .toptrimbar .l-beansearchfield .v-nativebutton:hover, .osbp-steel .os-selection-area .l-beansearchfield button:hover, .osbp-steel .os-selection-area .l-beansearchfield .v-nativebutton:hover {
+ border-bottom-color: #5D737E !important;
+}
+
+.osbp-steel .l-control .l-beansearchfield button:after, .osbp-steel .l-control .l-beansearchfield .v-nativebutton:after, .osbp-steel .toptrimbar .l-beansearchfield button:after, .osbp-steel .toptrimbar .l-beansearchfield .v-nativebutton:after, .osbp-steel .os-selection-area .l-beansearchfield button:after, .osbp-steel .os-selection-area .l-beansearchfield .v-nativebutton:after {
+ right: 0px !important;
+}
+
.osbp-steel .l-control .l-beansearchfield button img, .osbp-steel .l-control .l-beansearchfield .v-nativebutton img, .osbp-steel .toptrimbar .l-beansearchfield button img, .osbp-steel .toptrimbar .l-beansearchfield .v-nativebutton img, .osbp-steel .os-selection-area .l-beansearchfield button img, .osbp-steel .os-selection-area .l-beansearchfield .v-nativebutton img {
display: none;
}
@@ -20157,10 +20179,22 @@
background: #2b292a;
}
+.osbp-steel .v-accordion-item-content .v-gridlayout-slot {
+ position: relative;
+}
+
+.osbp-steel .v-accordion-item-content .v-formlayout-contentcell .v-gridlayout .v-gridlayout-slot {
+ position: absolute;
+}
+
.osbp-steel .v-popupbutton-popup-os-usermenubutton.v-popupview-popup {
padding: 0px;
}
+.osbp-steel .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion {
+ width: auto !important;
+}
+
.osbp-steel .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion [class*='os-menutree-'] > .v-tree {
width: 100% !important;
}
@@ -20399,6 +20433,7 @@
.osbp-steel .osbpsidebar .menu {
padding: 12px;
+ padding-top: 0px;
}
.osbp-steel .osbpsidebar .branding {
@@ -20409,9 +20444,8 @@
overflow: hidden;
white-space: nowrap;
color: #c4c3c3;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 168px;
}
.osbp-steel .l-csslayout {
@@ -21094,7 +21128,6 @@
.osbp-steel .o-XSuggestBox {
background-color: #2b292a;
- height: 24px;
}
.osbp-steel .o-XSuggestBox > .v-textfield {
@@ -21103,6 +21136,7 @@
border-left: transparent;
border-right: transparent;
width: 250px;
+ height: 24px !important;
}
.osbp-steel .o-XSuggestBox > .v-textfield:focus {
@@ -21116,25 +21150,36 @@
.osbp-steel .o-XSuggestBox .enableSuggestions {
cursor: pointer;
- border-bottom: 1px solid #111011 !important;
- height: 23px;
text-align: center;
- width: 24px;
+ width: 24px !important;
+ height: 24px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #2b292a;
+ color: #c4c3c3;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border-bottom: 1px solid #111011;
+ height: 23px;
background: transparent;
border: 0px;
float: none;
float: right;
}
-.osbp-steel .o-XSuggestBox .enableSuggestions:focus {
- background-color: #aeb9be !important;
- color: #5D737E;
-}
-
.osbp-steel .o-XSuggestBox .enableSuggestions:hover {
border-bottom-color: #5D737E !important;
}
+.osbp-steel .o-XSuggestBox .enableSuggestions:after {
+ right: 0px !important;
+}
+
+.osbp-steel .o-XSuggestBox .enableSuggestions img {
+ display: none;
+}
+
.osbp-steel .o-XSuggestBox .enableSuggestions:before {
font-family: FontAwesome;
font-size: 14px;
diff --git a/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/styles.css b/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/styles.css
index 989422f..80de237 100644
--- a/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/styles.css
+++ b/org.eclipse.osbp.themes/VAADIN/themes/osbp-tea/styles.css
@@ -18686,7 +18686,6 @@
:root .osbp-tea .v-checkbox > input ~ label:before {
height: 22px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #ededed;
-webkit-box-shadow: none;
box-shadow: none;
@@ -18719,7 +18718,16 @@
text-align: center;
}
-.osbp-tea .popupContent .v-window-header {
+.osbp-tea.v-overlay-container > .v-window {
+ height: auto !important;
+ width: auto !important;
+}
+
+.osbp-tea.v-overlay-container > .v-window .v-widget {
+ position: relative !important;
+}
+
+.osbp-tea.v-overlay-container > .v-window .popupContent .v-window-header {
font-size: 16.8px;
padding: 7px;
font-weight: bold;
@@ -18727,91 +18735,30 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 154px;
text-align: center;
}
-.osbp-tea .popupContent .v-window-header .v-icon {
+.osbp-tea.v-overlay-container > .v-window .popupContent .v-window-header .v-icon {
padding-right: 6.6px;
}
-.osbp-tea .popupContent .v-window-outerheader:after {
+.osbp-tea.v-overlay-container > .v-window .popupContent .v-window-outerheader:after {
border-top-width: 0px;
}
-.osbp-tea .popupContent .v-window-contents {
+.osbp-tea.v-overlay-container > .v-window .popupContent .v-window-contents {
padding-top: 45.4px !important;
}
-.osbp-tea .popupContent .v-window-closebox {
- background: transparent;
- border: 0px;
- float: right;
-}
-
-.osbp-tea .popupContent .v-window-closebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\2715" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.15);
-}
-
-.osbp-tea .popupContent .v-window-maximizebox {
- width: 26.4px !important;
- background: transparent;
- border: 0px;
- float: right;
- border-bottom-left-radius: 11px;
-}
-
-.osbp-tea .popupContent .v-window-maximizebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\f096" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.15);
-}
-
-.osbp-tea .popupContent .v-window-restorebox {
- width: 35.2px !important;
- background: transparent;
- border: 0px;
- float: right;
- -moz-transform: scale(-1, 1);
- -webkit-transform: scale(-1, 1);
- -o-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- transform: scale(-1, 1);
- border-bottom-right-radius: 11px;
-}
-
-.osbp-tea .popupContent .v-window-restorebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\f24d" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.15);
-}
-
-.osbp-tea .popupContent .v-window-closebox, .osbp-tea .popupContent .v-window-maximizebox, .osbp-tea .popupContent .v-window-restorebox {
- background-color: #ededed;
- height: 22px;
- color: #424242;
-}
-
-.osbp-tea .popupContent .v-window-closebox-disabled {
+.osbp-tea.v-overlay-container > .v-window .popupContent .v-window-closebox-disabled {
display: block;
cursor: auto;
color: #a0a0a0;
}
-.osbp-tea .popupContent .v-table-cell-content {
+.osbp-tea.v-overlay-container > .v-window .popupContent .v-table-cell-content {
height: 28px;
}
@@ -18915,9 +18862,8 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 154px;
}
.osbp-tea .os-org-container {
@@ -19611,6 +19557,10 @@
display: none;
}
+.osbp-tea .os-data-area .v-tabsheet-scroller {
+ right: 0px;
+}
+
.osbp-tea .v-tabsheet-tabcontainer {
background: #ededed;
height: 24px;
@@ -19677,21 +19627,46 @@
font-size: 12px;
}
-.osbp-tea .v-slot-os-single-selection, .osbp-tea .v-slot-os-multi-selection {
- background-color: #ededed;
+.osbp-tea .os-top-area {
+ display: flex;
+ align-items: center;
}
-.osbp-tea .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp-tea .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
+.osbp-tea .os-top-area .v-slot-os-single-selection, .osbp-tea .os-top-area .v-slot-os-multi-selection {
+ background-color: #ededed;
+ padding: 7px;
+}
+
+.osbp-tea .os-top-area .v-slot-os-single-selection .os-single-selection, .osbp-tea .os-top-area .v-slot-os-single-selection .os-multi-selection, .osbp-tea .os-top-area .v-slot-os-multi-selection .os-single-selection, .osbp-tea .os-top-area .v-slot-os-multi-selection .os-multi-selection {
+ vertical-align: text-top;
+ margin: 0px;
+}
+
+.osbp-tea .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp-tea .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
padding-bottom: 0px;
}
-.osbp-tea .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp-tea .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
+.osbp-tea .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp-tea .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
margin: 7px;
margin-bottom: 0px;
}
-.osbp-tea .v-slot-os-single-selection > .v-caption-on-top > .v-filterselect, .osbp-tea .v-slot-os-multi-selection > .v-caption-on-top > .v-filterselect {
- margin-top: 0px;
+.osbp-tea .os-side-area .v-caption-on-top {
+ background-color: #ededed;
+}
+
+.osbp-tea .os-side-area .v-caption-on-top > .v-caption {
+ font-size: 16.8px;
+ padding: 7px;
+ font-weight: bold;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ color: #424242;
+ line-height: 140%;
+ letter-spacing: 0em !important;
+ font-size: 12px;
+ line-height: 100%;
}
:root .osbp-tea .v-formlayout-row .v-checkbox {
@@ -19715,7 +19690,6 @@
:root .osbp-tea .v-formlayout-row .v-checkbox > input ~ label:before {
height: 22px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #ededed;
-webkit-box-shadow: none;
box-shadow: none;
@@ -19756,7 +19730,6 @@
.osbp-tea .v-gridlayout-slot .v-checkbox-os-box > input ~ label:before {
height: 22px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #ededed;
-webkit-box-shadow: none;
box-shadow: none;
@@ -19789,9 +19762,16 @@
overflow: auto;
}
-.osbp-tea .v-panel-os-has-focus {
- border-color: #9ea93f;
- border-width: 1px;
+.osbp-tea .v-panel-os-has-focus > .v-panel-content:after {
+ box-shadow: inset 0px 0px 8px #9ea93f;
+ content: "";
+ display: block;
+ height: 100%;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 99;
}
.osbp-tea .l-control .v-table {
@@ -19870,6 +19850,41 @@
width: 100% !important;
}
+.osbp-tea .l-control .v-component-group .v-button, .osbp-tea .l-control .l-beansearchfield .v-button, .osbp-tea .toptrimbar .v-component-group .v-button, .osbp-tea .toptrimbar .l-beansearchfield .v-button, .osbp-tea .os-selection-area .v-component-group .v-button, .osbp-tea .os-selection-area .l-beansearchfield .v-button {
+ cursor: pointer;
+ text-align: center;
+ width: 22px !important;
+ height: 22px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #ededed;
+ color: #424242;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.osbp-tea .l-control .v-component-group .v-button:hover, .osbp-tea .l-control .l-beansearchfield .v-button:hover, .osbp-tea .toptrimbar .v-component-group .v-button:hover, .osbp-tea .toptrimbar .l-beansearchfield .v-button:hover, .osbp-tea .os-selection-area .v-component-group .v-button:hover, .osbp-tea .os-selection-area .l-beansearchfield .v-button:hover {
+ border-bottom-color: #9ea93f !important;
+}
+
+.osbp-tea .l-control .v-component-group .v-button:after, .osbp-tea .l-control .l-beansearchfield .v-button:after, .osbp-tea .toptrimbar .v-component-group .v-button:after, .osbp-tea .toptrimbar .l-beansearchfield .v-button:after, .osbp-tea .os-selection-area .v-component-group .v-button:after, .osbp-tea .os-selection-area .l-beansearchfield .v-button:after {
+ right: 0px !important;
+}
+
+.osbp-tea .l-control .v-component-group .v-button img, .osbp-tea .l-control .l-beansearchfield .v-button img, .osbp-tea .toptrimbar .v-component-group .v-button img, .osbp-tea .toptrimbar .l-beansearchfield .v-button img, .osbp-tea .os-selection-area .v-component-group .v-button img, .osbp-tea .os-selection-area .l-beansearchfield .v-button img {
+ display: none;
+}
+
+.osbp-tea .l-control .v-formlayout-row .v-customcomponent .v-label, .osbp-tea .toptrimbar .v-formlayout-row .v-customcomponent .v-label, .osbp-tea .os-selection-area .v-formlayout-row .v-customcomponent .v-label {
+ min-height: 21px;
+ line-height: 21px;
+}
+
+.osbp-tea .l-control .v-formlayout-row .v-slider, .osbp-tea .toptrimbar .v-formlayout-row .v-slider, .osbp-tea .os-selection-area .v-formlayout-row .v-slider {
+ border-bottom: 1px solid #d4d4d4;
+}
+
.osbp-tea .l-control .v-formlayout-captioncell, .osbp-tea .l-control .v-formlayout-errorcell, .osbp-tea .toptrimbar .v-formlayout-captioncell, .osbp-tea .toptrimbar .v-formlayout-errorcell, .osbp-tea .os-selection-area .v-formlayout-captioncell, .osbp-tea .os-selection-area .v-formlayout-errorcell {
border-bottom: 1px solid #d4d4d4;
vertical-align: bottom;
@@ -19881,10 +19896,11 @@
.osbp-tea .l-control .v-formlayout-contentcell > .v-customcomponent, .osbp-tea .toptrimbar .v-formlayout-contentcell > .v-customcomponent, .osbp-tea .os-selection-area .v-formlayout-contentcell > .v-customcomponent {
width: 100%;
+ border-bottom: 1px solid #d4d4d4;
}
-.osbp-tea .l-control .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp-tea .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp-tea .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-label {
- border-bottom: 1px solid #d4d4d4;
+.osbp-tea .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-tea .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-tea .l-control .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp-tea .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-tea .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-tea .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp-tea .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp-tea .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp-tea .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-textfield {
+ border-bottom-width: 0px;
}
.osbp-tea .l-control .v-textfield, .osbp-tea .toptrimbar .v-textfield, .osbp-tea .os-selection-area .v-textfield {
@@ -19911,6 +19927,7 @@
border-right: transparent;
-webkit-box-shadow: none;
box-shadow: none;
+ height: 22px;
}
.osbp-tea .l-control .v-filterselect-input:focus, .osbp-tea .l-control .v-filterselect [class*="input"]:focus, .osbp-tea .toptrimbar .v-filterselect-input:focus, .osbp-tea .toptrimbar .v-filterselect [class*="input"]:focus, .osbp-tea .os-selection-area .v-filterselect-input:focus, .osbp-tea .os-selection-area .v-filterselect [class*="input"]:focus {
@@ -19934,18 +19951,15 @@
background: transparent;
border: 0px;
float: none;
- margin-left: 0px;
- padding: 0px;
- padding-left: 6px;
- font-weight: normal;
- color: #424242;
- border-width: 0px;
- background-color: #ededed;
- border-left: 1px solid #d4d4d4;
- border-bottom: 1px solid #d4d4d4;
- outline: 0;
- height: 22px;
cursor: pointer;
+ text-align: center;
+ width: 22px !important;
+ height: 22px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #ededed;
+ color: #424242;
+ outline: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
@@ -19959,6 +19973,14 @@
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.15);
}
+.osbp-tea .l-control .l-beansearchfield button:hover, .osbp-tea .l-control .l-beansearchfield .v-nativebutton:hover, .osbp-tea .toptrimbar .l-beansearchfield button:hover, .osbp-tea .toptrimbar .l-beansearchfield .v-nativebutton:hover, .osbp-tea .os-selection-area .l-beansearchfield button:hover, .osbp-tea .os-selection-area .l-beansearchfield .v-nativebutton:hover {
+ border-bottom-color: #9ea93f !important;
+}
+
+.osbp-tea .l-control .l-beansearchfield button:after, .osbp-tea .l-control .l-beansearchfield .v-nativebutton:after, .osbp-tea .toptrimbar .l-beansearchfield button:after, .osbp-tea .toptrimbar .l-beansearchfield .v-nativebutton:after, .osbp-tea .os-selection-area .l-beansearchfield button:after, .osbp-tea .os-selection-area .l-beansearchfield .v-nativebutton:after {
+ right: 0px !important;
+}
+
.osbp-tea .l-control .l-beansearchfield button img, .osbp-tea .l-control .l-beansearchfield .v-nativebutton img, .osbp-tea .toptrimbar .l-beansearchfield button img, .osbp-tea .toptrimbar .l-beansearchfield .v-nativebutton img, .osbp-tea .os-selection-area .l-beansearchfield button img, .osbp-tea .os-selection-area .l-beansearchfield .v-nativebutton img {
display: none;
}
@@ -20164,10 +20186,22 @@
background: #ededed;
}
+.osbp-tea .v-accordion-item-content .v-gridlayout-slot {
+ position: relative;
+}
+
+.osbp-tea .v-accordion-item-content .v-formlayout-contentcell .v-gridlayout .v-gridlayout-slot {
+ position: absolute;
+}
+
.osbp-tea .v-popupbutton-popup-os-usermenubutton.v-popupview-popup {
padding: 0px;
}
+.osbp-tea .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion {
+ width: auto !important;
+}
+
.osbp-tea .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion [class*='os-menutree-'] > .v-tree {
width: 100% !important;
}
@@ -20360,98 +20394,56 @@
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.15);
}
-.osbp-tea .v-slot-osbpsidebar .v-slot-branding {
- background-color: #ededed;
-}
-
-.osbp-tea .v-slot-osbpsidebar .branding {
- padding-bottom: 8.8px;
- padding-top: 8.8px;
-}
-
-.osbp-tea .v-slot-osbpsidebar .branding .v-label {
- padding: 0px;
- padding-left: 8.8px;
- line-height: 29.4px;
- font-size: 16.8px;
- font-weight: bold;
-}
-
-.osbp-tea .v-slot-osbpsidebar .branding .v-label span {
- font-size: 16.8px;
- margin: 0px !important;
- font-weight: bold;
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
- color: #424242;
- letter-spacing: 0em !important;
- min-height: 25px;
- display: block;
-}
-
-.osbp-tea .v-slot-osbpsidebar .menu {
- width: 100%;
- padding: 11px;
- overflow: auto;
-}
-
-.osbp-tea .v-slot-osbpsidebar .menu .v-nativebutton {
- border: 0px;
- width: 100%;
- background-color: #fff;
- cursor: pointer;
+.osbp-tea .osbpsidebar .menu .v-nativebutton {
height: 25px;
- white-space: inherit;
- border-bottom: 1px solid #d4d4d4;
- font-weight: normal;
- text-align: left;
+ padding: 0 10px;
+ color: #bad1e1;
+ font-weight: 600;
+
+
+ border-radius: 0px;
+ border: 0px;
+ background: #1f567d;
+ -webkit-box-shadow: 1px 3px 7px rgba(0, 0, 0, 0.1);
+ box-shadow: 1px 3px 7px rgba(0, 0, 0, 0.1);
+ text-transform: uppercase;
+ margin-left: 4px;
+ text-align: center;
+ margin-bottom: 8px;
+ width: calc(100% - 8px);
+ cursor: pointer;
}
-.osbp-tea .v-slot-osbpsidebar .menu .v-nativebutton .badge {
- position: relative;
- float: right;
- display: inline-block;
- line-height: 21px;
+.osbp-tea .osbpsidebar .menu .v-nativebutton.v-pressed {
+ background-color: #bbc278 !important;
+ border-color: #bbc278 !important;
+}
+
+.osbp-tea .osbpsidebar .menu .v-nativebutton:after {
+ transition: none;
+}
+
+.osbp-tea .osbpsidebar .menu .v-nativebutton:hover, .osbp-tea .osbpsidebar .menu .v-nativebutton:focus, .osbp-tea .osbpsidebar .menu .v-nativebutton:active {
+ background-color: #9ea93f;
+ border-color: #9ea93f;
color: #282a17;
- padding: 0em 0.4em 0em;
- background: #9ea93f;
}
-.osbp-tea .v-slot-osbpsidebar .menu .v-nativebutton:active {
- background: rgba(0, 0, 0, 0.1);
+.osbp-tea .osbpsidebar .menu .v-nativebutton:focus:after {
+ border-color: transparent;
+ transition: none;
}
-.osbp-tea .v-slot-osbpsidebar .menu .v-nativebutton:focus, .osbp-tea .v-slot-osbpsidebar .menu .v-nativebutton:hover {
+.osbp-tea .osbpsidebar .menu .v-nativebutton:focus, .osbp-tea .osbpsidebar .menu .v-nativebutton:hover {
outline: 0;
- border-bottom-color: #9ea93f;
}
-.osbp-tea .v-slot-osbpsidebar .user {
- display: block;
- background-color: #ededed;
- padding: 5px;
+.osbp-tea .osbpsidebar .menu {
+ padding: 11px;
+ padding-top: 0px;
}
-.osbp-tea .v-slot-osbpsidebar .user > .v-slot {
- height: 100%;
- display: inline-block;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user :nth-child(4) {
- float: right;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-image {
- border: 1px solid #d4d4d4;
- border-width: 0px;
- vertical-align: text-top;
- border-radius: 22px;
- max-width: 31px;
- max-height: 31px;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-label {
+.osbp-tea .osbpsidebar .branding {
font-size: 16.8px;
padding: 7px;
font-weight: bold;
@@ -20459,57 +20451,8 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 154px;
- color: #424242;
- padding-top: 0px;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-menubar, .osbp-tea .v-slot-osbpsidebar .user .v-nativebutton {
- background-image: none;
- background-color: transparent;
- border: 0px;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-menubar > .v-menubar-menuitem-icon-cog {
- vertical-align: text-top;
- height: 100%;
- display: inline !important;
- background: transparent;
- border: 0px;
- float: none;
- color: #424242;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-menubar > .v-menubar-menuitem-icon-cog:before {
- font-family: FontAwesome;
- font-size: 21px;
- line-height: 29.4px;
- content: "\f013" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.15);
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-menubar-submenu-indicator + .v-menubar-menuitem-caption:after {
- display: none;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-nativebutton {
- font-size: 16.8px;
- color: #424242;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .icon-cancel:before {
- font-size: 16.8px;
- color: #424242;
- font-weight: bold;
- line-height: 29.4px;
- color: #474747;
-}
-
-.osbp-tea .v-slot-osbpsidebar .user .v-nativebutton-caption {
- display: none;
}
.osbp-tea .l-csslayout {
@@ -21192,7 +21135,6 @@
.osbp-tea .o-XSuggestBox {
background-color: #ededed;
- height: 22px;
}
.osbp-tea .o-XSuggestBox > .v-textfield {
@@ -21201,6 +21143,7 @@
border-left: transparent;
border-right: transparent;
width: 228px;
+ height: 22px !important;
}
.osbp-tea .o-XSuggestBox > .v-textfield:focus {
@@ -21214,25 +21157,36 @@
.osbp-tea .o-XSuggestBox .enableSuggestions {
cursor: pointer;
- border-bottom: 1px solid #d4d4d4 !important;
- height: 21px;
text-align: center;
- width: 22px;
+ width: 22px !important;
+ height: 22px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #ededed;
+ color: #424242;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border-bottom: 1px solid #d4d4d4;
+ height: 21px;
background: transparent;
border: 0px;
float: none;
float: right;
}
-.osbp-tea .o-XSuggestBox .enableSuggestions:focus {
- background-color: #ced49f !important;
- color: #9ea93f;
-}
-
.osbp-tea .o-XSuggestBox .enableSuggestions:hover {
border-bottom-color: #9ea93f !important;
}
+.osbp-tea .o-XSuggestBox .enableSuggestions:after {
+ right: 0px !important;
+}
+
+.osbp-tea .o-XSuggestBox .enableSuggestions img {
+ display: none;
+}
+
.osbp-tea .o-XSuggestBox .enableSuggestions:before {
font-family: FontAwesome;
font-size: 14px;
diff --git a/org.eclipse.osbp.themes/VAADIN/themes/osbp/styles.css b/org.eclipse.osbp.themes/VAADIN/themes/osbp/styles.css
index 3298e2e..842857d 100644
--- a/org.eclipse.osbp.themes/VAADIN/themes/osbp/styles.css
+++ b/org.eclipse.osbp.themes/VAADIN/themes/osbp/styles.css
@@ -18669,7 +18669,6 @@
:root .osbp .v-checkbox > input ~ label:before {
height: 22px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #ededed;
-webkit-box-shadow: none;
box-shadow: none;
@@ -18698,7 +18697,16 @@
text-align: center;
}
-.osbp .popupContent .v-window-header {
+.osbp.v-overlay-container > .v-window {
+ height: auto !important;
+ width: auto !important;
+}
+
+.osbp.v-overlay-container > .v-window .v-widget {
+ position: relative !important;
+}
+
+.osbp.v-overlay-container > .v-window .popupContent .v-window-header {
font-size: 16.8px;
padding: 7px;
font-weight: bold;
@@ -18706,91 +18714,30 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 154px;
text-align: center;
}
-.osbp .popupContent .v-window-header .v-icon {
+.osbp.v-overlay-container > .v-window .popupContent .v-window-header .v-icon {
padding-right: 6.6px;
}
-.osbp .popupContent .v-window-outerheader:after {
+.osbp.v-overlay-container > .v-window .popupContent .v-window-outerheader:after {
border-top-width: 0px;
}
-.osbp .popupContent .v-window-contents {
+.osbp.v-overlay-container > .v-window .popupContent .v-window-contents {
padding-top: 45.4px !important;
}
-.osbp .popupContent .v-window-closebox {
- background: transparent;
- border: 0px;
- float: right;
-}
-
-.osbp .popupContent .v-window-closebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\2715" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1);
-}
-
-.osbp .popupContent .v-window-maximizebox {
- width: 26.4px !important;
- background: transparent;
- border: 0px;
- float: right;
- border-bottom-left-radius: 11px;
-}
-
-.osbp .popupContent .v-window-maximizebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\f096" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1);
-}
-
-.osbp .popupContent .v-window-restorebox {
- width: 35.2px !important;
- background: transparent;
- border: 0px;
- float: right;
- -moz-transform: scale(-1, 1);
- -webkit-transform: scale(-1, 1);
- -o-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- transform: scale(-1, 1);
- border-bottom-right-radius: 11px;
-}
-
-.osbp .popupContent .v-window-restorebox:before {
- font-family: FontAwesome;
- font-size: 14px;
- line-height: 14px;
- content: "\f24d" !important;
- text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.2);
- text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1);
-}
-
-.osbp .popupContent .v-window-closebox, .osbp .popupContent .v-window-maximizebox, .osbp .popupContent .v-window-restorebox {
- background-color: #ededed;
- height: 22px;
- color: #424242;
-}
-
-.osbp .popupContent .v-window-closebox-disabled {
+.osbp.v-overlay-container > .v-window .popupContent .v-window-closebox-disabled {
display: block;
cursor: auto;
color: #a0a0a0;
}
-.osbp .popupContent .v-table-cell-content {
+.osbp.v-overlay-container > .v-window .popupContent .v-table-cell-content {
height: 28px;
}
@@ -18894,9 +18841,8 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 154px;
}
.osbp .os-org-container {
@@ -19598,6 +19544,10 @@
display: none;
}
+.osbp .os-data-area .v-tabsheet-scroller {
+ right: 0px;
+}
+
.osbp .v-tabsheet-tabcontainer {
background: #ededed;
}
@@ -19661,21 +19611,46 @@
font-size: 12px;
}
-.osbp .v-slot-os-single-selection, .osbp .v-slot-os-multi-selection {
- background-color: #ededed;
+.osbp .os-top-area {
+ display: flex;
+ align-items: center;
}
-.osbp .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
+.osbp .os-top-area .v-slot-os-single-selection, .osbp .os-top-area .v-slot-os-multi-selection {
+ background-color: #ededed;
+ padding: 7px;
+}
+
+.osbp .os-top-area .v-slot-os-single-selection .os-single-selection, .osbp .os-top-area .v-slot-os-single-selection .os-multi-selection, .osbp .os-top-area .v-slot-os-multi-selection .os-single-selection, .osbp .os-top-area .v-slot-os-multi-selection .os-multi-selection {
+ vertical-align: text-top;
+ margin: 0px;
+}
+
+.osbp .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption, .osbp .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption {
padding-bottom: 0px;
}
-.osbp .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
+.osbp .os-top-area .v-slot-os-single-selection > .v-caption-on-top > .v-caption > .v-captiontext, .osbp .os-top-area .v-slot-os-multi-selection > .v-caption-on-top > .v-caption > .v-captiontext {
margin: 7px;
margin-bottom: 0px;
}
-.osbp .v-slot-os-single-selection > .v-caption-on-top > .v-filterselect, .osbp .v-slot-os-multi-selection > .v-caption-on-top > .v-filterselect {
- margin-top: 0px;
+.osbp .os-side-area .v-caption-on-top {
+ background-color: #ededed;
+}
+
+.osbp .os-side-area .v-caption-on-top > .v-caption {
+ font-size: 16.8px;
+ padding: 7px;
+ font-weight: bold;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ color: #424242;
+ line-height: 140%;
+ letter-spacing: 0em !important;
+ font-size: 12px;
+ line-height: 100%;
}
:root .osbp .v-formlayout-row .v-checkbox {
@@ -19699,7 +19674,6 @@
:root .osbp .v-formlayout-row .v-checkbox > input ~ label:before {
height: 22px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #ededed;
-webkit-box-shadow: none;
box-shadow: none;
@@ -19740,7 +19714,6 @@
.osbp .v-gridlayout-slot .v-checkbox-os-box > input ~ label:before {
height: 22px;
border: 0px;
- border-bottom: 1px solid #d4d4d4 !important;
background: #ededed;
-webkit-box-shadow: none;
box-shadow: none;
@@ -19773,9 +19746,16 @@
overflow: auto;
}
-.osbp .v-panel-os-has-focus {
- border-color: #f5863c;
- border-width: 1px;
+.osbp .v-panel-os-has-focus > .v-panel-content:after {
+ box-shadow: inset 0px 0px 8px #f5863c;
+ content: "";
+ display: block;
+ height: 100%;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 99;
}
.osbp .l-control .v-table {
@@ -19854,6 +19834,41 @@
width: 100% !important;
}
+.osbp .l-control .v-component-group .v-button, .osbp .l-control .l-beansearchfield .v-button, .osbp .toptrimbar .v-component-group .v-button, .osbp .toptrimbar .l-beansearchfield .v-button, .osbp .os-selection-area .v-component-group .v-button, .osbp .os-selection-area .l-beansearchfield .v-button {
+ cursor: pointer;
+ text-align: center;
+ width: 22px !important;
+ height: 22px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #ededed;
+ color: #424242;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+
+.osbp .l-control .v-component-group .v-button:hover, .osbp .l-control .l-beansearchfield .v-button:hover, .osbp .toptrimbar .v-component-group .v-button:hover, .osbp .toptrimbar .l-beansearchfield .v-button:hover, .osbp .os-selection-area .v-component-group .v-button:hover, .osbp .os-selection-area .l-beansearchfield .v-button:hover {
+ border-bottom-color: #f5863c !important;
+}
+
+.osbp .l-control .v-component-group .v-button:after, .osbp .l-control .l-beansearchfield .v-button:after, .osbp .toptrimbar .v-component-group .v-button:after, .osbp .toptrimbar .l-beansearchfield .v-button:after, .osbp .os-selection-area .v-component-group .v-button:after, .osbp .os-selection-area .l-beansearchfield .v-button:after {
+ right: 0px !important;
+}
+
+.osbp .l-control .v-component-group .v-button img, .osbp .l-control .l-beansearchfield .v-button img, .osbp .toptrimbar .v-component-group .v-button img, .osbp .toptrimbar .l-beansearchfield .v-button img, .osbp .os-selection-area .v-component-group .v-button img, .osbp .os-selection-area .l-beansearchfield .v-button img {
+ display: none;
+}
+
+.osbp .l-control .v-formlayout-row .v-customcomponent .v-label, .osbp .toptrimbar .v-formlayout-row .v-customcomponent .v-label, .osbp .os-selection-area .v-formlayout-row .v-customcomponent .v-label {
+ min-height: 21px;
+ line-height: 21px;
+}
+
+.osbp .l-control .v-formlayout-row .v-slider, .osbp .toptrimbar .v-formlayout-row .v-slider, .osbp .os-selection-area .v-formlayout-row .v-slider {
+ border-bottom: 1px solid #d4d4d4;
+}
+
.osbp .l-control .v-formlayout-captioncell, .osbp .l-control .v-formlayout-errorcell, .osbp .toptrimbar .v-formlayout-captioncell, .osbp .toptrimbar .v-formlayout-errorcell, .osbp .os-selection-area .v-formlayout-captioncell, .osbp .os-selection-area .v-formlayout-errorcell {
border-bottom: 1px solid #d4d4d4;
vertical-align: bottom;
@@ -19865,10 +19880,11 @@
.osbp .l-control .v-formlayout-contentcell > .v-customcomponent, .osbp .toptrimbar .v-formlayout-contentcell > .v-customcomponent, .osbp .os-selection-area .v-formlayout-contentcell > .v-customcomponent {
width: 100%;
+ border-bottom: 1px solid #d4d4d4;
}
-.osbp .l-control .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-label, .osbp .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-label {
- border-bottom: 1px solid #d4d4d4;
+.osbp .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp .l-control .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp .l-control .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp .toptrimbar .v-formlayout-contentcell > .v-customcomponent .v-textfield, .osbp .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect-input, .osbp .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-filterselect [class*="input"], .osbp .os-selection-area .v-formlayout-contentcell > .v-customcomponent .v-textfield {
+ border-bottom-width: 0px;
}
.osbp .l-control .v-textfield, .osbp .toptrimbar .v-textfield, .osbp .os-selection-area .v-textfield {
@@ -19895,6 +19911,7 @@
border-right: transparent;
-webkit-box-shadow: none;
box-shadow: none;
+ height: 22px;
}
.osbp .l-control .v-filterselect-input:focus, .osbp .l-control .v-filterselect [class*="input"]:focus, .osbp .toptrimbar .v-filterselect-input:focus, .osbp .toptrimbar .v-filterselect [class*="input"]:focus, .osbp .os-selection-area .v-filterselect-input:focus, .osbp .os-selection-area .v-filterselect [class*="input"]:focus {
@@ -19918,18 +19935,15 @@
background: transparent;
border: 0px;
float: none;
- margin-left: 0px;
- padding: 0px;
- padding-left: 6px;
- font-weight: normal;
- color: #424242;
- border-width: 0px;
- background-color: #ededed;
- border-left: 1px solid #d4d4d4;
- border-bottom: 1px solid #d4d4d4;
- outline: 0;
- height: 22px;
cursor: pointer;
+ text-align: center;
+ width: 22px !important;
+ height: 22px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #ededed;
+ color: #424242;
+ outline: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
@@ -19943,6 +19957,14 @@
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1);
}
+.osbp .l-control .l-beansearchfield button:hover, .osbp .l-control .l-beansearchfield .v-nativebutton:hover, .osbp .toptrimbar .l-beansearchfield button:hover, .osbp .toptrimbar .l-beansearchfield .v-nativebutton:hover, .osbp .os-selection-area .l-beansearchfield button:hover, .osbp .os-selection-area .l-beansearchfield .v-nativebutton:hover {
+ border-bottom-color: #f5863c !important;
+}
+
+.osbp .l-control .l-beansearchfield button:after, .osbp .l-control .l-beansearchfield .v-nativebutton:after, .osbp .toptrimbar .l-beansearchfield button:after, .osbp .toptrimbar .l-beansearchfield .v-nativebutton:after, .osbp .os-selection-area .l-beansearchfield button:after, .osbp .os-selection-area .l-beansearchfield .v-nativebutton:after {
+ right: 0px !important;
+}
+
.osbp .l-control .l-beansearchfield button img, .osbp .l-control .l-beansearchfield .v-nativebutton img, .osbp .toptrimbar .l-beansearchfield button img, .osbp .toptrimbar .l-beansearchfield .v-nativebutton img, .osbp .os-selection-area .l-beansearchfield button img, .osbp .os-selection-area .l-beansearchfield .v-nativebutton img {
display: none;
}
@@ -20111,10 +20133,22 @@
background: #ededed;
}
+.osbp .v-accordion-item-content .v-gridlayout-slot {
+ position: relative;
+}
+
+.osbp .v-accordion-item-content .v-formlayout-contentcell .v-gridlayout .v-gridlayout-slot {
+ position: absolute;
+}
+
.osbp .v-popupbutton-popup-os-usermenubutton.v-popupview-popup {
padding: 0px;
}
+.osbp .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion {
+ width: auto !important;
+}
+
.osbp .v-popupbutton-popup-os-usermenubutton.v-popupview-popup .v-accordion [class*='os-menutree-'] > .v-tree {
width: 100% !important;
}
@@ -20353,6 +20387,7 @@
.osbp .osbpsidebar .menu {
padding: 11px;
+ padding-top: 0px;
}
.osbp .osbpsidebar .branding {
@@ -20363,9 +20398,8 @@
overflow: hidden;
white-space: nowrap;
color: #424242;
- line-height: 29.4px;
+ line-height: 140%;
letter-spacing: 0em !important;
- min-width: 154px;
}
.osbp .l-csslayout {
@@ -21048,7 +21082,6 @@
.osbp .o-XSuggestBox {
background-color: #ededed;
- height: 22px;
}
.osbp .o-XSuggestBox > .v-textfield {
@@ -21057,6 +21090,7 @@
border-left: transparent;
border-right: transparent;
width: 198px;
+ height: 22px !important;
}
.osbp .o-XSuggestBox > .v-textfield:focus {
@@ -21070,25 +21104,36 @@
.osbp .o-XSuggestBox .enableSuggestions {
cursor: pointer;
- border-bottom: 1px solid #d4d4d4 !important;
- height: 21px;
text-align: center;
- width: 22px;
+ width: 22px !important;
+ height: 22px;
+ padding: 0px;
+ margin: 0px;
+ background-color: #ededed;
+ color: #424242;
+ outline: 0;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+ border-bottom: 1px solid #d4d4d4;
+ height: 21px;
background: transparent;
border: 0px;
float: none;
float: right;
}
-.osbp .o-XSuggestBox .enableSuggestions:focus {
- background-color: #fac29d !important;
- color: #f5863c;
-}
-
.osbp .o-XSuggestBox .enableSuggestions:hover {
border-bottom-color: #f5863c !important;
}
+.osbp .o-XSuggestBox .enableSuggestions:after {
+ right: 0px !important;
+}
+
+.osbp .o-XSuggestBox .enableSuggestions img {
+ display: none;
+}
+
.osbp .o-XSuggestBox .enableSuggestions:before {
font-family: FontAwesome;
font-size: 14px;
diff --git a/org.eclipse.osbp.themes/scss/_variables-cxo.scss b/org.eclipse.osbp.themes/scss/_variables-cxo.scss
index 3355ee9..5a2c8f9 100644
--- a/org.eclipse.osbp.themes/scss/_variables-cxo.scss
+++ b/org.eclipse.osbp.themes/scss/_variables-cxo.scss
@@ -24,7 +24,7 @@
$v-focus-color: #ffd210;
$v-font-family: Arial;
/* $v-font-size: 12px; */
-/* $v-line-height: $v-font-size * 1.75; //$os-line-height-factor: 1.6; */
+$v-line-height: $v-font-size * 1.75; //$os-line-height-factor: 1.6;
/* $v-loading-indicator-bar-height: $v-unit-size; */
/* $v-loading-indicator-color: $v-focus-color; */
diff --git a/org.eclipse.osbp.themes/scss/addons/_suggesttext.scss b/org.eclipse.osbp.themes/scss/addons/_suggesttext.scss
index 8e1d988..3f166a6 100644
--- a/org.eclipse.osbp.themes/scss/addons/_suggesttext.scss
+++ b/org.eclipse.osbp.themes/scss/addons/_suggesttext.scss
@@ -33,28 +33,16 @@
.o-XSuggestBox {
background-color: $os-textfield-shade;
- height: $v-unit-size;
> .v-textfield {
@include os-textfield;
- width: $v-default-field-width - $v-unit-size ;
+ width: $v-default-field-width - $v-unit-size ;
+ height: $v-unit-size !important;
}
.enableSuggestions {
- cursor: pointer;
- border-bottom: $v-border !important;
- height: $v-unit-size - first-number($v-border);
-
- &:focus{
- background-color: $os-focus-color !important;
- color: $v-focus-color;
- }
- &:hover{
- border-bottom-color: $v-focus-color !important;
- }
-
-
- text-align: center;
- width: $v-unit-size;
+ @include os-button-in-disguise;
+ border-bottom: $v-border;
+ height: $v-unit-size - first-number($v-border); /* apparently behaves differently here... */
@include os-icon-font($content: '\f08d');
float: right;
}
diff --git a/org.eclipse.osbp.themes/scss/components/_button.scss b/org.eclipse.osbp.themes/scss/components/_button.scss
index e9c5047..46e135d 100644
--- a/org.eclipse.osbp.themes/scss/components/_button.scss
+++ b/org.eclipse.osbp.themes/scss/components/_button.scss
@@ -260,10 +260,9 @@
margin: 4px 0px 4px 0px; //trbl
}
-
+/*
/// Button style modifier for buttons in dialog
@mixin os-button-l-beansearch {
- @include os-icon-font($content: '\f0b0');
margin-left: 0px;
padding: 0px;
padding-left: make_even($v-unit-size/4);
@@ -275,11 +274,35 @@
border-bottom: $v-border;
outline:0;
height: $v-unit-size;
-/* width: $v-unit-size !important; */
+ //width: $v-unit-size !important;
cursor: pointer;
img {display:none;}
@include box-shadow(none);
}
+ */
+/// Button style modifier for buttons inside fields
+@mixin os-button-in-disguise {
+ cursor: pointer;
+ text-align: center;
+ width: $v-unit-size !important;
+ height: $v-unit-size;
+ padding: 0px;
+ margin: 0px;
+ background-color: $os-textfield-shade;
+ color: valo-font-color($os-textfield-shade);
+ outline: 0;
+
+ &:hover {
+ border-bottom-color: $v-focus-color !important;
+ }
+ /// where is this set initially anyway?
+ &:after {
+ right: 0px !important;
+ }
+ @include box-shadow(none);
+ img {display:none;}
+
+ }
/// Sets button dimensions for POS/cash register application.
/// @param {number} $height-mod - [0] Factor 1-4 by which to increase the base height.
diff --git a/org.eclipse.osbp.themes/scss/components/_checkbox.scss b/org.eclipse.osbp.themes/scss/components/_checkbox.scss
index ab80835..db4900c 100644
--- a/org.eclipse.osbp.themes/scss/components/_checkbox.scss
+++ b/org.eclipse.osbp.themes/scss/components/_checkbox.scss
@@ -21,7 +21,7 @@
> input ~ label:before {
height: $v-unit-size;
border: 0px;
- border-bottom: $v-border !important;
+/* border-bottom: $v-border !important; */
background: $os-textfield-shade;
@include box-shadow(none); //valo mixin
}
diff --git a/org.eclipse.osbp.themes/scss/components/_focus.scss b/org.eclipse.osbp.themes/scss/components/_focus.scss
index 76bbf1a..1ca2b02 100644
--- a/org.eclipse.osbp.themes/scss/components/_focus.scss
+++ b/org.eclipse.osbp.themes/scss/components/_focus.scss
@@ -11,8 +11,22 @@
/// Focus style for panel borders.
/// @todo does this work?
@mixin os-panel-focus{
- border-color: $v-focus-color;
- border-width: 1px;
+/* border-color: $v-focus-color; */
+/* border-width: 1px; */
+/* border: 1px inset green; */
+/* box-sizing: border-box; */
+ & >.v-panel-content:after {
+ box-shadow: inset 0px 0px 8px $v-focus-color;
+ content: '';
+ display: block;
+ height: 100%;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 99;
+ }
+
}
/// @todo something's missing here...
diff --git a/org.eclipse.osbp.themes/scss/components/_popup.scss b/org.eclipse.osbp.themes/scss/components/_popup.scss
index 61d9580..5ec9a29 100644
--- a/org.eclipse.osbp.themes/scss/components/_popup.scss
+++ b/org.eclipse.osbp.themes/scss/components/_popup.scss
@@ -19,31 +19,31 @@
.v-window-contents {
padding-top: $v-line-height * $v-scaling-factor--large + $v-layout-spacing-vertical*2 !important;
}
- .v-window-closebox {
- @include os-icon-font ( //$font-family: 'Arial',
- $size: $v-font-size,
- $float: right,
- $content: '\2715');
- }
- .v-window-maximizebox {
- width: $v-unit-size * 1.2 !important;
- @include os-icon-font ( $size: $v-font-size,
- $float: right,
- $content: '\f096');
- border-bottom-left-radius: $v-unit-size *0.5;
- }
- .v-window-restorebox {
- width: $v-unit-size * 1.6 !important;
- @include os-icon-font ($float: right,
- $size: $v-font-size,
- $content: '\f24d',
- $mirror: true);
- border-bottom-right-radius: $v-unit-size *0.5;
- }
+/* .v-window-closebox { */
+/* @include os-icon-font ( //$font-family: 'Arial', */
+/* $size: $v-font-size, */
+/* $float: right, */
+/* $content: '\2715'); */
+/* } */
+/* .v-window-maximizebox { */
+/* width: $v-unit-size * 1.2 !important; */
+/* @include os-icon-font ( $size: $v-font-size, */
+/* $float: right, */
+/* $content: '\f096'); */
+/* border-bottom-left-radius: $v-unit-size *0.5; */
+/* } */
+/* .v-window-restorebox { */
+/* width: $v-unit-size * 1.6 !important; */
+/* @include os-icon-font ($float: right, */
+/* $size: $v-font-size, */
+/* $content: '\f24d', */
+/* $mirror: true); */
+/* border-bottom-right-radius: $v-unit-size *0.5; */
+/* } */
.v-window-closebox, .v-window-maximizebox, .v-window-restorebox {
- background-color: $os-light-contrast;
- height: $v-unit-size;
- color: valo-font-color($os-light-contrast);
+/* background-color: $os-light-contrast; */
+/* height: $v-unit-size; */
+/* color: valo-font-color($os-light-contrast); */
}
.v-window-closebox-disabled {
diff --git a/org.eclipse.osbp.themes/scss/components/_typeface.scss b/org.eclipse.osbp.themes/scss/components/_typeface.scss
index f553d69..75d67b9 100644
--- a/org.eclipse.osbp.themes/scss/components/_typeface.scss
+++ b/org.eclipse.osbp.themes/scss/components/_typeface.scss
@@ -102,22 +102,18 @@
/// Headings inside views.
@mixin os-typeface-view-h2 {
font-size: $v-font-size * $v-scaling-factor--large;
-/* padding: $v-unit-size * 0.4;
- margin: floor($v-unit-size/3);*/
padding: floor($v-unit-size/3);
font-weight: bold;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
- //background-color: $os-sub-header-bg;
- color: valo-font-color($os-sub-header-bg);
+ color: valo-font-color($os-sub-header-bg);
+ line-height: 100% * $v-scaling-factor--large;
+ letter-spacing: 0em !important;
+ /* min-width: $os-button-width; */
@if $os-theme-desig == "cxo" {
color: $os-h2-shade;
}
- line-height: $v-line-height * $v-scaling-factor--large;
- letter-spacing: 0em !important;
-// min-height: $os-button-height;
- min-width: $os-button-width;
}
/// Sidebar font style.
diff --git a/org.eclipse.osbp.themes/scss/layout/_cash-register.scss b/org.eclipse.osbp.themes/scss/layout/_cash-register.scss
index daa8d22..782dd09 100644
--- a/org.eclipse.osbp.themes/scss/layout/_cash-register.scss
+++ b/org.eclipse.osbp.themes/scss/layout/_cash-register.scss
@@ -88,7 +88,7 @@
height: $os-cash-zoom-factor * $v-unit-size - first-number($v-border);
width: $os-cash-zoom-factor * $v-unit-size;
- @include os-icon-font($content: '\f08d',
+ @include os-icon-font($content: '\f08d',
$size: $v-font-size * $os-cash-zoom-factor,
$line-height: $v-unit-size * $os-cash-zoom-factor);
float: right;
diff --git a/org.eclipse.osbp.themes/scss/layout/_dialog.scss b/org.eclipse.osbp.themes/scss/layout/_dialog.scss
index 4d60ce2..2e7fd70 100644
--- a/org.eclipse.osbp.themes/scss/layout/_dialog.scss
+++ b/org.eclipse.osbp.themes/scss/layout/_dialog.scss
@@ -14,21 +14,42 @@
font-size: $v-font-size;
}
- .v-slot-os-single-selection, .v-slot-os-multi-selection {
- background-color: $os-light-contrast;
- > .v-caption-on-top {
- >.v-caption {
- padding-bottom: 0px;
- >.v-captiontext {
- margin: floor($v-unit-size/3);
- margin-bottom: 0px;
+ .os-top-area {
+ display: flex;
+ align-items: center;
+ .v-slot-os-single-selection, .v-slot-os-multi-selection {
+ background-color: $os-light-contrast;
+/* height: $v-line-height * $v-scaling-factor--large; relative to os-typeface-view-h2 */
+ padding: floor($v-unit-size/3); /* same as os-typeface-view-h2 */
+/* display: block; */
+ .os-single-selection, .os-multi-selection {
+ vertical-align: text-top;
+ margin: 0px;
+ }
+ > .v-caption-on-top {
+ >.v-caption {
+ padding-bottom: 0px;
+ >.v-captiontext {
+ margin: floor($v-unit-size/3);
+ margin-bottom: 0px;
+ }
+ }
+ > .v-filterselect {
+/* margin: 0px; */
}
}
- > .v-filterselect {
- margin-top: 0px;
- }
}
- }
+ }
+ .os-side-area {
+ .v-caption-on-top {
+ background-color: $os-light-contrast;
+ >.v-caption {
+ @include os-typeface-view-h2;
+ font-size: $v-font-size;
+ line-height: 100%;
+ }
+ }
+ }
/* checkbox workaround */
.v-formlayout-row {
@@ -167,6 +188,9 @@
font-size: $v-font-size;
}
+ .v-caption-os-constraint {
+/* @include os-icon-font($content: '\f532',$placement: after); */
+ }
.v-caption-on-top >.v-caption,
.v-gridlayout-slot >.v-caption {
padding-bottom: round($v-unit-size*0.05);
@@ -191,12 +215,23 @@
width: 100% !important;
}
}
- }
+ .v-button {
+ @include os-button-in-disguise;
+/* @include os-button-l-beansearch; */
+ }
+ }
- .v-formlayout-row .v-customcomponent .v-label {
- /* ? */
-
- }
+ .v-formlayout-row {
+ .v-customcomponent {
+ .v-label {
+ min-height: $v-unit-size - first-number($v-border);
+ line-height: $v-unit-size - first-number($v-border);
+ }
+ }
+ .v-slider {
+ border-bottom: $v-border;
+ }
+ }
.v-formlayout-captioncell,
.v-formlayout-errorcell {
@@ -211,11 +246,12 @@
.v-formlayout-contentcell >.v-customcomponent {
width: 100%;
-/* .v-filterselect-input, .v-filterselect [class*="input"] { */
-/* border-bottom-width: 0px; */
-/* } */
+ border-bottom: $v-border;
+ .v-filterselect-input, .v-filterselect [class*="input"], .v-textfield {
+ border-bottom-width: 0px;
+ }
.v-label {
- border-bottom: $v-border;
+/* border-bottom: $v-border; */
}
}
@@ -231,6 +267,7 @@
@include os-textfield;
/* border-bottom: $v-border; */
@include box-shadow(none);
+ height: $v-unit-size;
}
.v-filterselect.v-widget.os-combobox-with-icon .v-icon, .v-filterselect-os-box .v-icon {
/* language selection icon position (header) */
@@ -243,7 +280,9 @@
.l-beansearchfield {
button, .v-nativebutton {
- @include os-button-l-beansearch;
+/* @include os-button-l-beansearch; */
+ @include os-icon-font($content: '\f0b0'); /* put before button style, else background transparent */
+ @include os-button-in-disguise;
}
}
diff --git a/org.eclipse.osbp.themes/scss/layout/_pageframe.scss b/org.eclipse.osbp.themes/scss/layout/_pageframe.scss
index c99fb7b..08498ed 100644
--- a/org.eclipse.osbp.themes/scss/layout/_pageframe.scss
+++ b/org.eclipse.osbp.themes/scss/layout/_pageframe.scss
@@ -116,13 +116,17 @@
/* popup with full content */
- .popupContent {
- @include os-popup-perspective;
- }
-/* &.v-overlay-container>.v-window { */
-/* height: auto !important; */
-/* width: auto !important; */
-/* } */
+ &.v-overlay-container >.v-window {
+ height: auto !important;
+ width: auto !important;
+ /// popup/overlay container expands/shrinks with content
+ .v-widget {
+ position: relative !important;
+ }
+ .popupContent {
+ @include os-popup-perspective;
+ }
+ }
// panel default style without borders
.v-panel {
diff --git a/org.eclipse.osbp.themes/scss/layout/_sidebar.scss b/org.eclipse.osbp.themes/scss/layout/_sidebar.scss
index f141959..353b091 100644
--- a/org.eclipse.osbp.themes/scss/layout/_sidebar.scss
+++ b/org.eclipse.osbp.themes/scss/layout/_sidebar.scss
@@ -16,7 +16,8 @@
}
}
.menu {
- padding: $os-layout-margin;
+ padding: $os-layout-margin;
+ padding-top: 0px;
}
.branding {
@include os-typeface-view-h2;
diff --git a/org.eclipse.osbp.themes/scss/layout/_tabsheet.scss b/org.eclipse.osbp.themes/scss/layout/_tabsheet.scss
index a541690..022ac71 100644
--- a/org.eclipse.osbp.themes/scss/layout/_tabsheet.scss
+++ b/org.eclipse.osbp.themes/scss/layout/_tabsheet.scss
@@ -77,6 +77,11 @@
}
}
+ /// assuming this is always without minimize/maximize buttons: remove right offset!
+ .os-data-area .v-tabsheet-scroller {
+ right: 0px;
+ }
+
.v-tabsheet-tabcontainer {
background: $os-splitter-shade;
&:before {
diff --git a/org.eclipse.osbp.themes/scss/layout/_user.scss b/org.eclipse.osbp.themes/scss/layout/_user.scss
index e3fe865..cd42c5a 100644
--- a/org.eclipse.osbp.themes/scss/layout/_user.scss
+++ b/org.eclipse.osbp.themes/scss/layout/_user.scss
@@ -213,10 +213,23 @@
background: $os-light-contrast;
}
+ /// Makes accordion container expand with content.
+ .v-accordion-item-content {
+ .v-gridlayout-slot {
+ position: relative;
+ }
+ .v-formlayout-contentcell .v-gridlayout .v-gridlayout-slot {
+ position: absolute;
+ }
+ }
+
.v-popupbutton-popup-os-usermenubutton.v-popupview-popup {
padding: 0px;
.v-accordion {
+ width: auto !Important;
+/* min-width: 500px; */
+
[class*='os-menutree-'] {
> .v-tree {
width: 100% !important;
diff --git a/org.eclipse.osbp.themes/scss/osbp-cxo.scss b/org.eclipse.osbp.themes/scss/osbp-cxo.scss
index 857b66d..407ef84 100644
--- a/org.eclipse.osbp.themes/scss/osbp-cxo.scss
+++ b/org.eclipse.osbp.themes/scss/osbp-cxo.scss
@@ -24,8 +24,9 @@
@include os-user-accordion;
//@include os-birt-report;
@include os-icons;
- //@include os-sidebar;
- @include os-sidebar-table-variant;
+ //@include os-sidebar;
+ //@include os-sidebar-table-variant;
+ @include os-sidebar-buttonpanel;
@include os-responsive;
@include os-gridview;
@include os-grid-util;
diff --git a/org.eclipse.osbp.themes/scss/osbp-tea.scss b/org.eclipse.osbp.themes/scss/osbp-tea.scss
index fc41608..486d68d 100644
--- a/org.eclipse.osbp.themes/scss/osbp-tea.scss
+++ b/org.eclipse.osbp.themes/scss/osbp-tea.scss
@@ -23,8 +23,9 @@
@include os-user-accordion;
//@include os-birt-report;
@include os-icons;
- //@include os-sidebar;
- @include os-sidebar-table-variant;
+ //@include os-sidebar;
+ //@include os-sidebar-table-variant;
+ @include os-sidebar-buttonpanel;
@include os-responsive;
@include os-gridview;
@include os-grid-util;
