+ and - control current entry font size (fix #272)

This commit is contained in:
Athou
2013-06-26 13:11:53 +02:00
parent e0ea822333
commit 790c3bce14
27 changed files with 471 additions and 399 deletions

View File

@@ -655,6 +655,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
$scope.errorCount = 0;
$scope.timestamp = 0;
$scope.entries = [];
$scope.font_size = 0;
$scope.settingsService = SettingsService;
$scope.$watch('settingsService.settings.readingMode', function(newValue,
@@ -900,7 +901,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
}
}
};
Mousetrap.bind('j', function(e) {
$scope.$apply(function() {
$scope.navigationMode = 'keyboard';
@@ -986,6 +987,19 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
$scope.markAll();
});
});
Mousetrap.bind('+', function(e) {
$scope.$apply(function() {
$scope.font_size = Math.min($scope.font_size + 1, 5);
});
});
Mousetrap.bind('-', function(e) {
$scope.$apply(function() {
$scope.font_size = Math.max($scope.font_size - 1, 0);
});
});
Mousetrap.bind('?', function(e) {
$scope.$apply(function() {
$scope.shortcutsModal = true;

View File

@@ -91,8 +91,11 @@
text-decoration: none;
}
#feed-accordion .entry-body h4 {
#feed-accordion .entry-body .entry-title {
margin-top: 5px;
margin-bottom: 10px;
font-size: 130%;
font-weight: bold;
}
#feed-accordion .entry-body .entry-author {
@@ -157,4 +160,28 @@
#feed-accordion.expanded .current {
border-left: 1px solid rgb(77, 144, 240);
}
#feed-accordion .current.entry-font-size-0 {
font-size: 14px;
}
#feed-accordion .current.entry-font-size-1 {
font-size: 15px;
}
#feed-accordion .current.entry-font-size-2 {
font-size: 16px;
}
#feed-accordion .current.entry-font-size-3 {
font-size: 17px;
}
#feed-accordion .current.entry-font-size-4 {
font-size: 18px;
}
#feed-accordion .current.entry-font-size-5 {
font-size: 19px;
}

View File

@@ -38,6 +38,9 @@
<dt>${about.shortcuts.mouse_middleclick}</dt>
<dd>${about.shortcuts.open_in_new_tab_mark_as_read}</dd>
<dt>+,-</dt>
<dd>${about.shortcuts.font_size}</dd>
<dt>g <i class="icon-arrow-right"></i> u</dt>
<dd>${about.shortcuts.feed_search}</dd>
</dl>

View File

@@ -14,10 +14,10 @@
<div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy || !settingsService.settings.readingMode" infinite-scroll-distance="1" id="feed-accordion"
ng-class="{'expanded' : settingsService.settings.viewMode == 'expanded' }">
<div ng-show="message && errorCount > 10">${view.error_while_loading_feed} : {{message}}</div>
<div ng-repeat="entry in entries" class="entry"
<div ng-repeat="entry in entries" class="entry entry-font-size-{{font_size}}"
scroll-to="navigationMode != 'scroll' && current == entry" scroll-to-force="navigationMode == 'keyboard'" scroll-to-offset="-50"
on-scroll-middle="onScroll(entry)" on-scroll-middle-offset="50"
ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen}">
ng-class="{unread: entry.read == false, current: current==entry, open: isOpen, closed: !isOpen }">
<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="noop($event)" ng-mouseup="entryClicked(entry, $event)">
<span class="feed-name visible-desktop">
<span class="star" ng-mouseup="star(entry, !entry.starred, $event)">
@@ -34,13 +34,13 @@
<div class="entry-body" ui-if="settingsService.settings.viewMode == 'expanded' || (isOpen && current == entry)" ng-mouseup="bodyClicked(entry, $event)"
ng-class="{rtl: entry.rtl}">
<div class="entry-header">
<h4 class="entry-title">
<div class="entry-title">
<a href="{{entry.url}}" target="_blank" ng-bind-html-unsafe="entry.title"></a>
<span class="entry-author" ui-if="entry.author">
<span class="entry-author-prefix">${view.entry_author}</span>
<span class="entry-author-name">{{entry.author}}</span>
</span>
</h4>
</div>
</div>
<div class="entry-body-content">