Skip to content

Commit

Permalink
Fix z-index on action-container for ListPart (OrchardCMS#14868)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikeAlhayek @urbanit
MikeAlhayek authored and urbanit committed Mar 18, 2024
1 parent 9c44c9d commit ed3a70f
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 32 deletions.
4 changes: 2 additions & 2 deletions src/OrchardCore.Themes/TheAdmin/Assets/scss/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ $dropdown-max-height: 250px !default;
--oc-editor-fullscreen: #{$zindex-modal - 1};
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: #{$zindex-dropdown - 17};
--oc-second-action-bar-zindex: #{$zindex-dropdown - 20};
--oc-action-bar-zindex: #{$zindex-dropdown - 20};
--oc-second-action-bar-zindex: #{$zindex-dropdown - 17};
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: #{$zindex-dropdown};
--bs-zindex-fixed: #{$zindex-fixed};
Expand Down
4 changes: 0 additions & 4 deletions src/OrchardCore.Themes/TheAdmin/Assets/scss/components/_list-group.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
.with-checkbox .list-group-item {
padding: 0.75rem 0.5rem;
}

.list-group-item + .list-group-item {
border-top-width: 0;
}
36 changes: 16 additions & 20 deletions src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -60,8 +60,8 @@
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -206,8 +206,8 @@ a:hover {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -688,8 +688,8 @@ html[dir=rtl] .bootstrap-select .bs-ok-default:after {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -786,8 +786,8 @@ html[dir=rtl] .bootstrap-select .bs-ok-default:after {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -7966,10 +7966,6 @@ input[type=password]::-ms-clear {
padding: 0.75rem 0.5rem;
}

.list-group-item + .list-group-item {
border-top-width: 0;
}

.monaco-editor {
--vscode-foreground: var(--bs-body-color) !important;
--vscode-editor-background: var(--bs-body-bg) !important;
Expand Down Expand Up @@ -8474,8 +8470,8 @@ ul.pager {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -8516,8 +8512,8 @@ ul.ui-sortable:not(:has(> li)) {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -8893,8 +8889,8 @@ textarea.form-control.input-validation-error {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Themes/TheAdmin/wwwroot/css/TheAdmin.min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/OrchardCore.Themes/TheAdmin/wwwroot/css/admin-layout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down Expand Up @@ -123,8 +123,8 @@ body {
--oc-editor-fullscreen: 1054;
--oc-selected-indicator-color: var(--bs-primary);
/* Action bar should always be less than dropdown menu */
--oc-action-bar-zindex: 983;
--oc-second-action-bar-zindex: 980;
--oc-action-bar-zindex: 980;
--oc-second-action-bar-zindex: 983;
/* Undefined Bootstrap variables */
--bs-dropdown-zindex: 1000;
--bs-zindex-fixed: 1030;
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Themes/TheAdmin/wwwroot/css/admin-layout.min.css
View file

Large diffs are not rendered by default.

0 comments on commit ed3a70f

Please sign in to comment.