Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
0977b7b
Wrap legacy font icon so we can inherit font from parent element
bjarnef Aug 6, 2021
1bb28f0
Remove icon name from class attributes
bjarnef Aug 6, 2021
a528ecd
Add back class as color is part of icon
bjarnef Aug 6, 2021
622e7d8
Replace icon classes
bjarnef Aug 6, 2021
acfcef3
Replace icon class
bjarnef Aug 6, 2021
a69c4f8
Use umb-icon
bjarnef Aug 6, 2021
a6615fc
Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS i…
bjarnef Aug 6, 2021
be2e0cc
Remove icon classes
bjarnef Aug 6, 2021
588f602
Remove icon classes
bjarnef Aug 6, 2021
d6811b0
Update color for SVG icons
bjarnef Aug 6, 2021
15d096e
Inherit animation
bjarnef Aug 6, 2021
86ab063
Add icon add class to SVG as well
bjarnef Aug 6, 2021
2e5128c
Update umb-icon inner wrapper
bjarnef Aug 6, 2021
875be0d
Fix issue with search icon styling in property editors dialog
bjarnef Aug 6, 2021
a4e3b01
Formatting
bjarnef Aug 6, 2021
2073bef
Adjust umb-icon with transclude
bjarnef Aug 7, 2021
c787517
Change back to original back icon from font awesome
bjarnef Aug 7, 2021
64ea212
Adjust styling for font icon
bjarnef Aug 7, 2021
1acc2af
Replace with umb-icon
bjarnef Aug 7, 2021
290ce07
Use umb-icon in packager
bjarnef Aug 7, 2021
9c0521e
Use umb-icon in help drawer
bjarnef Aug 7, 2021
c3b4c1b
Use umb-icon in treesource prevalue editor
bjarnef Aug 7, 2021
4a3d1fb
Update font size
bjarnef Aug 7, 2021
9fefd4f
Replace with umb-icon
bjarnef Aug 7, 2021
9b6a201
Replace icons with umb-icon
bjarnef Aug 8, 2021
866390d
div isn't valid inside label element
bjarnef Aug 8, 2021
660a655
Replace more icons
bjarnef Aug 8, 2021
31dfb8b
Use umb-search-filter component
bjarnef Aug 8, 2021
cb636a8
Update to use umb-icon
bjarnef Aug 8, 2021
ebaca44
Use end-closing tag for custom HTML element
bjarnef Aug 8, 2021
fd71448
Use umb-icon component
bjarnef Aug 8, 2021
f140f30
Use umb-icon component to replace icons
bjarnef Aug 8, 2021
a30be7e
Replace with umb-icon
bjarnef Aug 8, 2021
d3098c5
Replace icons with umb-icon
bjarnef Aug 8, 2021
2341851
Replace more icons
bjarnef Aug 8, 2021
43d2f52
Custom HTML element should have end-closing tag
bjarnef Aug 8, 2021
60f7221
Replace icons with umb-icon
bjarnef Aug 8, 2021
7aac2d7
Replace icons
bjarnef Aug 8, 2021
53b01a9
Remove unused variable
bjarnef Aug 8, 2021
6b1995b
Replace icon
bjarnef Aug 8, 2021
d28922e
Replace icons
bjarnef Aug 8, 2021
883de27
Revert to `<i>` element as it was causing issues with isolated scopes
bjarnef Aug 8, 2021
3a171a2
Adjust umb-checkmark to work with umb-icon
bjarnef Aug 8, 2021
17fc6e3
Adjust lightbox styling
bjarnef Aug 8, 2021
1279478
Remove unused helper class and it is already available as "self-cente…
bjarnef Aug 8, 2021
0393034
Merge branch 'v8/contrib' into pr/10805
nathanwoulfe Aug 10, 2021
23d9d9c
remove unused class from icon, shift margin to parent element
nathanwoulfe Aug 11, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The prompt can be opened in four direction up, down, left or right.</p>
<div ng-controller="My.Controller as vm">

