fix mobile layout

This commit is contained in:
Athou
2013-11-28 10:45:10 +01:00
parent 6101fb2bef
commit 71521f3428
4 changed files with 27 additions and 11 deletions

View File

@@ -110,14 +110,26 @@ module.controller('ImportCtrl', ['$scope', '$location', 'FeedService', 'Category
};
}]);
module.controller('CategoryTreeCtrl', ['$scope', '$timeout', '$stateParams', '$window', '$location', '$state', '$route', 'CategoryService',
'AnalyticsService', 'EntryService',
function($scope, $timeout, $stateParams, $window, $location, $state, $route, CategoryService, AnalyticsService, EntryService) {
module.controller('CategoryTreeCtrl', [
'$scope',
'$timeout',
'$stateParams',
'$window',
'$location',
'$state',
'$route',
'CategoryService',
'AnalyticsService',
'EntryService',
'MobileService',
function($scope, $timeout, $stateParams, $window, $location, $state, $route, CategoryService, AnalyticsService, EntryService,
MobileService) {
$scope.selectedType = $stateParams._type;
$scope.selectedId = $stateParams._id;
$scope.EntryService = EntryService;
$scope.MobileService = MobileService;
$scope.starred = {
id : 'starred',

View File

@@ -3,7 +3,6 @@
margin: 0 auto;
padding-right: 20px;
padding-left: 20px;
padding-left: 20px;
}
body .modal {

View File

@@ -3,10 +3,11 @@ html.mobile, html.tablet {
padding-left: 5px;
padding-right: 5px;
}
.container-fluid {
.container-full {
padding-left: 0;
padding-right: 0;
}
.left-menu {
display: none !important;
}
@@ -34,21 +35,25 @@ html.mobile, html.tablet {
margin-top: 22px;
}
#feed-accordion .entry-external-link {
right: 10px;
right: 15px;
margin-top: -24px;
}
#feed-accordion .entry-heading-link {
height: 40px;
height: 52px;
}
#feed-accordion .entry-heading .entry-date {
right: 35px;
right: 40px;
margin-top: 22px;
}
#feed-accordion .entry-buttons .checkbox, #feed-accordion .entry-buttons .form-group {
display: inline-block;
}
#feed-accordion .tags-panel {
display: block;
margin-left: 5px;
}
#feed-accordion a.mark-up-to {
right: 15px;
right: 20px;
margin-top: -18px;
}
body.left-menu-active .left-menu {

View File

@@ -1,4 +1,4 @@
<div>
<div ng-controller="CategoryTreeCtrl">
<div class="btn-group">
<button class="btn btn-default" ui-sref="feeds.subscribe">
<span class="icon-rss"></span>
@@ -30,7 +30,7 @@
</button>
</div>
<div class="css-treeview" ng-controller="CategoryTreeCtrl">
<div class="css-treeview">
<ul>
<category node="CategoryService.subscriptions" show-label="'${tree.all}'" show-children="false" level="0" selected-type="selectedType"
selected-id="selectedId" unread-count="unreadCount(category)"> </category>