diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
index 50c95dc228..9e5f767a85 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
@@ -19,6 +19,8 @@
angular.module('umbraco.services')
.factory('navigationService', function ($rootScope, $routeParams, $log, $location, $q, $timeout, dialogService, treeService, notificationsService, historyService) {
+ var minScreenSize = 1100;
+
//Define all sub-properties for the UI object here
var ui = {
tablet: false,
@@ -44,7 +46,7 @@ angular.module('umbraco.services')
$rootScope.$on("closeDialogs", function(){});
function setTreeMode() {
- ui.tablet = ($(window).width() <= 1000);
+ ui.tablet = ($(window).width() <= minScreenSize);
ui.showNavigation = !ui.tablet;
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/grid.less b/src/Umbraco.Web.UI.Client/src/less/grid.less
index 84e600a71a..efa296ba57 100644
--- a/src/Umbraco.Web.UI.Client/src/less/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/grid.less
@@ -163,7 +163,7 @@ body {
border-radius: 0;
}
-@media (min-width: 1001px) {
+@media (min-width: 1101px) {
#contentwrapper{left: 440px;}
}
diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less
index add7fbe542..0666d719ab 100644
--- a/src/Umbraco.Web.UI.Client/src/less/modals.less
+++ b/src/Umbraco.Web.UI.Client/src/less/modals.less
@@ -32,6 +32,7 @@
left: 0px;
right: 0px;
bottom: 0px;
+ overflow: auto;
}
.no-padding .umb-modalcolumn-body {
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index cd77f81cf0..053686e40a 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -32,17 +32,17 @@
display: block
}
.umb-tree li.current > div, .umb-tree div.selected {
- background: #2e8aea;
+ background: @blue;
}
.umb-tree li.current > div a.umb-options i, .umb-tree div.selected i{
background: #fff;
- border-color: #2e8aea;
+ border-color: @blue;
}
.umb-tree li.current > div a,
.umb-tree li.current > div i.icon{
color: white !important;
- background: #2e8aea;
- border-color: #2e8aea;
+ background: @blue;
+ border-color: @blue;
}
.umb-tree li.root > div {
padding-left: 20px;
diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index 9b41676dd2..552eb27141 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -15,6 +15,7 @@