diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index ef636d2ada..3db25dda3e 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -286,7 +286,7 @@ module.exports = function (grunt) { canvasdesigner: { files: { '<%= distdir %>/assets/css/canvasdesigner.css': - ['src/less/canvasdesigner.less', 'src/less/helveticons.less'] + ['src/less/canvas-designer.less', 'src/less/helveticons.less'] }, options: { compile: true diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 358825c8a3..0317905572 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -92,8 +92,8 @@ //page specific styles -@import "pages/documentTypeEditor.less"; -@import "login.less"; +@import "pages/document-type-editor.less"; +@import "pages/login.less"; //used for property editors diff --git a/src/Umbraco.Web.UI.Client/src/less/canvasdesigner.less b/src/Umbraco.Web.UI.Client/src/less/canvas-designer.less similarity index 100% rename from src/Umbraco.Web.UI.Client/src/less/canvasdesigner.less rename to src/Umbraco.Web.UI.Client/src/less/canvas-designer.less diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/documentTypeEditor.less b/src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less similarity index 100% rename from src/Umbraco.Web.UI.Client/src/less/pages/documentTypeEditor.less rename to src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less diff --git a/src/Umbraco.Web.UI.Client/src/less/login.less b/src/Umbraco.Web.UI.Client/src/less/pages/login.less similarity index 94% rename from src/Umbraco.Web.UI.Client/src/less/login.less rename to src/Umbraco.Web.UI.Client/src/less/pages/login.less index d01dec8733..ca07692153 100644 --- a/src/Umbraco.Web.UI.Client/src/less/login.less +++ b/src/Umbraco.Web.UI.Client/src/less/pages/login.less @@ -1,73 +1,73 @@ -// Login -// ------------------------- - -.login-overlay { - width: 100%; - height: 100%; - background: @blackLight url(../img/application/logo.png) no-repeat 25px 30px fixed !important; - background-size: 30px 30px !important; - color: @white; - position: absolute; - z-index: 2000; - top: 0px; - left: 0px; - margin: 0 !Important; - padding: 0; - border-radius: 0; -} - -.login-overlay .umb-modalcolumn { - background: none; - border: none; -} - -.login-overlay .form { - display: block; - padding-top: 100px; - padding-left: 165px; - width: 370px; - text-align: right; -} - -.login-overlay h1 { - display: block; - text-align: right; - color: @white; - font-size: 18px; - font-weight: normal; -} - -.login-overlay .alert.alert-error { - display: inline-block; - padding-right: 6px; - padding-left: 6px; - margin-top: 10px; - text-align: center; -} - -#hrOr { - height: 30px; - text-align: center; - position: relative; - padding-top: 20px; -} - -#hrOr hr { - margin: 0px; - border: none; - background-color: @gray; - height: 1px; -} - -#hrOr div { - background-color: black; - position: relative; - top: -16px; - border: 1px solid @gray; - padding: 4px; - border-radius: 50%; - width: 20px; - height: 20px; - margin: auto; - color: @grayLight; -} +// Login +// ------------------------- + +.login-overlay { + width: 100%; + height: 100%; + background: @blackLight url(../img/application/logo.png) no-repeat 25px 30px fixed !important; + background-size: 30px 30px !important; + color: @white; + position: absolute; + z-index: 2000; + top: 0px; + left: 0px; + margin: 0 !Important; + padding: 0; + border-radius: 0; +} + +.login-overlay .umb-modalcolumn { + background: none; + border: none; +} + +.login-overlay .form { + display: block; + padding-top: 100px; + padding-left: 165px; + width: 370px; + text-align: right; +} + +.login-overlay h1 { + display: block; + text-align: right; + color: @white; + font-size: 18px; + font-weight: normal; +} + +.login-overlay .alert.alert-error { + display: inline-block; + padding-right: 6px; + padding-left: 6px; + margin-top: 10px; + text-align: center; +} + +#hrOr { + height: 30px; + text-align: center; + position: relative; + padding-top: 20px; +} + +#hrOr hr { + margin: 0px; + border: none; + background-color: @gray; + height: 1px; +} + +#hrOr div { + background-color: black; + position: relative; + top: -16px; + border: 1px solid @gray; + padding: 4px; + border-radius: 50%; + width: 20px; + height: 20px; + margin: auto; + color: @grayLight; +}