diff --git a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png index 2b2ff80a1d..2f02570583 100644 Binary files a/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png and b/src/Umbraco.Web.UI.Client/src/assets/img/application/logo.png differ diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index 4db77b7d0f..bdc552fbb5 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -47,44 +47,23 @@ border: none; background: none; margin: 25px 0 0 20px; - padding: 0 0 3px 0; + padding: 0; height: auto; width: 100%; border-bottom: 1px dotted #f8f8f8; } -.umb-panel-header .umb-headline:hover { - border-bottom: 1px dotted #ccc; - padding: 0 0 3px 0 -} -/* - -.umb-headline-editor-wrapper h1, h1.headline { - margin: 0; - font-size: 14px; - font-weight: 400; - text-align: left; - height: 25px; - border: 1px solid transparent; +.umb-panel-header .umb-headline:hover,.umb-panel-header .umb-headline:active { + border-bottom: 1px dotted @grayLight; + color: @black } -.umb-headline-editor-wrapper h1:hover { - border: 1px dashed @inputBorder; - background-color: rgba(255,255,255,0.8); - margin: -10px 0 0 -7px; - padding: 10px 0 0 7px -} -*/ - - - -.umb-headline-editor-wrapper - .help-inline{ - right: 0px; - top: 25px; - position: absolute; - font-size: 10px; - color: @red; +.umb-headline-editor-wrapper .help-inline{ + right: 0px; + top: 25px; + position: absolute; + font-size: 10px; + color: @red; } .umb-panel-header .umb-nav-tabs{ @@ -102,7 +81,7 @@ width: 100%; } .umb-panel-header p { - margin:0px 20px; + margin:0px 20px; } .umb-btn-toolbar .dimmed{ @@ -139,7 +118,7 @@ .umb-panel-header .umb-btn-toolbar { float: right; - padding: 15px 20px 0 0; + padding: 20px 20px 0 0; } .umb-panel-footer { diff --git a/src/Umbraco.Web.UI.Client/src/less/sections.less b/src/Umbraco.Web.UI.Client/src/less/sections.less index 8b6a6941b5..41987dff43 100644 --- a/src/Umbraco.Web.UI.Client/src/less/sections.less +++ b/src/Umbraco.Web.UI.Client/src/less/sections.less @@ -64,7 +64,7 @@ ul.sections:hover a span { ul.sections li.avatar { height: 69px; - padding: 28px 0 2px 0; + padding: 30px 0 2px 0; text-align: center; margin: 0 0 0 -4px; border-bottom: 1px solid @grayDark; @@ -79,7 +79,8 @@ ul.sections li.avatar a { } ul.sections li.avatar a img { - border-radius: 500px; + border-radius: 16px; + width: 30px } .faded ul.sections li { diff --git a/src/Umbraco.Web.UI.Client/src/less/variables.less b/src/Umbraco.Web.UI.Client/src/less/variables.less index 3acfcb67c5..f43e5065f3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/variables.less +++ b/src/Umbraco.Web.UI.Client/src/less/variables.less @@ -27,6 +27,7 @@ @red: #9d261d; @yellow: #ffc40d; @orange: #f57020; +@turquoise: #04bfbf; @pink: #c3325f; @purple: #7a43b6; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js index dd1de4f374..9141369783 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js @@ -104,7 +104,7 @@ function MainController($scope, $location, $routeParams, $rootScope, $timeout, $ $("#avatar-img").fadeTo(1000, 0, function(){ $timeout(function(){ - $scope.avatar = "http://www.gravatar.com/avatar/" + $scope.user.emailHash +".jpg?s=32&d=mm"; + $scope.avatar = "http://www.gravatar.com/avatar/" + $scope.user.emailHash +".jpg?s=64&d=mm"; }); $("#avatar-img").fadeTo(1000, 1); diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html index f7a729af16..a6e729f3ee 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html @@ -9,7 +9,8 @@