diff --git a/src/main/webapp/WEB-INF/wro.xml b/src/main/webapp/WEB-INF/wro.xml
index c4f10b3f..8f275fb4 100644
--- a/src/main/webapp/WEB-INF/wro.xml
+++ b/src/main/webapp/WEB-INF/wro.xml
@@ -20,6 +20,7 @@
/vendor/momentjs/*.js
/vendor/devicejs/*.js
+ /vendor/jqueryui/*.css
/vendor/select2/*.css
/vendor/bootstrap/*.css
/vendor/fontawesome/css/*.css
diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js
index 065ce93b..2467f1ad 100644
--- a/src/main/webapp/js/controllers.js
+++ b/src/main/webapp/js/controllers.js
@@ -155,6 +155,10 @@ module.controller('CategoryTreeCtrl', [
$scope.selectedId = $stateParams._id;
});
+ $scope.resizeCallback = function(event, ui) {
+ $('.main-content').css('margin-left', $(ui.element).outerWidth(true) + 'px');
+ };
+
$timeout(function refreshTree() {
AnalyticsService.track();
CategoryService.refresh(function() {
@@ -1216,6 +1220,7 @@ module.controller('FeedListCtrl', [
Mousetrap.bind('f', function(e) {
$('body').toggleClass('full-screen');
+ $('.main-content').css('margin-left', '');
return false;
});
diff --git a/src/main/webapp/sass/components/_entry-list.scss b/src/main/webapp/sass/components/_entry-list.scss
index 579c0a99..c823ede6 100644
--- a/src/main/webapp/sass/components/_entry-list.scss
+++ b/src/main/webapp/sass/components/_entry-list.scss
@@ -1,3 +1,7 @@
+.main-content {
+ margin-left: 250px;
+}
+
.full-screen .main-content {
width: 100%;
margin-left: 0;
diff --git a/src/main/webapp/sass/components/_subscription-list.scss b/src/main/webapp/sass/components/_subscription-list.scss
index b4193b56..49283a0c 100644
--- a/src/main/webapp/sass/components/_subscription-list.scss
+++ b/src/main/webapp/sass/components/_subscription-list.scss
@@ -22,10 +22,10 @@
/* tree*/
.sidebar-nav-fixed {
margin-top: 10px;
+ width: 250px;
position: fixed;
top: 0;
bottom: 0;
- width: 16%;
overflow: hidden;
}
@@ -33,6 +33,11 @@
overflow-y: auto;
}
+.sidebar-nav-fixed .ui-resizable-e {
+ width: 5px;
+ right: 0;
+}
+
.full-screen .left-menu {
display: none;
}
@@ -120,26 +125,27 @@
.css-treeview .tree-item:hover .config {
display: block;
padding-top: 3px;
+ margin-right: 5px;
width: 16px;
height: 16px;
}
.css-treeview .indent1 {
- padding-left: 22px;
+ padding-left: 16px;
}
.css-treeview .indent2 {
- padding-left: 44px;
+ padding-left: 32px;
}
.css-treeview .indent3 {
- padding-left: 66px;
+ padding-left: 48px;
}
.css-treeview .indent4 {
- padding-left: 88px;
+ padding-left: 64px;
}
.css-treeview .indent5 {
- padding-left: 110px;
+ padding-left: 80px;
}
\ No newline at end of file
diff --git a/src/main/webapp/templates/_tree.html b/src/main/webapp/templates/_tree.html
index 961fde8e..359d2493 100644
--- a/src/main/webapp/templates/_tree.html
+++ b/src/main/webapp/templates/_tree.html
@@ -1,4 +1,5 @@
-
+