resizeable subscription list

This commit is contained in:
Athou
2013-12-12 09:38:09 +01:00
parent 64e1b5df09
commit 1791d49efe
21 changed files with 36 additions and 19 deletions

View File

@@ -20,6 +20,7 @@
<js minimize="false">/vendor/momentjs/*.js</js> <js minimize="false">/vendor/momentjs/*.js</js>
<js minimize="false">/vendor/devicejs/*.js</js> <js minimize="false">/vendor/devicejs/*.js</js>
<css minimize="false">/vendor/jqueryui/*.css</css>
<css minimize="false">/vendor/select2/*.css</css> <css minimize="false">/vendor/select2/*.css</css>
<css minimize="false">/vendor/bootstrap/*.css</css> <css minimize="false">/vendor/bootstrap/*.css</css>
<css minimize="false">/vendor/fontawesome/css/*.css</css> <css minimize="false">/vendor/fontawesome/css/*.css</css>

View File

@@ -155,6 +155,10 @@ module.controller('CategoryTreeCtrl', [
$scope.selectedId = $stateParams._id; $scope.selectedId = $stateParams._id;
}); });
$scope.resizeCallback = function(event, ui) {
$('.main-content').css('margin-left', $(ui.element).outerWidth(true) + 'px');
};
$timeout(function refreshTree() { $timeout(function refreshTree() {
AnalyticsService.track(); AnalyticsService.track();
CategoryService.refresh(function() { CategoryService.refresh(function() {
@@ -1216,6 +1220,7 @@ module.controller('FeedListCtrl', [
Mousetrap.bind('f', function(e) { Mousetrap.bind('f', function(e) {
$('body').toggleClass('full-screen'); $('body').toggleClass('full-screen');
$('.main-content').css('margin-left', '');
return false; return false;
}); });

View File

@@ -1,3 +1,7 @@
.main-content {
margin-left: 250px;
}
.full-screen .main-content { .full-screen .main-content {
width: 100%; width: 100%;
margin-left: 0; margin-left: 0;

View File

@@ -22,10 +22,10 @@
/* tree*/ /* tree*/
.sidebar-nav-fixed { .sidebar-nav-fixed {
margin-top: 10px; margin-top: 10px;
width: 250px;
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
width: 16%;
overflow: hidden; overflow: hidden;
} }
@@ -33,6 +33,11 @@
overflow-y: auto; overflow-y: auto;
} }
.sidebar-nav-fixed .ui-resizable-e {
width: 5px;
right: 0;
}
.full-screen .left-menu { .full-screen .left-menu {
display: none; display: none;
} }
@@ -120,26 +125,27 @@
.css-treeview .tree-item:hover .config { .css-treeview .tree-item:hover .config {
display: block; display: block;
padding-top: 3px; padding-top: 3px;
margin-right: 5px;
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
.css-treeview .indent1 { .css-treeview .indent1 {
padding-left: 22px; padding-left: 16px;
} }
.css-treeview .indent2 { .css-treeview .indent2 {
padding-left: 44px; padding-left: 32px;
} }
.css-treeview .indent3 { .css-treeview .indent3 {
padding-left: 66px; padding-left: 48px;
} }
.css-treeview .indent4 { .css-treeview .indent4 {
padding-left: 88px; padding-left: 64px;
} }
.css-treeview .indent5 { .css-treeview .indent5 {
padding-left: 110px; padding-left: 80px;
} }

View File

@@ -1,4 +1,5 @@
<div ng-controller="CategoryTreeCtrl"> <div ng-controller="CategoryTreeCtrl" class="sidebar-nav-fixed" mousewheel-scrolling ui-jq="resizable"
ui-options="{handles: 'e', resize: resizeCallback}">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-default" ui-sref="feeds.subscribe" ng-click="MobileService.toggleLeftMenu()"> <button class="btn btn-default" ui-sref="feeds.subscribe" ng-click="MobileService.toggleLeftMenu()">
<span class="icon-rss"></span> <span class="icon-rss"></span>

View File

@@ -1,16 +1,12 @@
<div class="container-full"> <div class="container-full">
<div class="row"> <div class="left-menu">
<div class="col-xs-2 left-menu"> <div ng-include="'templates/_tree.html'"></div>
<div class="sidebar-nav-fixed" mousewheel-scrolling> <div ng-include="'templates/_feedsearch.html'"></div>
<div ng-include="'templates/_tree.html'"></div> </div>
<div ng-include="'templates/_feedsearch.html'"></div> <div class="main-content">
</div> <div id="toolbar" class="toolbar" ng-include="'templates/_toolbar.html'"></div>
</div> <div class="entryList">
<div class="col-xs-10 main-content"> <div ui-view></div>
<div id="toolbar" class="toolbar" ng-include="'templates/_toolbar.html'"></div>
<div class="entryList">
<div ui-view></div>
</div>
</div> </div>
</div> </div>
<div ng-include="'templates/_footer.html'"></div> <div ng-include="'templates/_footer.html'"></div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 105 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

File diff suppressed because one or more lines are too long