diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-01-25 10:02:32 +0100 |
|---|---|---|
| committer | Bernhard Posselt <BernhardPosselt@users.noreply.github.com> | 2018-01-25 10:02:32 +0100 |
| commit | 79f49fa6f0b5368c197a3346dae1f57e4976e5ca (patch) | |
| tree | 91ac3b2fa8ff30cb32083fb25d2d6aa076c2b989 | |
| parent | 9570304359921751545d526db12ff7696032f2c8 (diff) | |
Stable13 fixes (#254)
* Fixed required class for main content
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixed a external underline
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* proper scroll area
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* proper scroll area 2
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixed transparent settings
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| -rw-r--r-- | css/content.css | 1 | ||||
| -rw-r--r-- | css/settings.css | 4 | ||||
| -rw-r--r-- | js/gui/KeyboardShortcuts.js | 2 | ||||
| -rw-r--r-- | templates/index.php | 2 | ||||
| -rw-r--r-- | templates/part.content.php | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/css/content.css b/css/content.css index 9533ea531..08cfc4673 100644 --- a/css/content.css +++ b/css/content.css @@ -457,6 +457,7 @@ #app-content .heading a { font-weight: bold; color: #222; + text-decoration: none; } #app-content .heading a:hover { text-decoration: underline; diff --git a/css/settings.css b/css/settings.css index 1a1f631b7..eca377d9a 100644 --- a/css/settings.css +++ b/css/settings.css @@ -12,10 +12,6 @@ left: -30000px; } -#app-settings .opened:hover { - background-color: transparent !important; -} - #app-settings-content { padding-bottom: 25px; } diff --git a/js/gui/KeyboardShortcuts.js b/js/gui/KeyboardShortcuts.js index 7a1c20ed0..54b018321 100644 --- a/js/gui/KeyboardShortcuts.js +++ b/js/gui/KeyboardShortcuts.js @@ -330,7 +330,7 @@ $(document).keyup(function (event) { var keyCode = event.keyCode; - var scrollArea = $('#app-content'); + var scrollArea = $('.app-content-detail'); var navigationArea = $('#app-navigation'); var isCompactView = $('#articles.compact').length > 0; var isExpandItem = $('#articles') diff --git a/templates/index.php b/templates/index.php index a7f8bb303..5d9f0f63b 100644 --- a/templates/index.php +++ b/templates/index.php @@ -96,7 +96,7 @@ foreach (Plugin::getScripts() as $appName => $fileName) { }" ng-hide="App.loading.isLoading('global')" ng-view - news-scroll="#app-content" + news-scroll=".app-content-detail" news-scroll-enabled-mark-read="Content.markReadEnabled()" news-scroll-auto-page="Content.autoPage()" news-scroll-mark-read="Content.scrollRead(itemIds)"></div> diff --git a/templates/part.content.php b/templates/part.content.php index 844588c4f..c240053ca 100644 --- a/templates/part.content.php +++ b/templates/part.content.php @@ -6,7 +6,8 @@ compact: Content.isCompactView(), 'feed-view': Content.isFeed() }" - news-compact-expand="{{ Content.isCompactExpand() }}"> + news-compact-expand="{{ Content.isCompactExpand() }}" + class="app-content-detail"> <div ng-show="Content.getItems().length == 0" class="no-feeds-available"> <p ng-show="Content.isShowAll()"><?php p($l->t('No articles available')) ?></p> <p ng-show="!Content.isShowAll()"><?php p($l->t('No unread articles available')) ?></p> |