better button colors/position of page edit

This commit is contained in:
Andy Miller
2019-09-18 07:35:09 -06:00
parent 975bde25a0
commit dad2d4fe29
8 changed files with 32 additions and 18 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -490,12 +490,24 @@ tr {
background: $toolbar-bg; background: $toolbar-bg;
color: $toolbar-text; color: $toolbar-text;
.button-bar { .button-bar {
a.button { .button {
@include button-color($button-bg, $button-text, false); @include button-color($button-bg, $button-text, false);
&.danger { &.danger {
@include button-color($critical-bg); @include button-color($critical-bg);
} }
&.success {
@include button-color($update-bg);
&.dropdown-toggle {
border-left-color: darken($update-bg, 7%);
}
& + .dropdown-menu {
background-color: $update-bg;
}
}
} }
span.button { span.button {
@include button-color(darken($toolbar-bg, 20%)) @include button-color(darken($toolbar-bg, 20%))

View File

@@ -4,7 +4,7 @@
.button-group { .button-group {
position: relative; position: relative;
display: inline-block; display: inline-flex;
vertical-align: top; vertical-align: top;
// real button // real button
@@ -36,9 +36,9 @@
border-bottom-left-radius: 0 !important; border-bottom-left-radius: 0 !important;
} }
.button + .button, .button + .button-group, .button-group + .button, .button-group + .button-group { //.button + .button, .button + .button-group, .button-group + .button, .button-group + .button-group {
margin-left: -3px; // margin-left: -3px;
} //}
&:last-child { &:last-child {
.dropdown-menu { .dropdown-menu {

View File

@@ -686,7 +686,7 @@
#admin-mode-toggle, #admin-lang-toggle { #admin-mode-toggle, #admin-lang-toggle {
@extend %vertical-align; @extend %vertical-align;
height: 38px; height: 38px;
display: inline-block; display: inline-flex;
vertical-align: inherit; vertical-align: inherit;
@include breakpoint(mobile-only) { @include breakpoint(mobile-only) {

View File

@@ -212,6 +212,12 @@
<a class="button hidden-mobile" href="{{ sib_url }}" title="{{ "PLUGIN_ADMIN.NEXT"|tu }}"><i class="fa fa-chevron-right"></i></a> <a class="button hidden-mobile" href="{{ sib_url }}" title="{{ "PLUGIN_ADMIN.NEXT"|tu }}"><i class="fa fa-chevron-right"></i></a>
{% endif %} {% endif %}
{% if warn %}
<a class="button danger" href="#delete" data-remodal-target="delete" data-delete-url="{{ uri.addNonce(page_url ~ '/task' ~ config.system.param_sep ~ 'delete', 'admin-form', 'admin-nonce') }}"><i class="fa fa-close"></i> {{ "PLUGIN_ADMIN.DELETE"|tu }}</a>
{% else %}
<a class="button danger disable-after-click" href="{{ uri.addNonce(uri.route(true) ~ '/task' ~ config.system.param_sep ~ 'delete', 'admin-form', 'admin-nonce') }}" class="page-delete" ><i class="fa fa-close"></i></a>
{% endif %}
<div class="button-group"> <div class="button-group">
<button type="button" class="button disabled" href="#modal" data-remodal-target="modal"> <button type="button" class="button disabled" href="#modal" data-remodal-target="modal">
<i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN.ADD"|tu }} <i class="fa fa-plus"></i> {{ "PLUGIN_ADMIN.ADD"|tu }}
@@ -233,26 +239,22 @@
{% if config.plugins['admin-pro'].enabled %} {% if config.plugins['admin-pro'].enabled %}
<a class="button" href="#" data-remodal-target="revisions"><i class="fa fa-history"></i> {{ "PLUGIN_ADMIN_PRO.REVISIONS"|tu }}</a> <a class="button" href="#" data-remodal-target="revisions"><i class="fa fa-history"></i> {{ "PLUGIN_ADMIN_PRO.REVISIONS"|tu }}</a>
{% endif %} {% endif %}
{% if warn %}
<a class="button" href="#delete" data-remodal-target="delete" data-delete-url="{{ uri.addNonce(page_url ~ '/task' ~ config.system.param_sep ~ 'delete', 'admin-form', 'admin-nonce') }}"><i class="fa fa-close"></i> {{ "PLUGIN_ADMIN.DELETE"|tu }}</a>
{% else %}
<a class="button disable-after-click" href="{{ uri.addNonce(uri.route(true) ~ '/task' ~ config.system.param_sep ~ 'delete', 'admin-form', 'admin-nonce') }}" class="page-delete" ><i class="fa fa-close"></i></a>
{% endif %}
{% endif %} {% endif %}
<div class="button-group"> <div class="button-group">
<button class="button" name="task" value="save" form="blueprints" type="submit"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN.SAVE"|tu }}</button> <button class="button success" name="task" value="save" form="blueprints" type="submit"><i class="fa fa-check"></i> {{ "PLUGIN_ADMIN.SAVE"|tu }}</button>
{% if exists and admin.multilang %} {% if exists and admin.multilang %}
{% set untranslated = context.untranslatedLanguages(true) %} {% set untranslated = context.untranslatedLanguages(true) %}
{% if untranslated %} {% if untranslated %}
<button type="button" class="button dropdown-toggle" data-toggle="dropdown"> <button type="button" class="button success dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i> <i class="fa fa-caret-down"></i>
</button> </button>
<ul class="dropdown-menu lang-switcher"> <ul class="dropdown-menu lang-switcher">
{% for langCode in untranslated %} {% for langCode in untranslated %}
{% set langName = admin.siteLanguages[langCode] %} {% set langName = admin.siteLanguages[langCode] %}
{% if langCode != page_lang %} {% if langCode != page_lang %}
<li><button class="button task" name="task" value="saveas" lang="{{langCode}}" form="blueprints" type="submit">{{ "PLUGIN_ADMIN.SAVE_AS"|tu }} {{ langName[:1]|upper ~ langName[1:] }}</button></li> <li><button class="button success task" name="task" value="saveas" lang="{{langCode}}" form="blueprints" type="submit">{{ "PLUGIN_ADMIN.SAVE_AS"|tu }} {{ langName[:1]|upper ~ langName[1:] }}</button></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>