+ 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

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=serennu/dadserennu eitem gyfredol
about.shortcuts.mark_current_entry=marcio eitem gyfredol fel darllenwyd/heb ddarllen
about.shortcuts.mark_all_as_read=marcio popeth fel darllenwyd
about.shortcuts.open_in_new_tab_mark_as_read=agor eitem mewn tab newydd a marcio fel darllenwyd
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=llywio i danysgrifiad trwy rhoi ei enw mewn

View File

@@ -128,4 +128,6 @@ about.shortcuts.star_unstar=marker/fjern favorit
about.shortcuts.mark_current_entry=marker som læst/ulæst
about.shortcuts.mark_all_as_read=marker alle artikler som læste
about.shortcuts.open_in_new_tab_mark_as_read=åben artikel i ny fane og marker som læst
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=naviger til et abonnoment ved at skrive dets navn

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=de-/favorisieren des aktuellen Artikels
about.shortcuts.mark_current_entry=aktuellen Artikel als gelesen/ungelesen markieren
about.shortcuts.mark_all_as_read=alle Artikel als gelesen markieren
about.shortcuts.open_in_new_tab_mark_as_read=öffnen des Artikels in einem neuen Tab und als gelesen markieren
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=zu einem Feed springen durch durch eingeben seines Namens

View File

@@ -128,4 +128,5 @@ about.shortcuts.star_unstar=star/unstar current entry
about.shortcuts.mark_current_entry=mark as read/unread current entry
about.shortcuts.mark_all_as_read=mark all entries as read
about.shortcuts.open_in_new_tab_mark_as_read=open entry in new tab and mark as read
about.shortcuts.font_size=increase/decrease font size of the current entry
about.shortcuts.feed_search=navigate to a subscription by entering the subscription name

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=marcar/no marcar la entrada actual
about.shortcuts.mark_current_entry=marcar como leída/no la leída entrada actual
about.shortcuts.mark_all_as_read=marcar todas las entradas como leídas
about.shortcuts.open_in_new_tab_mark_as_read=abrir entrada en una nueva pestaña y marcar como leída
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navigate to a subscription by entering the subscription name ####### Needs translation

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=نشانه‌دارکردن/نکردن مطلب جا
about.shortcuts.mark_current_entry=علامت‌گذاری مطلب جاری به‌عنوان خوانده‌شده/نشده
about.shortcuts.mark_all_as_read=علامت‌گذاری تمامی مطالب به‌عنوان خوانده‌شده
about.shortcuts.open_in_new_tab_mark_as_read=باز‌کردن مطلب در سربرگ جدید و علامت‌گذاری آن به‌عنوان خوانده‌شده
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=ناوبری به یک اشتراک با نوشتن نام اشتراک

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=merkitse valittu otsikko tähdelliseksi
about.shortcuts.mark_current_entry=merkitse valittu otsikko luetuksi tai lukemattomaksi
about.shortcuts.mark_all_as_read=merkitse kaikki otsikot luetuiksi
about.shortcuts.open_in_new_tab_mark_as_read=avaa otsikko uudessa ikkunassa ja merkitse se luetuksi
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=etsi tilaus sen nimen perusteella

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=Marquer/enlever l'étoile de l'entrée courante
about.shortcuts.mark_current_entry=Marquer comme lue/non-lue l'entrée courante
about.shortcuts.mark_all_as_read=Marquer toutes les entrées comme lues
about.shortcuts.open_in_new_tab_mark_as_read=Ouvrir l'entrée courante dans une nouvelle fenêtre et marquer comme lue
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navigate to a subscription by entering the subscription name ####### Needs translation

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=marcar/desmarcar a entrada actual
about.shortcuts.mark_current_entry=marcar como lida/non lida a entrada actual
about.shortcuts.mark_all_as_read=marcar todas as entradas como lidas
about.shortcuts.open_in_new_tab_mark_as_read=abrir entrada nunha nova lapela e marcar como lida
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navegue ate unha suscrición introducindo o nome da suscrición

View File

