Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mobile layout

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/webapp/js/controllers.js
View File

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

1
src/main/webapp/sass/generic/_misc.scss
View File

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

15
src/main/webapp/sass/mobile/_mobile.scss
View File

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

4
src/main/webapp/templates/_tree.html
View File

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