diff --git a/src/Umbraco.Web.UI.Client/src/less/forms.less b/src/Umbraco.Web.UI.Client/src/less/forms.less index e74c0ddc20..b5396efc13 100644 --- a/src/Umbraco.Web.UI.Client/src/less/forms.less +++ b/src/Umbraco.Web.UI.Client/src/less/forms.less @@ -22,6 +22,11 @@ label.control-label { padding-top: 8px !important; } +.umb-status-label{ + color: @gray !important; + } + + .controls-row label{padding: 0px 10px 0px 10px; vertical-align: center} diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index e5187da1c6..a59a4da001 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -63,16 +63,7 @@ h1.headline{height: 40px; padding: 30px 0 0 20px;} margin: -2px 0 0 0; } -.umb-headline-editor-wrapper input{ - display: none; - font-size: @fontSizeMedium -} - -.umb-headline-editor-wrapper h1.umb-headline-editor:hover, .umb-headline-editor-wrapper input { - border-bottom: 1px dashed @grayLight; -} - -.umb-headline-editor-wrapper input:focus { +.umb-headline-editor-wrapper input { background: none; border: none; width: auto; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html index bef16e2b72..d2d2113ad0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html @@ -42,7 +42,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl ng-show="showFolderInput" ng-model="newFolderName" ng-keyup="submitFolder($event)" - ng-blur="showFolderInput = false"> + on-blur="showFolderInput = false"> diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 09f0d64a82..74149da018 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -16,19 +16,13 @@ function startUpVideosDashboardController($scope, xmlhelper, $log, $http) { } angular.module("umbraco").controller("Umbraco.Dashboard.StartupVideosController", startUpVideosDashboardController); +function startupLatestEditsController($scope) { + +} +angular.module("umbraco").controller("Umbraco.Dashboard.StartupLatestEditsController", startupLatestEditsController); -function MediaFolderBrowserDashboardController($scope, xmlhelper, $log, userResource) { - //this is the model we will pass to the service - $scope.profile = {}; - - $scope.changePassword = function (p) { - userResource.changePassword(p.oldPassword, p.newPassword).then(function () { - $scope.passwordForm.$setValidity(true); - }, function () { - //this only happens if there is a wrong oldPassword sent along - $scope.passwordForm.oldpass.$setValidity("oldPassword", false); - }); - } +function MediaFolderBrowserDashboardController($scope) { + } angular.module("umbraco").controller("Umbraco.Dashboard.MediaFolderBrowserDashboardController", MediaFolderBrowserDashboardController);