yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected colors for buttons + disable select-image button in media-picker if nothing is selected

Browse Source
This commit is contained in:
Niels Lyngsø
2019-02-12 11:57:43 +01:00
parent e4a492dc57
commit 20dc1b5c10
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/less/buttons.less
View File

@@ -191,13 +191,13 @@ input[type="button"] {
.btn-success {
.buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight, @btnSuccessType);
}
// Info appears as a neutral blue
// Info appears as a sand color
.btn-info {
.buttonBackground(@sand-5, @blueDark, @blueExtraDark, @u-white);
.buttonBackground(@sand-5, @sand-6, @blueExtraDark, @blueMid);
}
// Made for Umbraco, 2019
.btn-action {
.buttonBackground(@blueExtraDark, @blueDark, @pinkLight, @u-white);
.buttonBackground(@blueExtraDark, @blueDark, @white, @u-white);
}
// Made for Umbraco, 2019
.btn-selection {
@@ -236,11 +236,11 @@ input[type="button"] {
padding: 15px 50px;
font-size: 16px;
border: none;
background: @green;
background: @ui-btn-positive;
color: @white;
font-weight: bold;
&:hover {
background: @green-d1;
background: @ui-btn-positive-hover;
}
}

2
src/Umbraco.Web.UI.Client/src/less/mixins.less
View File

@@ -539,7 +539,7 @@
&.disabled, &[disabled] {
color: @white;
background-color: @sand-2;
background-color: @sand-1;
}
/*
// IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves

9
src/Umbraco.Web.UI.Client/src/less/variables.less
View File

@@ -76,9 +76,10 @@
@gray-10: #F3F3F5;
@gray-11: #F6F6F7;
@sand-1: hsl(22, 33%, 93%);// added 2019
@sand-1: hsl(22, 18%, 84%);// added 2019
@sand-2: hsl(22, 34%, 88%);// added 2019
@sand-5: hsl(22, 31%, 93%);// added 2019
@sand-6: hsl(22, 29%, 95%);// added 2019
@sand-7: hsl(22, 26%, 97%);// added 2019
@@ -138,8 +139,8 @@
@ui-active-type: @blueExtraDark;
@ui-active-type-hover: @blueMid;
@ui-selected: @sand-1;
@ui-selected-hover: ligthen(@sand-1, 10);
@ui-selected: @sand-5;
@ui-selected-hover: ligthen(@sand-5, 10);
@ui-selected-type: @blueExtraDark;
@ui-selected-type-hover: @blueMid;
@ui-selected-border: @pinkLight;
@@ -176,7 +177,7 @@
@ui-btn-type: @white;
@ui-btn-positive: @green;
@ui-btn-positive-hover: @green-l1;
@ui-btn-positive-hover: lighten(@green, 6%);
@ui-btn-positive-type: @white;
@ui-btn-negative: @red;

1
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.html
View File

@@ -180,6 +180,7 @@
button-style="success"
label="Select image"
type="button"
disabled="model.selection.length === 0"
action="submit(model)">
</umb-button>