Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renamed LESS variables with disgrete to discreet #4961

Merged
merged 1 commit into from
Mar 22, 2019
Merged

Renamed LESS variables with disgrete to discreet #4961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Umbraco.Web.UI.Client/src/less/components/editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,23 +167,23 @@ a.umb-editor-header__close-split-view:hover {
text-decoration: none !important;
font-size: 13px;
//color: @gray-4;
color: @ui-action-disgrete-type;
color: @ui-action-discreet-type;
//background-color: @white;
}

a.umb-variant-switcher__toggle {
transition: color 0.2s ease-in-out;
&:hover {
//background-color: @gray-10;
color: @ui-action-disgrete-type-hover;
color: @ui-action-discreet-type-hover;
.umb-variant-switcher__expand {
color: @ui-action-disgrete-type-hover;
color: @ui-action-discreet-type-hover;
}
}
}

.umb-variant-switcher__expand {
color: @ui-action-disgrete-type;
color: @ui-action-discreet-type;
margin-top: 3px;
margin-left: 5px;
margin-right: -5px;
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-file-dropzone.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
// file select link
.file-select {
font-size: 15px;
color: @ui-action-disgrete-type;
color: @ui-action-discreet-type;
cursor: pointer;

margin-top: 10px;

&:hover {
color: @ui-action-disgrete-type-hover;
color: @ui-action-discreet-type-hover;
text-decoration: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Web.UI.Client/src/less/components/umb-media-grid.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
transition: opacity 150ms;

&:hover {
color: @ui-action-disgrete-type-hover;
color: @ui-action-discreet-type-hover;
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-node-preview.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,16 @@
display: flex;
align-items: center;
justify-content: center;
border: 1px dashed @ui-action-disgrete-border;
color: @ui-action-disgrete-type;
border: 1px dashed @ui-action-discreet-border;
color: @ui-action-discreet-type;
font-weight: bold;
padding: 5px 15px;
box-sizing: border-box;
}

.umb-node-preview-add:hover {
color: @ui-action-disgrete-type-hover;
border-color: @ui-action-disgrete-border-hover;
color: @ui-action-discreet-type-hover;
border-color: @ui-action-discreet-border-hover;
text-decoration: none;
}

Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ a.umb-package-details__back-link {

.umb-gallery__thumbnail {
flex: 0 1 100px;
border: 1px solid @ui-action-disgrete-border;
border: 1px solid @ui-action-discreet-border;
border-radius: 3px;
margin: 5px;
padding: 10px;
Expand All @@ -418,7 +418,7 @@ a.umb-package-details__back-link {

.umb-gallery__thumbnail:hover {
cursor: pointer;
border-color: @ui-action-disgrete-border-hover;
border-color: @ui-action-discreet-border-hover;
}

/* PACKAGE LIST */
Expand Down
8 changes: 4 additions & 4 deletions src/Umbraco.Web.UI.Client/src/less/listview.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@

.list-view-add-layout {
margin-top: 10px;
color: @ui-action-disgrete-type;
border: 1px dashed @ui-action-disgrete-border;
color: @ui-action-discreet-type;
border: 1px dashed @ui-action-discreet-border;
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -250,6 +250,6 @@

.list-view-add-layout:hover {
text-decoration: none;
color: @ui-action-disgrete-type-hover;
border-color: @ui-action-disgrete-border-hover;
color: @ui-action-discreet-type-hover;
border-color: @ui-action-discreet-border-hover;
}
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/less/panel.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,15 @@
justify-content: center;
align-items: center;
background: @white;
border: 1px solid @ui-action-disgrete-border;
border: 1px solid @ui-action-discreet-border;
animation: fadeIn 0.5s;
border-radius: 3px;
width: 50px;
&:hover {
.icon {
opacity: 0.8;
}
border-color: @ui-action-disgrete-border-hover;
border-color: @ui-action-discreet-border-hover;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Web.UI.Client/src/less/property-editors.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@
transition: all 150ms ease-in-out;

&:hover {
color: @ui-action-disgrete-type-hover;
border-color: @ui-action-disgrete-type-hover;
color: @ui-action-discreet-type-hover;
border-color: @ui-action-discreet-type-hover;
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/Umbraco.Web.UI.Client/src/less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@
@ui-action-border: @blueExtraDark;
@ui-action-border-hover: @blueMid;

@ui-action-disgrete: white;
@ui-action-disgrete-hover: @sand-7;
@ui-action-disgrete-type: @blueExtraDark;
@ui-action-disgrete-type-hover: @blueMid;
@ui-action-disgrete-border: @gray-7;
@ui-action-disgrete-border-hover: @blueMid;
@ui-action-discreet: white;
@ui-action-discreet-hover: @sand-7;
@ui-action-discreet-type: @blueExtraDark;
@ui-action-discreet-type-hover: @blueMid;
@ui-action-discreet-border: @gray-7;
@ui-action-discreet-border-hover: @blueMid;

@type-white: @white;
@type-black: @blueNight;
Expand Down