mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fix issue where icon picker widget buttons don't appear within fancy layout

Browse Source
This commit is contained in:
Ben Thomson 2023-01-24 20:31:39 +08:00
parent 45e2acc795
commit bcb7817e03
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/backend/assets/css/winter.css
View File

@ -1065,22 +1065,22 @@ body.breadcrumb-fancy .control-breadcrumb li:last-child,
.control-breadcrumb.breadcrumb-fancy li:last-child{background-color:#d66908}
body.breadcrumb-fancy .control-breadcrumb li:last-child:before,
.control-breadcrumb.breadcrumb-fancy li:last-child:before{opacity:1;border-left-color:#d66908}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons{-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:14px;padding-bottom:5px}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background:transparent;color:#fff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn:hover,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn:hover{opacity:1;filter:alpha(opacity=100)}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn:last-child,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn:last-child{margin-right:0}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class^="wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class^="wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class*=" wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class*=" wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class^="oc-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class^="oc-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class*=" oc-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class*=" oc-icon-"]:before{opacity:1}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized),
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized){-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:14px;padding-bottom:5px}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background:transparent;color:#fff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn:hover,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn:hover{opacity:1;filter:alpha(opacity=100)}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn:last-child,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn:last-child{margin-right:0}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class^="wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class^="wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class*=" wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class*=" wn-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class^="oc-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class^="oc-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class*=" oc-icon-"]:before,
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class*=" oc-icon-"]:before{opacity:1}
.fancy-layout form[class$="-data-changed"] *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .btn.save{opacity:1;filter:alpha(opacity=100)}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs>.tab-content>.tab-pane>.form-group>.field-codeeditor{border:none !important;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs>.tab-content>.tab-pane>.form-group>.field-codeeditor .editor-code{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}

4
modules/backend/assets/less/layout/fancylayout.less
View File

@ -641,8 +641,8 @@ body.breadcrumb-fancy .control-breadcrumb,
// --- FORM BUTTONS
//
.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .control-tabs .form-buttons,
.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .form-tabless-fields .form-buttons {
.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .control-tabs .form-buttons:not(.normalized),
.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .form-tabless-fields .form-buttons:not(.normalized) {
.transition(all 0.5s);
padding-top: 14px;
padding-bottom: 5px;

2
modules/backend/formwidgets/iconpicker/assets/dist/iconpicker.js vendored
View File

File diff suppressed because one or more lines are too long

2
modules/backend/formwidgets/iconpicker/assets/src/components/IconPicker.vue
View File

@ -66,7 +66,7 @@
</div>
</div>
</div>
<div class="form-buttons aim-modal--footer">
<div class="form-buttons normalized aim-modal--footer">
<button class="btn btn-primary aim-insert-icon-button" @click="insert">Insert</button>
<button class="btn btn-secondary no-margin-right" @click="closePicker">Close</button>
</div>