Merge branch 'v8/8.17' into v8/dev

jemayn · Sep 30, 2021 · 7c77ba2 · 7c77ba2
2 parents 9f48a9f + 11ad3fc
commit 7c77ba2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
@@ -19,4 +19,4 @@
 
 // these are FYI and changed automatically
 [assembly: AssemblyFileVersion("8.17.0")]
-[assembly: AssemblyInformationalVersion("8.17.0-rc")]
+[assembly: AssemblyInformationalVersion("8.17.0")]
diff --git a/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs b/src/Umbraco.Core/Composing/CompositionExtensions/Services.cs
@@ -52,6 +52,7 @@ public static Composition ComposeServices(this Composition composition)
             composition.RegisterUnique<IExternalLoginService, ExternalLoginService>();
             composition.RegisterUnique<IRedirectUrlService, RedirectUrlService>();
             composition.RegisterUnique<IConsentService, ConsentService>();
+            composition.RegisterUnique<IEmailSender, EmailSender>();
             composition.Register<LocalizedTextServiceFileSources>(SourcesFactory);
             composition.RegisterUnique<ILocalizedTextService>(factory => new LocalizedTextService(
                 factory.GetInstance<Lazy<LocalizedTextServiceFileSources>>(),

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less b/src/Umbraco.Web.UI.Client/src/less/components/prevalues/multivalues.less
@@ -45,15 +45,15 @@
 
     &.ui-sortable-handle,
     .ui-sortable-handle,
-    .handle
-    {
+    .handle {
         cursor: move;
     }
 
-    i {
+    .umb-icon,
+    i.icon {
         display: flex;
-        align-items: center;
-        margin-right: 5px
+        align-self: center;
+        margin-right: 5px;
     }
 
     a {

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-form-check.less
@@ -97,7 +97,8 @@
 
     .icon,
     .umb-icon {
-        font-size: 1.2rem;
+        font-size: 0.9rem;
+        line-height: 1;
     }
 
     &__state {
@@ -110,6 +111,8 @@
 
     &__check {
         display: flex;
+        align-items: center;
+        justify-content: center;
         position: relative;
         background: @white;
         border: 1px solid @inputBorder;

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
@@ -565,12 +565,11 @@
 // ICONS
 // -------------------------
 .umb-grid .iconBox {
-    padding: 4px 6px;
-    display: inline-block;
-    cursor: pointer;
+    padding: 6px;
+    display: flex;
     border-radius: 200px;
     border: 1px solid @ui-action-discreet-border;
-    margin: 2px;
+    margin: 0 auto;
 
     &:hover, &:hover * {
         background: @ui-action-discreet-type-hover !important;
@@ -599,8 +598,6 @@
     -webkit-appearance: none;
     background-image: linear-gradient(to bottom,@gray-9,@gray-7);
     background-repeat: repeat-x;
-    zoom: 1;
-    border-color: @gray-7 @gray-7 @gray-6;
     border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);
     box-shadow: inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);
     border-radius: 3px;

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/hidden.html
@@ -1 +1 @@
-<input name="hidden" type="hidden" ng-model="model.value" name="{{model.alias}}" /> 
+<input name="hidden" type="hidden" ng-model="model.value" id="{{model.alias}}" />
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml
@@ -2342,6 +2342,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
       <key alias="confirmCancelBlockCreationMessage"><![CDATA[Ben je zeker dat je deze wijzigingen wil verwerpen?]]></key>
       <key alias="elementTypeDoesNotExistHeadline">Fout!</key>
       <key alias="elementTypeDoesNotExistDescription">Het Elementtype van dit blok bestaat niet meer</key>
+      <key alias="addBlock">Inhoud toevoegen</key>
       <key alias="propertyEditorNotSupported">Eigenschap '%0%' gebruikt editor '%1%' die niet ondersteund wordt in blokken.</key>
     </area>
   <area alias="contentTemplatesDashboard">
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<input name="hidden" type="hidden" ng-model="model.value" name="{{model.alias}}" />
		<input name="hidden" type="hidden" ng-model="model.value" id="{{model.alias}}" />