Skip to content

Commit a61f3a3

Browse files
committed
[merge 7.6] Sao: Theme adaptation
1 parent 63eba55 commit a61f3a3

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

sao/src/theme/coog/sao.less

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
}
118118

119119
> div.panel-body.coog-hidden-toolbar:has(> div.screen-container > div.content-box > div > div.treeview),
120-
> div.panel-body.coog-hidden-toolbar:has(> div.screen-container > div.content-box > div > div.form-item.form-one2many) {
120+
> div.panel-body.coog-hidden-toolbar:has(> div.screen-container > div.content-box > div > div.form-item:has( > div.form-one2many)) {
121121
box-shadow: @coog-box-shadow;
122122
margin-bottom: 5px;
123123
margin-top: 5px;
@@ -454,7 +454,7 @@ ul.dropdown-menu > li > a {
454454
///////////////////////////////////////////////////////////////////////////////
455455
// One2Many
456456
///////////////////////////////////////////////////////////////////////////////
457-
div.form-item.form-one2many {
457+
div.form-item:has(> div.form-one2many) {
458458
.coog-xxx2many-mixin();
459459
}
460460

@@ -471,7 +471,7 @@ ul.list-group.list-form {
471471
///////////////////////////////////////////////////////////////////////////////
472472
// Many2Many
473473
///////////////////////////////////////////////////////////////////////////////
474-
div.form-item.form-many2many {
474+
div.form-item:has( > div.form-many2many) {
475475
.coog-xxx2many-mixin();
476476
}
477477

@@ -483,7 +483,7 @@ div.form-dict {
483483
margin-bottom: @coog-card-bottom-padding;
484484

485485
// Apply readonly value of dict field to values
486-
.readonly {
486+
&.readonly {
487487
input.form-control, select.form-control {
488488
.coog-readonly-field-mixin();
489489
}
@@ -515,7 +515,7 @@ div.form-dict {
515515
///////////////////////////////////////////////////////////////////////////////
516516

517517
// Style group headers as dicts
518-
div.form-item.form-group_:has(> fieldset.form-group_ > legend) {
518+
div.form-item:has(> fieldset.form-group_ > legend) {
519519
padding-bottom: 5px;
520520

521521
// "legends" are special and default style is weird, transform the style to
@@ -595,8 +595,8 @@ div.form-item.form-group_:has(> fieldset.form-group_ > legend) {
595595
}
596596

597597
// Improve vertical usage of groups with only one item
598-
div.form-item.form-group_:not(.yfill):has(> *:only-child), div.form-item.form-dict {
599-
align-items: start;
598+
div.form-item:not(.yfill):has(> *:only-child), div.form-item.form-dict {
599+
align-items: center;
600600
> * {
601601
height: auto;
602602
}
@@ -615,7 +615,7 @@ div.form-group-expandable {
615615
}
616616

617617
// Remove all padding from groups without a legend
618-
div.form-item.form-group_:not(:has(> fieldset.form-group_ > legend)) {
618+
div.form-item:not(:has(> fieldset.form-group_ > legend)) {
619619
padding: 0px;
620620
}
621621

@@ -689,8 +689,8 @@ div.form-many2one, div.form-selection, div.form-date, div.form-datetime,
689689
div.form-char {
690690
padding: 0px 10px 0px 0px;
691691

692-
.readonly {
693-
.input-group, select.form-control:disabled {
692+
&.readonly {
693+
> div.input-group, select.form-control:disabled {
694694
.coog-readonly-field-mixin();
695695
background-image: none;
696696
border-right: unset;
@@ -704,7 +704,7 @@ div.form-char {
704704
div.form-float, div.form-integer {
705705
padding: 0px 10px 0px 0px;
706706

707-
.readonly {
707+
&.readonly {
708708
.input-group > input {
709709
.coog-readonly-field-mixin();
710710
}
@@ -747,7 +747,7 @@ div.form-text {
747747
}
748748
}
749749
// highlight readonly text contents
750-
.readonly {
750+
&.readonly {
751751
textarea.form-control {
752752
.coog-readonly-field-mixin();
753753
}
@@ -841,7 +841,7 @@ div.form-boolean > input[type=checkbox].input-checkbox.form-control[readonly] {
841841

842842
// Use all space for XXX2Many which are the sole item in a notebook page
843843
.tab-pane.active > div.form-container:has(> div.form-one2many:only-child) {
844-
> div.form-item.form-one2many {
844+
> div.form-item:has( > div.form-one2many) {
845845
padding-top: 0px;
846846
> div.form-one2many.panel {
847847
margin-left: 0px;
@@ -850,7 +850,7 @@ div.form-boolean > input[type=checkbox].input-checkbox.form-control[readonly] {
850850
}
851851
}
852852
.tab-pane.active > div.form-container:has(> div.form-many2many:only-child) {
853-
> div.form-item.form-many2many {
853+
> div.form-item:has( > div.form-many2many) {
854854
padding-top: 0px;
855855
> div.form-many2many.panel {
856856
margin-left: 0px;
@@ -940,6 +940,7 @@ ul.CodeMirror-hints {
940940
div.form-notebook > ul.nav.nav-tabs {
941941
margin-bottom: 8px;
942942
border-color: @color-lighter-blue;
943+
background-color: @color-white;
943944
> li {
944945
> a {
945946
padding: 8px 8px;

0 commit comments

Comments
 (0)