Compare commits

...

4 Commits

Author SHA1 Message Date
Niels Lyngsø dbb99c2e6b use btn style action for consistency + cleaning button styles 2019-03-19 14:19:34 +01:00
Niels Lyngsø 61c76dc28b Merge remote-tracking branch 'origin/dev-v8' into temp8-4621-consistent-create-buttons 2019-03-19 13:54:03 +01:00
Niels Lyngsø 9e7a062671 Merge branch 'dev-v8' into temp8-4621-consistent-create-buttons 2019-03-19 08:10:18 +01:00
Niels Lyngsø a9fa049183 #4621 consistent create button colors 2019-02-18 15:28:33 +01:00
4 changed files with 9 additions and 12 deletions
@@ -195,12 +195,9 @@ input[type="button"] {
}
// Made for Umbraco, 2019
.btn-action {
.buttonBackground(@blueExtraDark, @blueDark, @white, @u-white);
}
// Made for Umbraco, 2019
.btn-selection {
@btnSelectionBackgroundHover: darken(@pinkLight, 10%);
.buttonBackground(@pinkLight, @btnSelectionBackgroundHover, @blueExtraDark, @blueDark);
.buttonBackground(@blueExtraDark, lighten(@blueExtraDark, 10), @white, @u-white);
transition: background-color 240ms;
font-weight: 700;
}
// Made for Umbraco, 2019, used for buttons that has to stand back.
.btn-white {
@@ -1,7 +1,7 @@
.umb-editor-sub-header {
padding: 10px 0;
margin-bottom: 10px;
background: @gray-10;
background: @brownGrayLight;
display: flex;
justify-content: space-between;
margin-top: -10px;
@@ -12,7 +12,7 @@
&.nested {
margin-top: 0;
margin-bottom: 0;
background: @gray-10;
background: @brownGrayLight;
}
}
@@ -16,7 +16,7 @@
<umb-editor-sub-header>
<umb-editor-sub-header-content-left>
<umb-button button-style="success"
<umb-button button-style="action"
type="button"
action="vm.addLanguage()"
label-key="languages_addLanguage">
@@ -13,13 +13,13 @@
<umb-editor-sub-header-section ng-if="(listViewAllowedTypes && listViewAllowedTypes.length > 0 && (selection.length == 0)) && (currentNodePermissions == null || currentNodePermissions.canCreate)">
<div class="btn-group" ng-show="createAllowedButtonSingle">
<a class="btn btn-white" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
<a class="btn btn-action" ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
<localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
</a>
</div>
<div class="btn-group" ng-show="createAllowedButtonSingleWithBlueprints">
<a class="btn btn-white dropdown-toggle" data-toggle="dropdown" ng-href="">
<a class="btn btn-action dropdown-toggle" data-toggle="dropdown" ng-href="">
<span ng-click="createBlank(entityType,listViewAllowedTypes[0].alias)">
<localize key="actions_create">Create</localize> {{listViewAllowedTypes[0].name}}
</span>
@@ -37,7 +37,7 @@
</div>
<div class="btn-group" ng-show="createAllowedButtonMultiWithBlueprints">
<a class="btn btn-white dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
<a class="btn btn-action dropdown-toggle" data-toggle="dropdown" ng-href="" ng-click="page.createDropdownOpen = !page.createDropdownOpen">
<localize key="actions_create">Create</localize>
<span class="caret"></span>
</a>