@@ -45,6 +45,7 @@ toolbar.about=راجه‌به
toolbar.logout=برین
toolbar.donate=مالی ایلجار
view.entry_author=by ####### Needs translation
view.error_while_loading_feed=حئف ببؤ! ای خوراکˇ جؤر أمأنˇ سر خطا ببؤ.
view.keep_unread=نخانده بدأر.
view.no_unread_items=نخانده مطلب دنه.
@@ -127,4 +128,6 @@ about.shortcuts.star_unstar=مطلبه نشانه‌دار گودن/نگودن
about.shortcuts.mark_current_entry=مطلبه نشانه‌دار گودن کی بخانه/نخانده ایسه
about.shortcuts.mark_all_as_read=همه‌ته مطالبه نشانه بنه کی بخانده ببؤن
about.shortcuts.open_in_new_tab_mark_as_read=مطلبه تازه سرولگˇ میان واگودن و نشانه‌دار کودن به عنوانˇ بخانده
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=اشتراکˇ نامه بنویس و اونه وئر بزن

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=hírelem csillagozása
about.shortcuts.mark_current_entry=elem megjelölése olvasottként
about.shortcuts.mark_all_as_read=az összes elem megjelölése olvasottként
about.shortcuts.open_in_new_tab_mark_as_read=elem megnyitása új fülön és megjelölése olvasottként
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=név szerinti keresés a hírcsatornák között

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=star/unstar current entry
about.shortcuts.mark_current_entry=mark as read/unread current entry
about.shortcuts.mark_all_as_read=mark all entries as read
about.shortcuts.open_in_new_tab_mark_as_read=open entry in new tab and mark as read
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navigate to a subscription by entering the subscription name ####### Needs translation

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=현재 항목 스타/스타제거
about.shortcuts.mark_current_entry=현재 항목 읽음/안읽음 표시
about.shortcuts.mark_all_as_read=모든 항목 읽음으로 표시
about.shortcuts.open_in_new_tab_mark_as_read=읽음으로 표시하고 새로운 탭에서 열기
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navigate to a subscription by entering the subscription name ####### Needs translation

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=legg til stjerne/fjern stjerne fra gjeldende artikke
about.shortcuts.mark_current_entry=merk gjeldende artikkel som lest/ulest
about.shortcuts.mark_all_as_read=merk alle artikler som lest
about.shortcuts.open_in_new_tab_mark_as_read=åpne artikkel i ny fane og merk som lest
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=naviger til et abonnement ved å skrive inn abonnementsnavnet

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=Voeg artikel toe aan/verwijder uit favorieten
about.shortcuts.mark_current_entry=Markeer huidig artikel als gelezen/ongelezen
about.shortcuts.mark_all_as_read=Markeer alle artikelen als gelezen
about.shortcuts.open_in_new_tab_mark_as_read=Open artikel in een nieuw tabblad en markeer als gelezen
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navigate to a subscription by entering the subscription name ####### Needs translation

View File

@@ -128,4 +128,6 @@ about.shortcuts.star_unstar=legg til stjerne/fjern stjerne frå gjeldande artikk
about.shortcuts.mark_current_entry=merk gjeldande artikkel som lesen/ulesen
about.shortcuts.mark_all_as_read=merk alle artiklar som lesne
about.shortcuts.open_in_new_tab_mark_as_read=opne artikkel i ny fane og merk som lesen
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=naviger til eit abonnement ved å skrive inn abonnementsnamnet

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=oznacz/odznacz gwiazdką bieżący element
about.shortcuts.mark_current_entry=oznacz jako przeczytany/nieprzeczytany obecny element
about.shortcuts.mark_all_as_read=oznacz wszystko jako przeczytane
about.shortcuts.open_in_new_tab_mark_as_read=otwórz w nowej zakładce i oznacz jako przeczytane
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=przejdź do subskrybcji wpisując jej nazwę

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=marca/desmarca estrela do item atual
about.shortcuts.mark_current_entry=marca item atual como lido/não lido
about.shortcuts.mark_all_as_read=marca todos os itens como lidos
about.shortcuts.open_in_new_tab_mark_as_read=abre item em uma nova aba e marca como lido
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navega entre inscrições buscando pelo nome

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=добавить/убрать из избранно
about.shortcuts.mark_current_entry=пометить текущюю запись как прочитанную
about.shortcuts.mark_all_as_read=пометить всё как прочитанное
about.shortcuts.open_in_new_tab_mark_as_read=открыть запись в новом окне и пометить как прочитанную
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=перейти к подписке вписав название подписки

View File

@@ -128,4 +128,6 @@ about.shortcuts.star_unstar=označiť aktuálnu položku ako obľúbenú/neobľ
about.shortcuts.mark_current_entry=označiť aktuálnu položku ako prečítanú/neprečítanú
about.shortcuts.mark_all_as_read=označiť všetky položky ako prečítané!
about.shortcuts.open_in_new_tab_mark_as_read=otvoriť položku na novej karte a označiť ju ako prečítanú
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=prejsť k odoberanému zdroju vložením jeho názvu

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=stjärnmärk/ostjärnmärk nuvarande post
about.shortcuts.mark_current_entry=markera nuvarande post läst/oläst
about.shortcuts.mark_all_as_read=markera alla som lästa
about.shortcuts.open_in_new_tab_mark_as_read=öppna nuvarande post i ny flik och markera som läst
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=navigera till en prenumeration via prenumerationsnamn

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=görüntülenen öğeye yıldız ekle/kaldır
about.shortcuts.mark_current_entry=görüntülenen öğeyi okundu/okunmadı işaretle
about.shortcuts.mark_all_as_read=tümünü okundu işaretle
about.shortcuts.open_in_new_tab_mark_as_read=öğeyi yeni bir sekmede aç ve okundu işaretle
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=abonelik ismini yazarak aboneliğe git

View File

@@ -128,5 +128,6 @@ about.shortcuts.star_unstar=该条目加注/取消星标
about.shortcuts.mark_current_entry=标记当前条目为已读/未读
about.shortcuts.mark_all_as_read=标记所有条目为已读
about.shortcuts.open_in_new_tab_mark_as_read=在新的窗口中打开条目并标记为已读
about.shortcuts.font_size=increase/decrease font size of the current entry ####### Needs translation
about.shortcuts.feed_search=输入订阅名称来导航至相应订阅

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,
@@ -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 {
@@ -158,3 +161,27 @@
#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">