<div class="my-action" style="position:relative;">
<i class="icon-trash" ng-click="vm.showPrompt()"></i>
<umb-icon icon="icon-trash" ng-click="vm.showPrompt()"></umb-icon>
<umb-confirm-action
ng-if="vm.promptIsVisible"
direction="left"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Simple icon

Icon with additional attribute. It can be treated like any other dom element
<pre>
<umb-icon icon="icon-alert" class="icon-class"></umb-icon>
<umb-icon icon="icon-alert" class="another-class"></umb-icon>
</pre>
@example
**/
Expand All @@ -33,8 +33,8 @@ Icon with additional attribute. It can be treated like any other dom element
icon: "@",
svgString: "=?"
},

link: function (scope, element) {

if (scope.svgString === undefined && scope.svgString !== null && scope.icon !== undefined && scope.icon !== null) {
const observer = new IntersectionObserver(_lazyRequestIcon, {rootMargin: "100px"});
const iconEl = element[0];
Expand All @@ -49,6 +49,7 @@ Icon with additional attribute. It can be treated like any other dom element

scope.$watch("icon", function (newValue, oldValue) {
if (newValue && oldValue) {

var newicon = newValue.split(" ")[0];
var oldicon = oldValue.split(" ")[0];

Expand All @@ -64,6 +65,7 @@ Icon with additional attribute. It can be treated like any other dom element
observer.disconnect();

var icon = scope.icon.split(" ")[0]; // Ensure that only the first part of the icon is used as sometimes the color is added too, e.g. see umbeditorheader.directive scope.openIconPicker

_requestIcon(icon);
}
});
Expand Down
31 changes: 24 additions & 7 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-icon.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,43 @@
width: 100%;
height: 100%;
fill: currentColor;
animation: inherit;
}

&.large{
width: 32px;
&.large {
width: 32px;
height: 32px;
}
&.medium{

&.medium {
width: 24px;
height: 24px;
}
&.small{

&.small {
width: 14px;
height: 14px;
}

&:before, &:after {
&::before,
&::after {
content: none !important;
}

> i {
font-family: inherit;
&__inner {
// Clear pseudo classes
&::before,
&::after {
content: none !important;
}

ng-transclude {
animation: inherit;
font-family: inherit;

> span {
animation: inherit;
}
}
}
}
118 changes: 59 additions & 59 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-lightbox.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,68 +11,74 @@
align-items: center;
justify-content: center;
flex-direction: column;
}

.umb-drawer-is-visible .umb-lightbox {
width: calc(~'100%' - ~'@{drawerWidth}');
left: @drawerWidth;
}
&__backdrop {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(21, 21, 23, 0.7);
width: 100%;
height: 100%;
}

.umb-lightbox__backdrop {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(21, 21, 23, 0.7);
width: 100%;
height: 100%;
}
&__close {
position: absolute;
top: 20px;
right: 20px;
height: 40px;
width: 40px;

.umb-lightbox__close {
position: absolute;
top: 20px;
right: 20px;
height: 40px;
width: 40px;
}
.umb-icon {
font-size: 20px;
height: inherit;
width: inherit;
position: absolute;
top: 0;
left: 0;
}
}

.umb-lightbox__close i {
font-size: 20px;
height: inherit;
width: inherit;
position: absolute;
top: 0;
left: 0;
}
&__images {
position: relative;
z-index: 1000;
max-width: calc(~'100%' - 200px); // subtract the width of the two arrow buttons
}

.umb-lightbox__images {
position: relative;
z-index: 1000;
max-width: calc(~'100%' - 200px); // subtract the width of the two arrow buttons
}
&__image {
background: @white;
border-radius: 3px;
padding: 10px;
}

.umb-lightbox__image {
background: @white;
border-radius: 3px;
padding: 10px;
}
&__control {
background-color: @white;
width: 50px;
height: 50px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
position: absolute;

.umb-lightbox__control {
background-color: @white;
width: 50px;
height: 50px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
position: absolute;
&:hover {
.umb-lightbox__control-icon, &::before {
color: @ui-active-type-hover;
&:hover {
.umb-lightbox__control-icon, &::before {
color: @ui-active-type-hover;
}
}
}

&__control-icon {
color: @ui-active-type;
font-size: 20px;
}
}

.umb-drawer-is-visible .umb-lightbox {
width: calc(~'100%' - ~'@{drawerWidth}');
left: @drawerWidth;
}

.umb-lightbox__control.-next {
Expand All @@ -94,9 +100,3 @@
margin-left: -4px;
}
}

.umb-lightbox__control-icon {
color: @ui-active-type;
font-size: 20px;

}
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,21 @@
align-items: center;
margin-bottom: 30px;
transition: 100ms box-shadow ease, 100ms border ease;

&.drag-over {
border-color: @ui-action-border-hover;
border-style: solid;
box-shadow: 0 3px 8px rgba(0,0,0, .1);
transition: 100ms box-shadow ease, 100ms border ease;
}
}

.umb-upload-local__dropzone i {
display: block;
color: @ui-action-type;
font-size: 110px;
line-height: 1;
.umb-icon {
display: block;
color: @ui-action-type;
font-size: 6.75rem;
line-height: 1;
margin: 0 auto;
}
}

.umb-upload-local__select-file {
Expand Down
51 changes: 28 additions & 23 deletions src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
Original file line number Diff line number Diff line change
Expand Up @@ -136,35 +136,40 @@
justify-content: center;
opacity: .6;
margin-top: 10px;
}

.umb-package-numbers small {
padding: 0 5px;
display: flex;
align-items: center;
justify-content: center;
}
small {
padding: 0 5px;
display: flex;
align-items: center;
justify-content: center;
}

.umb-package-numbers i {
font-size: 14px;
.umb-icon {
font-size: 0.9rem;
}
}

.umb-package-link:hover .umb-package-numbers {
opacity: 1;
}
.umb-package-link {
&:hover {
.umb-package-numbers {
opacity: 1;

.umb-package-link:hover .umb-package-numbers .icon-hearts {
color: @red !important;
}
.icon-hearts {
color: @red !important;
}
}
}

.umb-package-link .umb-package-cloud {
margin-top: 8px;
font-size: 11px;
height: 11px; // ensures vertical space is taken up even if "works on cloud" isn't visible
}
.umb-package-cloud {
margin-top: 0.5rem;
font-size: 0.75rem;
min-height: 1rem; // ensures vertical space is taken up even if "works on cloud" isn't visible

.umb-package-link .umb-package-cloud .icon-cloud {
color: #2eadaf !important;
.umb-icon {
color: @turquoise !important;
font-size: 0.9rem;
}
}
}

// Version
Expand All @@ -182,7 +187,7 @@

.umb-packages-categories {
display: flex;
user-select: center;
user-select: none;
flex-wrap: wrap;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
flex: 0 0 50px;
display: flex;
justify-content: center;
padding: 0 20px;
padding: 0.25rem 20px;
}

.umb-panel-group__details-status-content {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ html .umb-search-filter {

// "icon-search" class it kept for backward compatibility
.umb-icon,
.icon-search {
i.icon-search {
color: @gray-8;
position: absolute;
top: 0;
Expand Down
20 changes: 6 additions & 14 deletions src/Umbraco.Web.UI.Client/src/less/dashboards/healthcheck.less
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,20 @@
font-size: 13px;
}

.umb-healthcheck-message i {
.umb-healthcheck-message .umb-icon {
font-size: 15px;
margin-right: 3px;
}

.umb-healthcheck-details-link {
color: @turquoise-d1;
}
color: @turquoise-d1;

.umb-healthcheck-details-link:hover {
text-decoration: none;
color: @turquoise-d1;
&:hover {
color: @turquoise-d1;
text-decoration: none;
}
}


/* Helpers */
.align-self-center {
align-self: center;
}


/* Spacing for boxes */
.umb-air {
flex: 0 0 auto;
Expand Down Expand Up @@ -127,7 +120,6 @@
}

.umb-healthcheck-status-icon {
font-size: 20px;
margin-top: 2px;
}

Expand Down
Loading