From dc7cb0882420ca413109a1e19c0b7f698f7334b4 Mon Sep 17 00:00:00 2001 From: Per Ploug Date: Thu, 19 Mar 2015 12:29:05 +0100 Subject: [PATCH 1/5] Styling for grid editors + row labels --- .../src/less/gridview.less | 60 +++++++++++-------- .../src/views/propertyeditors/grid/grid.html | 12 +++- 2 files changed, 46 insertions(+), 26 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 0f0d09a7e9..3e9e9c0eda 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -251,6 +251,40 @@ IFRAME {overflow:hidden;} border: 1px dashed @blue !important; } +.usky-grid .warnhighlight > ins.item-label{border-color: @red;} +.usky-grid .infohighlight > ins.item-label{border-color: @blue;} + + +.usky-grid ins.item-label { + position: absolute; + top: -22px; + left: -1px; + text-decoration: none; + padding: 0px 7px; + display:none; + font-size:0.8em; + background-color: white; + color: @grayLight; + border: 1px dashed @grayLighter; + border-bottom: 1px solid white !important; + height: 20px; + overflow: hidden; +} + +.usky-grid .usky-row-inner > ins.item-label{ + top: -20px; + left: 0px; +} + +.usky-grid .usky-control-inner.selectedControl , .usky-grid .usky-row-inner.selectedRow{ + border: 1px dashed @grayLighter; + + > ins.item-label { + display: block; + z-index:100000; + } +} + // CONTROL PLACEHOLDER @@ -502,6 +536,7 @@ IFRAME {overflow:hidden;} /**************************************************************************************************/ .usky-grid .usky-cell{ + padding-top: 5px; padding-bottom: 15px; } @@ -524,35 +559,12 @@ IFRAME {overflow:hidden;} padding: 5px; margin-right: 45px; margin-bottom: 15px; + border: 1px dashed transparent; min-height: 60px; position:relative; } - .usky-grid .usky-control-inner > ins { - position: absolute; - top: -22px; - left: 0; - text-decoration: none; - padding: 0px 7px; - /*opacity: .8;*/ - display:none; - font-size:0.8em; - background-color:@blueLight; - -moz-border-radius: 0px; - -webkit-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; - } - - .usky-grid .usky-control-inner:hover - { - border:@grayLighter solid 1px; - } - - .usky-grid .usky-control-inner:hover > ins { - display:block; - z-index:100000; - } /**************************************************************************************************/ diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html index 1cddb13855..05809cad02 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html @@ -100,8 +100,14 @@
+ ng-class="{last:$last, + first:$first, + warnhighlight:currentWarnhighlightRow == row, + infohighlight:currentInfohighlightRow == row, + selectedRow:currentRow == row && currentControl === null}"> + {{row.name}} +
@@ -170,7 +176,9 @@ infohighlight:currentInfohighlightControl == control, warnhighlight:currentWarnhighlightControl == control, selectedControl:currentControl == control}"> - {{control.editor.name}} + + {{control.editor.name}} +
Date: Thu, 19 Mar 2015 12:46:29 +0100 Subject: [PATCH 2/5] Tweaked borders a tiny bit --- src/Umbraco.Web.UI.Client/src/less/gridview.less | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 3e9e9c0eda..01879a6be3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -124,11 +124,12 @@ IFRAME {overflow:hidden;} border: 1px dashed rgba(0,0,0,0); } -.usky-grid .tb:hover .usky-row{ - border-bottom:1px dashed rgba(182, 182, 182, 0.3); +.umb-grid .tb:hover .usky-row{ + border-bottom:1px dashed rgba(182, 182, 182, 0) !important; } -/*.usky-grid .selectedRow { +/* +.usky-grid .selectedRow { border: 1px solid rgba(182, 182, 182, 0.3); }*/ @@ -235,7 +236,7 @@ IFRAME {overflow:hidden;} .usky-grid .usky-control:hover{ /*border: 1px solid rgba(182, 182, 182, 0.3);*/ - //border-bottom: 1px solid rgba(182, 182, 182, 0.3); + /*border-bottom: 1px solid rgba(182, 182, 182, 0.3);*/ } .usky-grid .usky-control-placeholder:hover{ @@ -265,7 +266,7 @@ IFRAME {overflow:hidden;} font-size:0.8em; background-color: white; color: @grayLight; - border: 1px dashed @grayLighter; + border: 1px dashed @grayLight; border-bottom: 1px solid white !important; height: 20px; overflow: hidden; @@ -277,7 +278,7 @@ IFRAME {overflow:hidden;} } .usky-grid .usky-control-inner.selectedControl , .usky-grid .usky-row-inner.selectedRow{ - border: 1px dashed @grayLighter; + border: 1px dashed @grayLight; > ins.item-label { display: block; From 311d503d8bd8695a7e065bbc282e853e18303a11 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 19 Mar 2015 12:53:43 +0100 Subject: [PATCH 3/5] Updates CDF dependency to latest version --- build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- src/Umbraco.Web.UI/packages.config | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 2 +- src/Umbraco.Web/packages.config | 2 +- src/umbraco.cms/packages.config | 2 +- src/umbraco.cms/umbraco.cms.csproj | 4 ++-- src/umbraco.controls/packages.config | 2 +- src/umbraco.controls/umbraco.controls.csproj | 4 ++-- src/umbraco.editorControls/packages.config | 2 +- src/umbraco.editorControls/umbraco.editorControls.csproj | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 27e2dea807..33c8a20953 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -28,7 +28,7 @@ - + diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 2015d0f2f6..ad23e7ae24 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -115,9 +115,9 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - + False - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll False diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config index bd2ee17ca4..ccf9ca3fa4 100644 --- a/src/Umbraco.Web.UI/packages.config +++ b/src/Umbraco.Web.UI/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index e078afc819..82433abf49 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -106,7 +106,7 @@ False - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll False diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config index f11d847bbf..51a9114dbb 100644 --- a/src/Umbraco.Web/packages.config +++ b/src/Umbraco.Web/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config index edda198298..bdaf00b95d 100644 --- a/src/umbraco.cms/packages.config +++ b/src/umbraco.cms/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index 189ec04ccc..3a8a4cf536 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -106,9 +106,9 @@ false - + False - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll False diff --git a/src/umbraco.controls/packages.config b/src/umbraco.controls/packages.config index f2f0545321..0859f3d4e9 100644 --- a/src/umbraco.controls/packages.config +++ b/src/umbraco.controls/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj index 49ce586d75..a5c08e525a 100644 --- a/src/umbraco.controls/umbraco.controls.csproj +++ b/src/umbraco.controls/umbraco.controls.csproj @@ -68,9 +68,9 @@ false - + False - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll diff --git a/src/umbraco.editorControls/packages.config b/src/umbraco.editorControls/packages.config index f2f0545321..0859f3d4e9 100644 --- a/src/umbraco.editorControls/packages.config +++ b/src/umbraco.editorControls/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj index 426028b6dc..cfeb5f2103 100644 --- a/src/umbraco.editorControls/umbraco.editorControls.csproj +++ b/src/umbraco.editorControls/umbraco.editorControls.csproj @@ -116,7 +116,7 @@ False - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll System From 19e4fe505950012e58588e682bb5f2df66dda541 Mon Sep 17 00:00:00 2001 From: Per Ploug Date: Thu, 19 Mar 2015 14:33:12 +0100 Subject: [PATCH 4/5] Grid labels header colors for delete and move actions --- src/Umbraco.Web.UI.Client/src/less/gridview.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/gridview.less b/src/Umbraco.Web.UI.Client/src/less/gridview.less index 01879a6be3..29a0ac9454 100644 --- a/src/Umbraco.Web.UI.Client/src/less/gridview.less +++ b/src/Umbraco.Web.UI.Client/src/less/gridview.less @@ -252,8 +252,8 @@ IFRAME {overflow:hidden;} border: 1px dashed @blue !important; } -.usky-grid .warnhighlight > ins.item-label{border-color: @red;} -.usky-grid .infohighlight > ins.item-label{border-color: @blue;} +.usky-grid .warnhighlight > ins.item-label{border-color: @red; color: @red;} +.usky-grid .infohighlight > ins.item-label{border-color: @blue; color: @blue;} .usky-grid ins.item-label { From 90fdbb007e7393cafc16754b012f560aa804b020 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 19 Mar 2015 14:45:00 +0100 Subject: [PATCH 5/5] Bump version --- build/UmbracoVersion.txt | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index 0b0f35270e..a6175d96d2 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1,2 +1,2 @@ # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta) -7.2.3 \ No newline at end of file +7.2.4 \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index b5b9e206b5..cfde01fce6 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -5,7 +5,7 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("7.2.3"); + private static readonly Version Version = new Version("7.2.4"); /// /// Gets the current version of Umbraco. diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index ad23e7ae24..829178c030 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -2547,9 +2547,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" True True - 7230 + 7240 / - http://localhost:7230 + http://localhost:7240 False False