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

Fix styling of confirm actions in tags editor #8528

Merged
merged 8 commits into from
Jul 31, 2020
+106 −133
Merged

Fix styling of confirm actions in tags editor #8528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4da234a
Adjust styling for tags action buttons
bjarnef Jul 30, 2020
b578d81
Simplify less syntax
bjarnef Jul 30, 2020
a627bc2
Simplify less syntax further
bjarnef Jul 30, 2020
fe8ab54
Adjust styling of confirm actions in tags
bjarnef Jul 30, 2020
f45138b
Adjust delete button and confirm action overlay
bjarnef Jul 30, 2020
c5d7024
Move umb-tags-editor styling to separate component less file
bjarnef Jul 30, 2020
70c34a0
Merge branch 'v8/contrib' of git://github.com/umbraco/Umbraco-CMS int…
bjarnef Jul 31, 2020
81da67c
Only target child button element, not nested buttons in e.g. umb-conf…
bjarnef Jul 31, 2020
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
1 change: 1 addition & 0 deletions src/Umbraco.Web.UI.Client/src/less/belle.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
@import "components/umb-dropdown.less";
@import "components/umb-range-slider.less";
@import "components/umb-number.less";
@import "components/umb-tags-editor.less";

@import "components/buttons/umb-button.less";
@import "components/buttons/umb-button-group.less";
Expand Down
5 changes: 1 addition & 4 deletions src/Umbraco.Web.UI.Client/src/less/buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,20 +336,17 @@ input[type="submit"].btn {
// This is lifted from umb-group-builder.less

.btn-icon {
border: none;

border: none;
font-size: 18px;
position: relative;
cursor: pointer;
color: @ui-icon;

margin: 0;
padding: 5px 10px;
width: auto;
overflow: visible;
background: transparent;
line-height: normal;
outline: 0;
-webkit-appearance: none;

&:hover {
Expand Down
129 changes: 48 additions & 81 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-confirm-action.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,6 @@
left: 0;
animation: fadeInUp 0.2s;
flex-direction: column;

.umb_confirm-action__overlay-action {
margin-bottom: 5px;
}

.umb_confirm-action__overlay-action.-confirm {
order: 1;
}

.umb_confirm-action__overlay-action.-cancel {
order: 2;
}

}

.umb_confirm-action__overlay.-right {
Expand All @@ -40,18 +27,6 @@
left: auto;
animation: fadeInLeft 0.2s;
flex-direction: row;

.umb_confirm-action__overlay-action {
margin-left: 5px;
}

.umb_confirm-action__overlay-action.-confirm {
order: 2;
}

.umb_confirm-action__overlay-action.-cancel {
order: 1;
}
}

.umb_confirm-action__overlay.-bottom {
Expand All @@ -61,18 +36,6 @@
left: 0;
animation: fadeInDown 0.2s;
flex-direction: column;

.umb_confirm-action__overlay-action {
margin-top: 5px;
}

.umb_confirm-action__overlay-action.-confirm {
order: 2;
}

.umb_confirm-action__overlay-action.-cancel {
order: 1;
}
}

.umb_confirm-action__overlay.-left {
Expand All @@ -82,55 +45,59 @@
left: -50px;
animation: fadeInRight 0.2s;
flex-direction: row;
}

.umb_confirm-action__overlay {

.umb_confirm-action__overlay-action {
margin-right: 5px;
}

.umb_confirm-action__overlay-action.-confirm {
order: 1;
}
&.-confirm {
order: 1;
}

.umb_confirm-action__overlay-action.-cancel {
order: 2;
&.-cancel {
order: 2;
}
}
}

// BUTTONS
.umb_confirm-action__overlay-action {
width: 20px;
height: 20px;
display: flex;
align-items: center;
justify-content: center;
color: @white;
border-radius: 40px;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
font-size: 18px;
cursor: pointer;
}

.umb_confirm-action__overlay-action:hover {
text-decoration: none;
color: @white;
}

// confirm button
.umb_confirm-action__overlay-action.-confirm {
background: @white;
color: @green !important;
}

.umb_confirm-action__overlay-action.-confirm:hover {
color: @green !important;
}

// cancel button
.umb_confirm-action__overlay-action.-cancel {
background: @white;
color: @red !important;
}

.umb_confirm-action__overlay-action.-cancel:hover {
color: @red !important;
// BUTTONS
.umb_confirm-action__overlay-action {
width: 20px;
height: 20px;
display: flex;
align-items: center;
justify-content: center;
color: @white;
border-radius: 40px;
box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.26);
font-size: 18px;
cursor: pointer;
user-select: none;

&:hover {
text-decoration: none;
color: @white;
}

// confirm button
&.-confirm {
background: @white;
color: @green !important;

&:hover {
color: @green !important;
}
}

// cancel button
&.-cancel {
background: @white;
color: @red !important;

&:hover {
color: @red !important;
}
}
}
}
4 changes: 1 addition & 3 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,14 +355,12 @@ input.umb-group-builder__group-title-input:disabled:hover {
position: relative;
margin: 5px 0;

button {
> button {
border: none;

font-size: 18px;
position: relative;
cursor: pointer;
color: @ui-icon;

margin: 0;
padding: 5px 10px;
width: auto;
Expand Down
53 changes: 53 additions & 0 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-tags-editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.umb-tags-editor {
border: @inputBorder solid 1px;
padding: 5px;
min-height: 54px;
font-size: 13px;
text-shadow: none;
box-sizing: border-box;

.tag {
cursor: default;
margin: 10px;
padding: 10px 15px;
background: @blueExtraDark;
position: relative;
user-select: all;

.umb_confirm-action {

> .btn-icon {
color: @white;
padding: 0;
position: relative;
cursor: pointer;
padding-left: 2px;
font-size: 15px;
right: -5px;
bottom: -1px;
user-select: none;
}

.umb_confirm-action__overlay.-left {
top: 8px;
left: auto;
right: 15px;
}
}
}

input {
border: none;
background: @white;
}

.twitter-typeahead {
margin: 10px;
margin-top: 16px;
vertical-align: top;

input {
padding-left: 0;
}
}
}
44 changes: 0 additions & 44 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 @@ -818,51 +818,7 @@
// Tags
// --------------------------------------------------
.umb-tags {
border: @inputBorder solid 1px;
padding: 5px;
min-height: 54px;
font-size: 13px;
text-shadow: none;
box-sizing: border-box;
.umb-property-editor--limit-width();

.tag {
cursor: default;
margin: 10px;
padding: 10px 15px;
background: @blueExtraDark;
position: relative;
user-select: all;

.icon-trash {
position: relative;
cursor: pointer;
padding-left: 2px;
font-size: 15px;
right: -5px;
bottom: -1px;
}

.umb_confirm-action__overlay.-left{
top: 6px;
left: auto;
right: 15px;
}
}

input {
border: none;
background: @white;
}

.twitter-typeahead {
margin: 10px;
margin-top: 16px;
vertical-align: top;
input {
padding-left: 0;
}
}
}

//
Expand Down
3 changes: 2 additions & 1 deletion src/Umbraco.Web.UI.Client/src/views/components/tags/umb-tags-editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<div>
<div class="umb-tags-editor">
<ng-form name="vm.tagEditorForm">

<div ng-if="vm.isLoading">
<localize key="loading">Loading</localize>...
</div>
Expand Down