Skip to content

Commit 7c77ba2

Browse files
Merge branch 'v8/8.17' into v8/dev
2 parents 9f48a9f + 11ad3fc commit 7c77ba2

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

src/SolutionInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
// these are FYI and changed automatically
2121
[assembly: AssemblyFileVersion("8.17.0")]
22-
[assembly: AssemblyInformationalVersion("8.17.0-rc")]
22+
[assembly: AssemblyInformationalVersion("8.17.0")]

src/Umbraco.Core/Composing/CompositionExtensions/Services.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public static Composition ComposeServices(this Composition composition)
5252
composition.RegisterUnique<IExternalLoginService, ExternalLoginService>();
5353
composition.RegisterUnique<IRedirectUrlService, RedirectUrlService>();
5454
composition.RegisterUnique<IConsentService, ConsentService>();
55+
composition.RegisterUnique<IEmailSender, EmailSender>();
5556
composition.Register<LocalizedTextServiceFileSources>(SourcesFactory);
5657
composition.RegisterUnique<ILocalizedTextService>(factory => new LocalizedTextService(
5758
factory.GetInstance<Lazy<LocalizedTextServiceFileSources>>(),

src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545

4646
&.ui-sortable-handle,
4747
.ui-sortable-handle,
48-
.handle
49-
{
48+
.handle {
5049
cursor: move;
5150
}
5251

53-
i {
52+
.umb-icon,
53+
i.icon {
5454
display: flex;
55-
align-items: center;
56-
margin-right: 5px
55+
align-self: center;
56+
margin-right: 5px;
5757
}
5858

5959
a {

src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@
9797

9898
.icon,
9999
.umb-icon {
100-
font-size: 1.2rem;
100+
font-size: 0.9rem;
101+
line-height: 1;
101102
}
102103

103104
&__state {
@@ -110,6 +111,8 @@
110111

111112
&__check {
112113
display: flex;
114+
align-items: center;
115+
justify-content: center;
113116
position: relative;
114117
background: @white;
115118
border: 1px solid @inputBorder;

src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,12 +565,11 @@
565565
// ICONS
566566
// -------------------------
567567
.umb-grid .iconBox {
568-
padding: 4px 6px;
569-
display: inline-block;
570-
cursor: pointer;
568+
padding: 6px;
569+
display: flex;
571570
border-radius: 200px;
572571
border: 1px solid @ui-action-discreet-border;
573-
margin: 2px;
572+
margin: 0 auto;
574573

575574
&:hover, &:hover * {
576575
background: @ui-action-discreet-type-hover !important;
@@ -599,8 +598,6 @@
599598
-webkit-appearance: none;
600599
background-image: linear-gradient(to bottom,@gray-9,@gray-7);
601600
background-repeat: repeat-x;
602-
zoom: 1;
603-
border-color: @gray-7 @gray-7 @gray-6;
604601
border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
605602
box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
606603
border-radius: 3px;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<input name="hidden" type="hidden" ng-model="model.value" name="{{model.alias}}" />
1+
<input name="hidden" type="hidden" ng-model="model.value" id="{{model.alias}}" />

src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2342,6 +2342,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
23422342
<key alias="confirmCancelBlockCreationMessage"><![CDATA[Ben je zeker dat je deze wijzigingen wil verwerpen?]]></key>
23432343
<key alias="elementTypeDoesNotExistHeadline">Fout!</key>
23442344
<key alias="elementTypeDoesNotExistDescription">Het Elementtype van dit blok bestaat niet meer</key>
2345+
<key alias="addBlock">Inhoud toevoegen</key>
23452346
<key alias="propertyEditorNotSupported">Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in blokken.</key>
23462347
</area>
23472348
<area alias="contentTemplatesDashboard">

0 commit comments

Comments
 (0)