From 93516cc7417775d60ab4d6aee84e0308a03e11ef Mon Sep 17 00:00:00 2001 From: Charlie Date: Wed, 12 Sep 2018 10:03:47 -0400 Subject: Add myself to CREDITS.md. --- CREDITS.md | 1 + 1 file changed, 1 insertion(+) (limited to 'CREDITS.md') diff --git a/CREDITS.md b/CREDITS.md index d43c5a322..4b6fdab23 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -53,6 +53,7 @@ People are sorted by name so please keep this order. * [Quentin Dufour](https://github.com/superboum): [contributions](https://github.com/FreshRSS/documentation/commits?author=superboum), [Web](http://quentin.dufour.io/) * [Ramón Cutanda](https://github.com/rcutanda): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rcutanda) * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi) +* [sirideain](https://github.com/sirideain): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=sirideain) * [subic](https://github.com/subic): [contributions](https://github.com/FreshRSS/documentation/commits?author=subic) * [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42) * [Thomas Citharel](https://github.com/tcitworld): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:tomgue), [Web](https://www.tcit.fr/) -- cgit v1.2.3 From de0e9351052b484e054899b9528387d1bde0a1c5 Mon Sep 17 00:00:00 2001 From: Roland Arendes Date: Tue, 25 Sep 2018 23:05:51 +0200 Subject: Small docs update (see #1999) and i18n fix (see #1309) (#2026) * Update conf.php Small i18n fix for german translation * Update README.md Added Reeder-3 as an supported client via Fever API * Update README.md Adding Reeder-3/iOS as an supported client * Update README.fr.md Adding Reeder-3/iOS as an supported client * Update 06_Fever_API.md Adding Reeder-3/iOS as an supported client * Update 06_Fever_API.md Adding Reeder-3/iOS as an supported client * Adding myself As requested, adding myself to the list of contributors --- CREDITS.md | 1 + README.fr.md | 1 + README.md | 1 + app/i18n/de/conf.php | 2 +- docs/en/users/06_Fever_API.md | 1 + docs/fr/users/06_Fever_API.md | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) (limited to 'CREDITS.md') diff --git a/CREDITS.md b/CREDITS.md index 4b6fdab23..a02b9477d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -13,6 +13,7 @@ People are sorted by name so please keep this order. * [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/) * [Anton Smirnov](https://github.com/sandfoxme): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:sandfoxme), [Web](http://sandfox.me/) * [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK) +* [chemical1979](https://github.com/chemical1979): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=chemical1979) * [Craig Andrews](https://github.com/candrews): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:candrews), [Web](http://candrews.integralblue.com/) * [Crupuk](https://github.com/Crupuk): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Crupuk) * [Damstre](https://github.com/Damstre): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Damstre) diff --git a/README.fr.md b/README.fr.md index ef1092e4a..e638568b7 100644 --- a/README.fr.md +++ b/README.fr.md @@ -187,6 +187,7 @@ Tout client supportant une API de type Fever ; Sélection : * iOS * [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Propriétaire) * [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) (Propriétaire) + * [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) (Propriétaire) * MacOS * [Readkit](https://itunes.apple.com/app/readkit/id588726889) (Propriétaire) diff --git a/README.md b/README.md index 0111d6882..0e0a4ba3a 100644 --- a/README.md +++ b/README.md @@ -187,6 +187,7 @@ Supported clients are: * iOS * [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Closed source) * [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) (Closed source) + * [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) (Closed source) * MacOS * [Readkit](https://itunes.apple.com/app/readkit/id588726889) (Closed source) diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php index 78f3b4510..3a0c98c27 100644 --- a/app/i18n/de/conf.php +++ b/app/i18n/de/conf.php @@ -102,7 +102,7 @@ return array( 'read' => array( 'article_open_on_website' => 'wenn der Artikel auf der Original-Webseite geöffnet wird', 'article_viewed' => 'wenn der Artikel angesehen wird', - 'scroll' => 'beim Blättern', + 'scroll' => 'beim Scrollen bzw. Überspringen', 'upon_reception' => 'beim Empfang des Artikels', 'when' => 'Artikel als gelesen markieren…', ), diff --git a/docs/en/users/06_Fever_API.md b/docs/en/users/06_Fever_API.md index 7d2af8b02..971cf957d 100644 --- a/docs/en/users/06_Fever_API.md +++ b/docs/en/users/06_Fever_API.md @@ -23,6 +23,7 @@ Tested with: - iOS - [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) - [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) + - [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) - MacOS - [Readkit](https://itunes.apple.com/app/readkit/id588726889) diff --git a/docs/fr/users/06_Fever_API.md b/docs/fr/users/06_Fever_API.md index 6ad817041..50650ebcd 100644 --- a/docs/fr/users/06_Fever_API.md +++ b/docs/fr/users/06_Fever_API.md @@ -10,6 +10,7 @@ Testé avec: - iOS - [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) - [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) + - [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) - MacOS - [Readkit](https://itunes.apple.com/app/readkit/id588726889) -- cgit v1.2.3 From 9897086e8cb4a34aa0b2fedde2f34f52209b238b Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 21 Oct 2018 16:43:48 +0200 Subject: Changelog 2056 2057 2058 2059 https://github.com/FreshRSS/FreshRSS/issues/2056 https://github.com/FreshRSS/FreshRSS/pull/2057 https://github.com/FreshRSS/FreshRSS/pull/2058 https://github.com/FreshRSS/FreshRSS/pull/2059 --- CHANGELOG.md | 4 ++++ CREDITS.md | 1 + 2 files changed, 5 insertions(+) (limited to 'CREDITS.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 778596427..48fe520f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ * Handle authors containing spaces, as well as comma or semi-colon separated authors [#2025](https://github.com/FreshRSS/FreshRSS/pull/2025) * Searches by tag, author, etc. accept Unicode characters [#2025](https://github.com/FreshRSS/FreshRSS/pull/2025) * New option to disable cache for feeds with invalid HTTP caching [#2052](https://github.com/FreshRSS/FreshRSS/pull/2052) +* Security + * Improved flow for password change (avoid error 403) [#2056](https://github.com/FreshRSS/FreshRSS/issues/2056) * UI * Click on authors to initiate a search by author [#2025](https://github.com/FreshRSS/FreshRSS/pull/2025) * Fix CSS for button alignments in older Chrome versions [#2020](https://github.com/FreshRSS/FreshRSS/pull/2020) @@ -21,6 +23,8 @@ * Deployment * Fix Docker bug with some cron values [#2032](https://github.com/FreshRSS/FreshRSS/pull/2032) * Perform `git clean -f -d -f` (removes unknown files and folders) before git auto-update method [#2036](https://github.com/FreshRSS/FreshRSS/pull/2036) +* I18n + * Fix missing German translation for *Sharing with Known* [#2059](https://github.com/FreshRSS/FreshRSS/pull/2059) * Bug fixing * Ask confirmation for important configuration actions [#2048](https://github.com/FreshRSS/FreshRSS/pull/2048) * Fix database size in the Web UI for users about to be deleted [#2047](https://github.com/FreshRSS/FreshRSS/pull/2047) diff --git a/CREDITS.md b/CREDITS.md index a02b9477d..980b6e137 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -59,5 +59,6 @@ People are sorted by name so please keep this order. * [Tets42](https://github.com/Tets42): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Tets42) * [Thomas Citharel](https://github.com/tcitworld): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:tomgue), [Web](https://www.tcit.fr/) * [tomgue](https://github.com/tomgue): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=tomgue) +* [Twilek-de](https://github.com/Twilek-de): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Twilek-de) * [Uncovery](https://github.com/uncovery): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:uncovery) * [Wanabo](https://github.com/Wanabo): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Wanabo) -- cgit v1.2.3 From 7de31bb9567cc0acad258896514c4904f125f38a Mon Sep 17 00:00:00 2001 From: Patrick Crandol Date: Wed, 24 Oct 2018 03:42:58 -0400 Subject: Add Swage Theme (#2069) * Add Swage Theme Add a new Theme to FreshRSS * Update Credits Add additional line to Credits * CSS Fixes Fix glitches in CSS. * Add Missing Icon Add Icon was missing from theme. --- CREDITS.md | 1 + p/themes/Swage/icons/add.svg | 7 + p/themes/Swage/icons/all.svg | 7 + p/themes/Swage/icons/bookmark-add.svg | 6 + p/themes/Swage/icons/bookmark.svg | 6 + p/themes/Swage/icons/category.svg | 12 + p/themes/Swage/icons/configure.svg | 12 + p/themes/Swage/icons/down.svg | 6 + p/themes/Swage/icons/error.svg | 5 + p/themes/Swage/icons/icon.svg | 14 + p/themes/Swage/icons/import.svg | 6 + p/themes/Swage/icons/next.svg | 5 + p/themes/Swage/icons/non-starred.svg | 6 + p/themes/Swage/icons/prev.svg | 6 + p/themes/Swage/icons/read.svg | 5 + p/themes/Swage/icons/refresh.svg | 6 + p/themes/Swage/icons/rss.svg | 7 + p/themes/Swage/icons/starred.svg | 6 + p/themes/Swage/icons/unread.svg | 6 + p/themes/Swage/icons/up.svg | 6 + p/themes/Swage/icons/view-global.svg | 6 + p/themes/Swage/icons/view-normal.svg | 8 + p/themes/Swage/icons/view-reader.svg | 6 + p/themes/Swage/loader.gif | Bin 0 -> 10242 bytes p/themes/Swage/metadata.json | 7 + p/themes/Swage/swage.css | 1 + p/themes/Swage/swage.scss | 1134 +++++++++++++++++++++++++++++++++ p/themes/Swage/thumbs/original.png | Bin 0 -> 260913 bytes 28 files changed, 1297 insertions(+) create mode 100644 p/themes/Swage/icons/add.svg create mode 100644 p/themes/Swage/icons/all.svg create mode 100644 p/themes/Swage/icons/bookmark-add.svg create mode 100644 p/themes/Swage/icons/bookmark.svg create mode 100644 p/themes/Swage/icons/category.svg create mode 100644 p/themes/Swage/icons/configure.svg create mode 100644 p/themes/Swage/icons/down.svg create mode 100644 p/themes/Swage/icons/error.svg create mode 100644 p/themes/Swage/icons/icon.svg create mode 100644 p/themes/Swage/icons/import.svg create mode 100644 p/themes/Swage/icons/next.svg create mode 100644 p/themes/Swage/icons/non-starred.svg create mode 100644 p/themes/Swage/icons/prev.svg create mode 100644 p/themes/Swage/icons/read.svg create mode 100644 p/themes/Swage/icons/refresh.svg create mode 100644 p/themes/Swage/icons/rss.svg create mode 100644 p/themes/Swage/icons/starred.svg create mode 100644 p/themes/Swage/icons/unread.svg create mode 100644 p/themes/Swage/icons/up.svg create mode 100644 p/themes/Swage/icons/view-global.svg create mode 100644 p/themes/Swage/icons/view-normal.svg create mode 100644 p/themes/Swage/icons/view-reader.svg create mode 100644 p/themes/Swage/loader.gif create mode 100644 p/themes/Swage/metadata.json create mode 100644 p/themes/Swage/swage.css create mode 100644 p/themes/Swage/swage.scss create mode 100644 p/themes/Swage/thumbs/original.png (limited to 'CREDITS.md') diff --git a/CREDITS.md b/CREDITS.md index 980b6e137..95bf8adce 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -46,6 +46,7 @@ People are sorted by name so please keep this order. * [Nicolas Lœuillet](https://github.com/nicosomb): [contributions](https://github.com/FreshRSS/documentation/commits?author=nicosomb), [Web](http://www.loeuillet.org/) * [Nicola Spanti](https://github.com/RyDroid): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:RyDroid), [Web](http://www.nicola-spanti.info/) * [Olivier Dossmann](https://github.com/blankoworld): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=blankoworld), [Web](https://olivier.dossmann.net) +* [Patrick Crandol](https://github.com/pattems): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:pattems) * [perrinjerome](https://github.com/perrinjerome): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:perrinjerome) * [plopoyop](https://github.com/plopoyop): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=plopoyop) * [Paulius Šukys](https://github.com/psukys): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:psukys), [Web](http://sukys.eu) diff --git a/p/themes/Swage/icons/add.svg b/p/themes/Swage/icons/add.svg new file mode 100644 index 000000000..49ca39bb4 --- /dev/null +++ b/p/themes/Swage/icons/add.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/p/themes/Swage/icons/all.svg b/p/themes/Swage/icons/all.svg new file mode 100644 index 000000000..df7d903b1 --- /dev/null +++ b/p/themes/Swage/icons/all.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/p/themes/Swage/icons/bookmark-add.svg b/p/themes/Swage/icons/bookmark-add.svg new file mode 100644 index 000000000..ee23bff9b --- /dev/null +++ b/p/themes/Swage/icons/bookmark-add.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/bookmark.svg b/p/themes/Swage/icons/bookmark.svg new file mode 100644 index 000000000..09bf263fd --- /dev/null +++ b/p/themes/Swage/icons/bookmark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/category.svg b/p/themes/Swage/icons/category.svg new file mode 100644 index 000000000..f0b57d5a1 --- /dev/null +++ b/p/themes/Swage/icons/category.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/p/themes/Swage/icons/configure.svg b/p/themes/Swage/icons/configure.svg new file mode 100644 index 000000000..a1a87180e --- /dev/null +++ b/p/themes/Swage/icons/configure.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/p/themes/Swage/icons/down.svg b/p/themes/Swage/icons/down.svg new file mode 100644 index 000000000..6450ee37e --- /dev/null +++ b/p/themes/Swage/icons/down.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/error.svg b/p/themes/Swage/icons/error.svg new file mode 100644 index 000000000..840c8c57b --- /dev/null +++ b/p/themes/Swage/icons/error.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/p/themes/Swage/icons/icon.svg b/p/themes/Swage/icons/icon.svg new file mode 100644 index 000000000..c6bbd08bd --- /dev/null +++ b/p/themes/Swage/icons/icon.svg @@ -0,0 +1,14 @@ + + + +Logo FreshRSS + + + + + + diff --git a/p/themes/Swage/icons/import.svg b/p/themes/Swage/icons/import.svg new file mode 100644 index 000000000..1f26448ff --- /dev/null +++ b/p/themes/Swage/icons/import.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/next.svg b/p/themes/Swage/icons/next.svg new file mode 100644 index 000000000..056e70f3c --- /dev/null +++ b/p/themes/Swage/icons/next.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/p/themes/Swage/icons/non-starred.svg b/p/themes/Swage/icons/non-starred.svg new file mode 100644 index 000000000..714697060 --- /dev/null +++ b/p/themes/Swage/icons/non-starred.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/prev.svg b/p/themes/Swage/icons/prev.svg new file mode 100644 index 000000000..2f6ed886c --- /dev/null +++ b/p/themes/Swage/icons/prev.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/read.svg b/p/themes/Swage/icons/read.svg new file mode 100644 index 000000000..86f3e60f3 --- /dev/null +++ b/p/themes/Swage/icons/read.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/p/themes/Swage/icons/refresh.svg b/p/themes/Swage/icons/refresh.svg new file mode 100644 index 000000000..858a1f50f --- /dev/null +++ b/p/themes/Swage/icons/refresh.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/rss.svg b/p/themes/Swage/icons/rss.svg new file mode 100644 index 000000000..0be960048 --- /dev/null +++ b/p/themes/Swage/icons/rss.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/p/themes/Swage/icons/starred.svg b/p/themes/Swage/icons/starred.svg new file mode 100644 index 000000000..09bf263fd --- /dev/null +++ b/p/themes/Swage/icons/starred.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/unread.svg b/p/themes/Swage/icons/unread.svg new file mode 100644 index 000000000..28c654176 --- /dev/null +++ b/p/themes/Swage/icons/unread.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/up.svg b/p/themes/Swage/icons/up.svg new file mode 100644 index 000000000..2b89c550c --- /dev/null +++ b/p/themes/Swage/icons/up.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/view-global.svg b/p/themes/Swage/icons/view-global.svg new file mode 100644 index 000000000..c289498e6 --- /dev/null +++ b/p/themes/Swage/icons/view-global.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/icons/view-normal.svg b/p/themes/Swage/icons/view-normal.svg new file mode 100644 index 000000000..9135c070f --- /dev/null +++ b/p/themes/Swage/icons/view-normal.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/p/themes/Swage/icons/view-reader.svg b/p/themes/Swage/icons/view-reader.svg new file mode 100644 index 000000000..f8f9e7af5 --- /dev/null +++ b/p/themes/Swage/icons/view-reader.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/p/themes/Swage/loader.gif b/p/themes/Swage/loader.gif new file mode 100644 index 000000000..b7c6647cd Binary files /dev/null and b/p/themes/Swage/loader.gif differ diff --git a/p/themes/Swage/metadata.json b/p/themes/Swage/metadata.json new file mode 100644 index 000000000..a81c10cfd --- /dev/null +++ b/p/themes/Swage/metadata.json @@ -0,0 +1,7 @@ +{ + "name": "Swage", + "author": "Patrick Crandol", + "description": "A Fresh take on the interface, inspired by the Flat Theme.", + "version": 1.0, + "files": ["_template.css", "swage.css"] +} diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css new file mode 100644 index 000000000..a1b03aa2a --- /dev/null +++ b/p/themes/Swage/swage.css @@ -0,0 +1 @@ +.dropdown-menu>.item:hover>a,.nav-list a:hover,a.btn{text-decoration:none}.btn,.header>.item,.horizontal-list .item,.stick,input,select,textarea{vertical-align:middle}.btn,.flux_header,label{cursor:pointer}input,select,textarea{min-height:25px;margin-top:4px;line-height:25px;background:#FCFCFC;border:none;padding-left:5px}input:invalid,select:invalid{color:#B0425B;border-color:#B0425B;box-shadow:none}.nav-list .item,.nav-list .nav-header{height:2.5em;line-height:2.5em;font-size:.9rem}.dropdown-menu>.item,.dropdown-menu>.item button,.dropdown-menu>.item>a,.dropdown-menu>.item>as-link,.dropdown-menu>.item>span{padding:0 22px;line-height:2.5em;font-size:.8rem;color:#FCFCFC}.flux::after,.form-group::after{content:"";display:block;clear:both}.btn,legend{display:inline-block}body,html{height:100%;font-family:Helvetica,Arial,sans-serif}a{color:#00488b;outline:0}a.btn{min-height:25px;line-height:25px}a.btn:hover{background:#00488b}img.icon:hover{background:0 0}div#stream{margin-top:35px}sup{top:-.3em}legend{width:auto;margin:20px 0 5px;padding:5px 20px;font-size:1.4em;clear:both;background:#e3e3e3}.form-group:hover,input:disabled,select:disabled,th{background:#FCFCFC}label{min-height:25px;color:#FCFCFC}textarea{width:360px;height:100px}input:focus,select:focus,textarea:focus{color:darken #FCFCFC,40%;border-color:#00488b}input.extend{transition:width .2s linear}option{padding:0 .5em}table{border-collapse:collapse}td,th,tr{padding:.5em;border:1px solid #e3e3e3}form td,form th{font-weight:400;text-align:center}.category .title.error::before{display:inline-block;padding-right:7px;width:16px;content:url(../Swage/icons/error.svg)}.form-group{padding:5px;border:1px solid transparent}.form-group:hover{border:1px solid #FCFCFC}.form-group.form-actions{margin:15px 0 25px;padding:5px 0;background:#e3e3e3;border-top:3px solid #e3e3e3}.form-group.form-actions .btn{margin:0 10px}.form-group .group-name{padding:10px 0;text-align:right}.form-group .group-controls{min-height:25px;padding:5px 0}.form-group .group-controls .control{line-height:2em}.form-group table{margin:10px 0 0 220px}.stick{font-size:0}.btn{min-height:35px;min-width:15px;margin:0;padding:5px 10px;font-size:.9rem;overflow:hidden;background:#0062be;border:none;color:#FCFCFC}.btn :active,.btn :hover,.btn.active{background:#00488b;text-decoration:none}.btn-attention,.btn-important{font-weight:400;background:#FA8052;color:#FCFCFC}.btn-attention :active,.btn-attention:hover,.btn-important :active,.btn-important:hover{background:#f95c20!important}.nav-list .nav-header{padding:0 10px;font-weight:700;background:#22303d;color:#FCFCFC}.nav-list .item .active,.nav-list .item:hover{background:#00488b;color:#FCFCFC}.nav-list .item .active .error a,.nav-list .item .active a,.nav-list .item .active.empty a,.nav-list .item:hover .error a,.nav-list .item:hover a,.nav-list .item:hover.empty a{color:#FCFCFC}.nav-list .item .active.empty a,.nav-list .item:hover.empty a{background:#FA8052}.nav-list .item .active.error a,.nav-list .item:hover.error a{background:#c46178}.nav-list .item>a{padding:0 10px}.nav-list .item.empty a{color:#FA8052}.nav-list .item.error a{color:#c46178}.nav-list .disable{text-align:center;background:#FCFCFC;color:darken #FCFCFC,40%}.nav-list .nav-form{padding:3px;text-align:center}.nav-head{margin:0;text-align:right;background:#22303d;color:#FCFCFC}.nav-head a{color:#FCFCFC}.nav-head .item{padding:5px 10px;font-size:.9rem;line-height:1.5rem}.horizontal-list{margin:0;padding:0}.dropdown-menu{padding:5px 0;font-size:.8rem;text-align:left;border:none;background-color:#00488b}.dropdown-menu>.item{padding:0;margin-left:10px}.dropdown-menu>.item>a{min-width:initial}.dropdown-menu>.item:hover{background:#0062be;color:#FCFCFC}.alert,.alert-error,.alert-success,.alert-warn{background:#FCFCFC}.dropdown-menu>.item:hover>a{color:#FCFCFC}.dropdown-menu>.item[aria-checked=true]>a::before{font-weight:700;margin:0 0 0 -14px}.dropdown-menu .input input,.dropdown-menu .input select{margin:0 auto 5px;padding:2px 5px}.dropdown-header{padding:0 5px 5px;font-weight:700;text-align:left;color:#FCFCFC}.separator{margin:5px 0;border-bottom:1px solid #e3e3e3}.alert,.alert-error,.alert-success,.alert-warn{border:none}.alert{margin:5px auto;padding:10px 15px;font-size:.9em;color:darken #FCFCFC,40%;text-shadow:0 0 1px #FCFCFC}.alert>a{text-decoration:underline;color:inherit}#bigMarkAsRead,#new-article>a:hover,.header>.item.title h1 a,.pagination .item a,.tree-folder-items>.item>a,.tree-folder-title .title:hover{text-decoration:none}.alert-head{font-size:1.15em}.alert-warn{color:#FA8052}.alert-success{color:#5EAABF}.alert-error{color:#B0425B}.pagination{text-align:center;font-size:.8em;background:#e3e3e3;color:#181621}.pagination .item.pager-current{font-weight:700;font-size:1.5em;background:#22303d;color:#e3e3e3}.pagination .item a{display:block;font-style:italic;line-height:3em;color:#181621}.pagination .item a:hover{background:#22303d;color:#e3e3e3}.pagination .loading,.pagination a:hover.loading{font-size:0;background:url(loader.gif) center center no-repeat #22303d}.content{padding:20px 10px}.content .pagination{margin:0;padding:0}.content hr{margin:30px 10px;height:1px;background:#e3e3e3;border:0;box-shadow:0 2px 5px #e3e3e3}.content pre{margin:10px auto;padding:10px 20px;overflow:auto;background:#181621;color:#FCFCFC;font-size:.9rem}.content pre code{background:0 0;color:#FCFCFC;border:none}.content code{padding:2px 5px;color:#B0425B;background:#FCFCFC;border:1px solid #FCFCFC}.box .box-title,.content blockquote{margin:0;border-bottom:1px solid #e3e3e3}.content blockquote{display:block;padding:5px 20px;border-top:1px solid #e3e3e3;background:#FCFCFC;color:darken #FCFCFC,40%}.content blockquote p{margin:0}.content>h1.title>a{color:#181621}.box{border:1px solid #e3e3e3}.box .box-title{padding:5px 10px;background:#e3e3e3;color:darken #FCFCFC,40%}.box .box-content{max-height:260px}.box .box-content .item{padding:0 10px;font-size:.9rem;line-height:2.5em}.box .box-content .item .configure{visibility:hidden}.box .box-content .item .configure .icon{vertical-align:middle;background-color:#e3e3e3}.box .box-content .item:hover .configure{visibility:visible}.box.category .box-title .title{font-weight:400;text-decoration:none;text-align:left}.header h1,.prompt{text-align:center}.box.category:not([data-unread="0"]) .box-title{background:#0062be}.box.category:not([data-unread="0"]) .box-title:active{background:#00488b}.box.category:not([data-unread="0"]) .box-title .title{font-weight:700;color:#FCFCFC}.box.category .title:not([data-unread="0"])::after{position:absolute;top:5px;right:10px;border:0;background:0 0;font-weight:700;box-shadow:none;text-shadow:none}.box.category .item.feed{padding:2px 10px;font-size:.8rem}.tree{margin:10px 0}.tree-folder-title{position:relative;padding:0 10px;background:#22303d;line-height:2.3rem;font-size:1rem;height:35px}.tree-folder-title .title{background:inherit;color:#FCFCFC}.tree-folder-items{background:#22303d}.tree-folder-items>.item{padding:0 10px;line-height:2.5rem;font-size:.8rem}.tree-folder-items>.item.active{background:#00488b}.tree-folder-items>.item>a{color:#FCFCFC}.header>.item.title{width:231px;position:absolute}.header>.item.title h1{margin:0;display:block}.header>.item.title h1 a{color:#FCFCFC}.header>.item.title .logo{display:inline-block;height:26px;vertical-align:top;position:relative;top:5px}.day .name,.header .item.search{display:none}.header>.item.search input{width:230px}.header .item.search input:focus{width:350px}.header .item.configure{position:fixed;right:0;z-index:1000;width:35px}.header h1{font-size:1.5em}.aside{background:#22303d;padding:35px 0;width:231px}.aside.aside_feed .tree{margin:0 0 50px}.aside.aside_feed .nav-form input,.aside.aside_feed .nav-form select{width:140px}.aside.aside_feed .nav-form .dropdown .dropdown-menu{right:-20px}.aside.aside_feed .nav-form .dropdown .dropdown-menu::after{right:33px}.aside_feed .tree-folder-title>.title:not([data-unread="0"])::after{position:absolute;right:0;margin:6px 0;padding:0 10px;font-size:.9rem;line-height:1.5rem;background:inherit}.aside_feed .tree-folder-items .dropdown-menu::after{left:2px}#new-article,.notification{position:fixed;bottom:48px;left:0}.post{padding:10px 50px;font-size:.9em}.post form{margin:10px 0}.post.content{max-width:550px}.prompt label{text-align:left}#new-article,.day{text-align:center}.prompt form{margin:10px auto 20px;width:200px}.prompt input{margin:5px auto;width:100%}.prompt p{margin:20px 0}#new-article{font-size:1em;background:#0062be;z-index:900;width:231px;line-height:1.5em}#new-article:hover{background:#00488b}#new-article>a{line-height:1.5em;font-weight:700;color:#FCFCFC}.day{padding:0 10px;font-weight:700;line-height:3em}.nav a{color:#FCFCFC}.nav_menu{font-size:0;background-color:#0062be;position:fixed;width:100%;z-index:900}.nav_menu .item.search{display:inline-block;position:fixed;right:40px}.flux{padding-right:10px;background:#FCFCFC}.flux::after{margin:0 auto;width:90%;border-top:1px solid #e3e3e3}#nav_entries,.notification{text-align:center;width:231px}.flux .current,.flux .current:not(.current):hover .item.title,.flux:hover,.flux:hover:not(.current):hover .item.title{background:#FFF}.flux.not_read,.flux.not_read:not(.current):hover .item.title{background:#FFF3ED}.flux.favorite,.flux.favorite:not(.current):hover .item.title{background:#FFF6DA}.flux .date{font-size:.7rem;color:darken #FCFCFC,40%}.flux .bottom{font-size:.8rem;text-align:center}.flux .website .favicon{padding:5px}.flux_header{font-size:.8rem}.flux_header .title{font-size:.9rem}.notification{font-weight:700;font-size:1em;padding:10px 0;z-index:10;vertical-align:middle;background:#e3e3e3;color:darken #FCFCFC,40%;border:none;top:auto;height:auto}.notification .bad,.notification.good{color:#FCFCFC}.notification.good,.notification.good a.close:hover{background:#5EAABF}.notification.bad,.notification.bad a.close:hover{background:#c46178}.notification#actualizeProgress{line-height:2em}.notification a.close{display:none}#bigMarkAsRead{text-align:center;background:#e3e3e3;padding:20px!important}#bigMarkAsRead:hover{background:#22303d;color:#FCFCFC}#nav_entries{margin:0;line-height:3em;table-layout:fixed;background:#22303d}.stat{margin:10px 0 20px}.stat td,.stat th,.stat tr{border:none}.stat>table td,.stat>table th{border-bottom:1px solid #e3e3e3}.stat>.horizontal-list{margin:0 0 5px}.stat>.horizontal-list .item{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.stat>.horizontal-list .item:first-child{width:270px}.loglist{overflow:hidden;border:1px solid darken}.log{margin:10px 0;padding:5px 2%;overflow:auto;font-size:.8rem;background:#FCFCFC;color:darken #FCFCFC,40%}.log>.date{margin:0 10px 0 0;padding:5px 10px}.log.error>.date{background:#c46178;color:#FCFCFC}.log.warning>.date{background:#FA8052}.log.notice>.date{background:#e3e3e3}.log.debug>.date{background:#181621;color:#FCFCFC}@media (max-width:840px){.dropdown-header,.dropdown-menu>.item{padding:12px}#new-article{width:100%;bottom:initial}.header{display:table}.header .item.title .logo{display:none}.header>.item.title h1 a{display:block;position:absolute;top:-35px;left:10px;font-size:.6em}.header .item.configure,button.read_all.btn{display:none}.flux .item.manage,.flux_header .item.website{width:35px;text-align:center}#panel .close,.aside .toggle_aside{line-height:50px;text-align:right;background:#22303d;display:block}.aside{width:0;transition:width .2s linear}.aside .toggle_aside{height:50px;padding-right:10px}.aside.aside_feed{padding:0}.aside:target{width:78%}.nav_menu{position:initial;height:71px}.nav_menu .btn{margin:5px 10px}.nav_menu .stick{margin:0 10px}.nav_menu .stick .btn{margin:5px 0}.nav_menu .search{position:absolute!important;top:35px;left:55px}.nav_menu .search input{width:85%}.pagination{margin:0 0 3.5em}#panel .close{height:50px;padding-right:10px}.day .name{font-size:1.1rem}.notification{width:100%}.notification a.close{display:block;left:0;background:0 0}.notification a.close:hover{opacity:.5}.notification a.close .icon{display:none}#nav_entries{width:100%!important}div#stream{margin-top:0}a.btn.toggle_aside{position:absolute;top:29px}a#actualize,a#toggle-order,div#nav_menu_actions,div#nav_menu_views,form#mark-read-menu{position:absolute}form#mark-read-menu{right:46px;top:30px;z-index:1100}a#actualize,a#toggle-order{right:0}a#actualize{top:29px}a#toggle-order,div#nav_menu_actions,div#nav_menu_views{top:65px}div#nav_menu_actions{left:0}div#nav_menu_views{right:50px}}@media (max-width:410px){.nav_menu .stick{margin:0}}@media (max-width:374px){#nav_menu_views{display:none}}button.as-link{color:#FCFCFC;outline:0}.dropdown-target:target~.btn.dropdown-toggle{background:#00488b}.tree-folder.active .tree-folder-title{background:#00488b;font-weight:700}.feed.item.empty{color:#FA8052}.feed.item.empty.active{background:#FA8052;color:#FCFCFC}.feed.item.empty.active>a{color:#FCFCFC}.feed.item.empty>a{color:#FA8052}.feed.item.error{color:#c46178}.feed.item.error.active{background:#c46178;color:#FCFCFC}.feed.item.error.active>a{color:#FCFCFC}.feed.item.error>a{color:#c46178}#dropdown-query~.dropdown-menu .dropdown-header .icon{vertical-align:middle;float:right}#stream.reader .flux{padding:0 0 50px;background:#FCFCFC;color:#22303d;border:none}#stream.reader .flux .author{margin:0 0 10px;font-size:90%;color:darken #FCFCFC,40%}#nav_menu_actions ul.dropdown-menu,#nav_menu_read_all ul.dropdown-menu{left:0} \ No newline at end of file diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss new file mode 100644 index 000000000..6c930b6ec --- /dev/null +++ b/p/themes/Swage/swage.scss @@ -0,0 +1,1134 @@ +@charset "UTF-8"; +//colors + +$color_text: #181621; +$color_light: #FCFCFC; +$color_nav: #0062be; +$color_aside: #22303d; +$color_alert: #FA8052; +$color_good: #5EAABF; +$color_bad: #B0425B; +$color_stared: #FFF6DA; +$color_unread: #FFF3ED; +$color_hover: #FFFFFF; + +// @extend-elements +%input { + min-height: 25px; + margin-top: 4px; + line-height: 25px; + vertical-align: middle; + background: $color_light; + border: none; + padding-left: 5px; +} + +%invalid { + color: $color_bad; + border-color: $color_bad; + box-shadow: none; +} + +%nav-list { + height: 2.5em; + line-height: 2.5em; + font-size: 0.9rem; +} + +%dropdown { + padding: 0 22px; + line-height: 2.5em; + font-size: 0.8rem; + color: $color_light; +} + +%after { + content: ""; + display: block; + clear: both; +} + +// /@extend-elements +html, +body { + height: 100%; + font-family: Helvetica, Arial, sans-serif; +} + +a { + color: darken( $color_nav, 10%); + outline: none; + &.btn { + min-height: 25px; + line-height: 25px; + text-decoration: none; + &:hover { + background: darken( $color_nav, 10%); + } + } +} + +img { + &.icon:hover { + background: none; + } +} + +div#stream { + margin-top: 35px; +} + +sup { + top: -0.3em; +} + +legend { + display: inline-block; + width: auto; + margin: 20px 0 5px; + padding: 5px 20px; + font-size: 1.4em; + clear: both; + background: darken( $color_light, 10%); +} + +label { + min-height: 25px; + cursor: pointer; + color: $color_light; +} + +textarea { + width: 360px; + height: 100px; + @extend %input; + &:focus { + color: darken ( $color_light, 40% );; + border-color: darken( $color_nav, 10%); + } +} + +input, +select { + @extend %input; + &:focus { + color: darken ( $color_light, 40% );; + border-color: darken( $color_nav, 10%); + } + &:invalid { + @extend %invalid; + } + &:disabled { + background: $color_light; + } +} + +input { + &.extend { + transition: width 200ms linear; + } +} + +option { + padding: 0 .5em; +} + +table { + border-collapse: collapse; +} + +tr, +td, +th { + padding: 0.5em; + border: 1px solid darken( $color_light, 10%); +} + +th { + background: $color_light; +} + +form { + td, + th { + font-weight: normal; + text-align: center; + } +} +.category { + .title.error::before { + display: inline-block; + padding-right: 7px; + width: 16px; + content: url(../Swage/icons/error.svg); + } +} + + +.form-group { + padding: 5px; + border: 1px solid transparent; + &:hover { + background: $color_light; + border: 1px solid $color_light; + } + &.form-actions { + margin: 15px 0 25px; + padding: 5px 0; + background: darken( $color_light, 10%); + border-top: 3px solid darken( $color_light, 10%); + .btn { + margin: 0 10px; + } + } + .group-name { + padding: 10px 0; + text-align: right; + } + .group-controls { + min-height: 25px; + padding: 5px 0; + .control { + line-height: 2.0em; + } + } + table { + margin: 10px 0 0 220px; + } +} + +.form-group::after { + @extend %after; +} + +.stick { + vertical-align: middle; + font-size: 0; +} + +.btn { + display: inline-block; + min-height: 35px; + min-width: 15px; + margin: 0; + padding: 5px 10px; + font-size: 0.9rem; + vertical-align: middle; + cursor: pointer; + overflow: hidden; + background: $color_nav; + border: none; + color: $color_light; + &.active, + :active, + :hover { + background: darken( $color_nav, 10%); + text-decoration: none; + } +} + +.btn-important, .btn-attention { + font-weight: normal; + background: $color_alert; + color: $color_light; + &:hover, + :active { + background: darken( $color_alert, 10%) !important; + } +} + +.nav-list { + .nav-header { + @extend %nav-list; + padding: 0 10px; + font-weight: bold; + background: $color_aside; + color: $color_light; + } + .item { + @extend %nav-list; + &:hover, + .active { + background: darken( $color_nav, 10%); + color: $color_light; + a { + color: $color_light; + } + &.empty a, + .error a { + color: $color_light; + } + &.empty a { + background: $color_alert; + } + &.error a { + background: lighten( $color_bad, 10%);; + } + } + > a { + padding: 0 10px; + } + &.empty a { + color: $color_alert; + } + &.error a { + color: lighten( $color_bad, 10%);; + } + } + .disable { + text-align: center; + background: $color_light; + color: darken ( $color_light, 40% );; + } + .nav-form { + padding: 3px; + text-align: center; + } + a:hover { + text-decoration: none; + } +} + +.nav-head { + margin: 0; + text-align: right; + background: $color_aside; + color: $color_light; + a { + color: $color_light; + } + .item { + padding: 5px 10px; + font-size: 0.9rem; + line-height: 1.5rem; + } +} + +.horizontal-list { + margin: 0; + padding: 0; + .item { + vertical-align: middle; + } +} + +.dropdown-menu { + padding: 5px 0; + font-size: 0.8rem; + text-align: left; + border: none; + background-color: darken( $color_nav, 10%); + > { + .item { + @extend %dropdown; + padding: 0; + margin-left: 10px; + > a, + > span, + > as-link, + button { + @extend %dropdown; + } + > a { + min-width: initial; + } + &:hover { + background: $color_nav; + color: $color_light; + > a { + text-decoration: none; + color: $color_light; + } + } + } + .item[aria-checked="true"] > a::before { + font-weight: bold; + margin: 0 0 0 -14px; + } + } + .input { + select, + input { + margin: 0 auto 5px; + padding: 2px 5px; + } + } +} + +.dropdown-header { + padding: 0 5px 5px; + font-weight: bold; + text-align: left; + color: $color_light; +} + +.separator { + margin: 5px 0; + border-bottom: 1px solid darken( $color_light, 10%); +} + +.alert { + margin: 5px auto; + padding: 10px 15px; + font-size: 0.9em; + background: $color_light; + border: none; + color: darken ( $color_light, 40% );; + text-shadow: 0 0 1px $color_light; + > a { + text-decoration: underline; + color: inherit; + } +} + +.alert-head { + font-size: 1.15em; +} + +.alert-warn, +.alert-success, +.alert-error { + border: none; +} + +.alert-warn { + background: $color_light; + color: $color_alert; +} + +.alert-success { + background: $color_light; + color: $color_good; +} + +.alert-error { + background: $color_light; + color: $color_bad; +} + +.pagination { + text-align: center; + font-size: 0.8em; + background: darken( $color_light, 10%); + color: $color_text; + .item { + &.pager-current { + font-weight: bold; + font-size: 1.5em; + background: $color_aside; + color: darken( $color_light, 10%); + } + a { + display: block; + font-style: italic; + line-height: 3em; + text-decoration: none; + color: $color_text; + &:hover { + background: $color_aside; + color: darken( $color_light, 10%); + } + } + } + .loading, + a:hover.loading { + font-size: 0; + background: url(loader.gif) center center no-repeat $color_aside; + } +} + +.content { + padding: 20px 10px; + .pagination { + margin: 0; + padding: 0; + } + hr { + margin: 30px 10px; + height: 1px; + background: darken( $color_light, 10%); + border: 0; + box-shadow: 0 2px 5px darken( $color_light, 10%); + } + pre { + margin: 10px auto; + padding: 10px 20px; + overflow: auto; + background: $color_text; + color: $color_light; + font-size: 0.9rem; + code { + background: transparent; + color: $color_light; + border: none; + } + } + code { + padding: 2px 5px; + color: $color_bad; + background: $color_light; + border: 1px solid $color_light; + } + blockquote { + display: block; + margin: 0; + padding: 5px 20px; + border-top: 1px solid darken( $color_light, 10%); + border-bottom: 1px solid darken( $color_light, 10%); + background: $color_light; + color: darken ( $color_light, 40% );; + p { + margin: 0; + } + } + > h1.title > a { + color: $color_text; + } +} + +.box { + border: 1px solid darken( $color_light, 10%); + .box-title { + margin: 0; + padding: 5px 10px; + background: darken( $color_light, 10%); + color: darken ( $color_light, 40% );; + border-bottom: 1px solid darken( $color_light, 10%); + } + .box-content { + max-height: 260px; + .item { + padding: 0 10px; + font-size: 0.9rem; + line-height: 2.5em; + .configure { + visibility: hidden; + .icon { + vertical-align: middle; + background-color: darken( $color_light, 10%); + } + } + &:hover .configure { + visibility: visible; + } + } + } + &.category { + .box-title .title { + font-weight: normal; + text-decoration: none; + text-align: left; + } + &:not([data-unread="0"]) .box-title { + background: $color_nav; + &:active { + background: darken( $color_nav, 10%); + } + .title { + font-weight: bold; + color: $color_light; + } + } + .title:not([data-unread="0"])::after { + position: absolute; + top: 5px; + right: 10px; + border: 0; + background: none; + font-weight: bold; + box-shadow: none; + text-shadow: none; + } + .item.feed { + padding: 2px 10px; + font-size: 0.8rem; + } + } +} + +.tree { + margin: 10px 0; +} + +.tree-folder-title { + position: relative; + padding: 0 10px; + background: $color_aside; + line-height: 2.3rem; + font-size: 1rem; + height: 35px; + .title { + background: inherit; + color: $color_light; + &:hover { + text-decoration: none; + } + } +} + +.tree-folder-items { + background: $color_aside; + > .item { + padding: 0 10px; + line-height: 2.5rem; + font-size: 0.8rem; + &.active { + background: darken( $color_nav, 10%); + } + > a { + text-decoration: none; + color: $color_light; + } + } +} + +.header { + > .item { + vertical-align: middle; + &.title { + width: 231px; + position: absolute; + h1 { + margin: 0; + display: block; + a { + text-decoration: none; + color: $color_light; + } + } + .logo { + display: inline-block; + height: 26px; + vertical-align: top; + position: relative; + top: 5px; + } + } + &.search input { + width: 230px; + } + } + .item.search input:focus { + width: 350px; + } + .item.search { + display: none; + } + .item.configure { + position: fixed; + right: 0px; + z-index: 1000; + width: 35px; + } + h1 { + text-align: center; + font-size: 1.5em; + } +} + +.aside { + background: $color_aside; + padding: 35px 0; + width: 231px; + &.aside_feed { + .tree { + margin: 0 0 50px; + } + .nav-form { + input, + select { + width: 140px; + } + .dropdown { + .dropdown-menu { + right: -20px; + } + .dropdown-menu::after { + right: 33px; + } + } + } + } +} + +.aside_feed { + .tree-folder-title > .title:not([data-unread="0"])::after { + position: absolute; + right: 0; + margin: 6px 0; + padding: 0 10px; + font-size: 0.9rem; + line-height: 1.5rem; + background: inherit; + } + .tree-folder-items .dropdown-menu::after { + left: 2px; + } +} + +.post { + padding: 10px 50px; + font-size: 0.9em; + form { + margin: 10px 0; + } + &.content { + max-width: 550px; + } +} + +.prompt { + text-align: center; + label { + text-align: left; + } + form { + margin: 10px auto 20px auto; + width: 200px; + } + input { + margin: 5px auto; + width: 100%; + } + p { + margin: 20px 0; + } +} + +#new-article { + text-align: center; + font-size: 1em; + background: $color_nav; + position: fixed; + bottom: 48px; + z-index: 900; + left: 0; + width: 231px; + line-height: 1.5em; + &:hover { + background: darken( $color_nav, 10%); + } + > a { + line-height: 1.5em; + font-weight: bold; + color: $color_light; + &:hover { + text-decoration: none; + } + } +} + +.day { + padding: 0 10px; + font-weight: bold; + line-height: 3em; + text-align: center; + .name { + display: none; + } +} + +.nav { + a { + color: $color_light; + } +} + + +.nav_menu { + font-size: 0; + background-color: $color_nav; + position: fixed; + width: 100%; + z-index: 900; + .item.search { + display: inline-block; + position: fixed; + right: 40px; + } +} + +.flux { + padding-right: 10px; + background: $color_light; + &::after { + @extend %after; + margin: 0 auto; + width: 90%; + border-top: 1px solid darken( $color_light, 10%); + } + &:hover, + .current { + background: $color_hover; + &:not(.current):hover .item.title { + background: $color_hover; + } + } + &.not_read { + background: $color_unread; + &:not(.current):hover .item.title { + background: $color_unread; + } + } + &.favorite,{ + background: $color_stared; + &:not(.current):hover .item.title { + background: $color_stared; + } + } + .date { + font-size: 0.7rem; + color: darken ( $color_light, 40% );; + } + .bottom { + font-size: 0.8rem; + text-align: center; + } + .website .favicon { + padding: 5px; + } +} + +.flux_header { + font-size: 0.8rem; + cursor: pointer; + .title { + font-size: 0.9rem; + } +} + +.notification { + text-align: center; + font-weight: bold; + font-size: 1em; + padding: 10px 0; + z-index: 10; + vertical-align: middle; + background: darken( $color_light, 10%); + color: darken ( $color_light, 40% );; + border: none; + position: fixed; + bottom: 48px; + left: 0; + top: auto; + width: 231px; + height: auto; + &.good, + .bad { + color: $color_light; + } + &.good { + background: $color_good; + a.close:hover { + background: $color_good; + } + } + &.bad { + background: lighten( $color_bad, 10%);; + a.close:hover { + background: lighten( $color_bad, 10%);; + } + } + &#actualizeProgress { + line-height: 2em; + } + a.close { + display: none; + } +} + +#bigMarkAsRead { + text-align: center; + text-decoration: none; + background: darken( $color_light, 10%); + padding: 20px !IMPORTANT; + &:hover { + background: $color_aside; + color: $color_light; + } +} + +#nav_entries { + margin: 0; + text-align: center; + line-height: 3em; + table-layout: fixed; + width: 231px; + background: $color_aside; +} + +.stat { + margin: 10px 0 20px; + th, + td, + tr { + border: none; + } + > table { + td, + th { + border-bottom: 1px solid darken( $color_light, 10%); + } + } + > .horizontal-list { + margin: 0 0 5px; + .item { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + &:first-child { + width: 270px; + } + } + } +} + +.loglist { + overflow: hidden; + border: 1px solid darken ( $color_light, 40% );; +} + +.log { + margin: 10px 0; + padding: 5px 2%; + overflow: auto; + font-size: 0.8rem; + background: $color_light; + color: darken ( $color_light, 40% );; + > .date { + margin: 0 10px 0 0; + padding: 5px 10px; + } + &.error > .date { + background: lighten( $color_bad, 10%);; + color: $color_light; + } + &.warning > .date { + background: $color_alert; + } + &.notice > .date { + background: darken( $color_light, 10%); + } + &.debug > .date { + background: $color_text; + color: $color_light; + } +} + +@media(max-width: 840px) { + .dropdown-header, .dropdown-menu > .item { + padding: 12px; + } + + #new-article { + width: 100%; + bottom: initial; + } + .header { + display: table; + .item.title .logo { + display: none; + } + } + .header > .item.title h1 a { + display: block; + position: absolute; + top: -35px; + left: 10px; + font-size: 0.6em; + } + .header .item.configure, + button.read_all.btn { + display: none; + } + .flux .item.manage, + .flux_header .item.website { + width: 35px; + text-align: center; + } + .aside { + width: 0; + transition: width 200ms linear; + .toggle_aside { + display: block; + height: 50px; + line-height: 50px; + text-align: right; + padding-right: 10px; + background: $color_aside; + } + &.aside_feed { + padding: 0; + } + &:target { + width: 78%; + } + } + .nav_menu { + position: initial; + height: 71px; + .btn { + margin: 5px 10px; + } + .stick { + margin: 0 10px; + .btn { + margin: 5px 0; + } + } + .search { + position: absolute !important; + top: 35px; + left: 55px; + input { + width: 85%; + } + } + } + .pagination { + margin: 0 0 3.5em; + } + #panel .close { + display: block; + height: 50px; + line-height: 50px; + text-align: right; + padding-right: 10px; + background: $color_aside; + } + .day .name { + font-size: 1.1rem; + } + .notification { + width: 100%; + a.close { + display: block; + left: 0; + background: transparent; + &:hover { + opacity: 0.5; + } + .icon { + display: none; + } + } + } + #nav_entries { + width: 100% !important; + } + div#stream { + margin-top: 0px; + } + a.btn.toggle_aside { + position: absolute; + top: 29px; + } + form#mark-read-menu, + a#actualize, + a#toggle-order, + div#nav_menu_actions, + div#nav_menu_views { + position: absolute; + } + form#mark-read-menu { + right: 46px; + top: 30px; + z-index: 1100; + } + a#actualize, + a#toggle-order { + right: 0px; + } + a#actualize { + top: 29px; + } + a#toggle-order, + div#nav_menu_actions, + div#nav_menu_views { + top: 65px; + } + div#nav_menu_actions { + left: 0px; + } + div#nav_menu_views { + right: 50px; + } +} + +@media(max-width: 410px) { + .nav_menu .stick { + margin: 0; + } +} + +@media(max-width: 374px) { + #nav_menu_views { + display: none; + } +} + +button.as-link { + color: $color_light; + outline: none; +} + +.dropdown-target:target ~ .btn.dropdown-toggle { + background: darken( $color_nav, 10%); +} + +.tree-folder.active .tree-folder-title { + background: darken( $color_nav, 10%); + font-weight: bold; +} + +.feed.item { + &.empty { + color: $color_alert; + &.active { + background: $color_alert; + color: $color_light; + > a { + color: $color_light; + } + } + > a { + color: $color_alert; + } + } + &.error { + color: lighten( $color_bad, 10%);; + &.active { + background: lighten( $color_bad, 10%);; + color: $color_light; + > a { + color: $color_light; + } + } + > a { + color: lighten( $color_bad, 10%);; + } + } +} + +#dropdown-query ~ .dropdown-menu .dropdown-header .icon { + vertical-align: middle; + float: right; +} + +#stream.reader .flux { + padding: 0 0 50px; + background: $color_light; + color: $color_aside; + border: none; + .author { + margin: 0 0 10px; + font-size: 90%; + color: darken ( $color_light, 40% );; + } +} + +#nav_menu_actions, #nav_menu_read_all { + ul.dropdown-menu { + left: 0px; + } +} \ No newline at end of file diff --git a/p/themes/Swage/thumbs/original.png b/p/themes/Swage/thumbs/original.png new file mode 100644 index 000000000..1b4df3963 Binary files /dev/null and b/p/themes/Swage/thumbs/original.png differ -- cgit v1.2.3 From 60f31a58a5f243587f8a8283274972b3a6d7f55a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 24 Oct 2018 10:46:55 +0200 Subject: Changelog 2069 https://github.com/FreshRSS/FreshRSS/pull/2069 --- CHANGELOG.md | 7 ++++--- CREDITS.md | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'CREDITS.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 48fe520f8..3a8b34188 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,13 +9,14 @@ * Handle authors containing spaces, as well as comma or semi-colon separated authors [#2025](https://github.com/FreshRSS/FreshRSS/pull/2025) * Searches by tag, author, etc. accept Unicode characters [#2025](https://github.com/FreshRSS/FreshRSS/pull/2025) * New option to disable cache for feeds with invalid HTTP caching [#2052](https://github.com/FreshRSS/FreshRSS/pull/2052) -* Security - * Improved flow for password change (avoid error 403) [#2056](https://github.com/FreshRSS/FreshRSS/issues/2056) * UI + * New theme *Swage* [#2069](https://github.com/FreshRSS/FreshRSS/pull/2069) * Click on authors to initiate a search by author [#2025](https://github.com/FreshRSS/FreshRSS/pull/2025) * Fix CSS for button alignments in older Chrome versions [#2020](https://github.com/FreshRSS/FreshRSS/pull/2020) * Updated to jQuery 3.3.1 [#2021](https://github.com/FreshRSS/FreshRSS/pull/2021) * Updated to bcrypt.js 2.4.4 [#2022](https://github.com/FreshRSS/FreshRSS/pull/2022) +* Security + * Improved flow for password change (avoid error 403) [#2056](https://github.com/FreshRSS/FreshRSS/issues/2056) * Performance * Remove some counterproductive preload / prefetch rules [#2040](https://github.com/FreshRSS/FreshRSS/pull/2040) * Improved fast flush (earlier transfer, fetching of resources, and rendering) [#2045](https://github.com/FreshRSS/FreshRSS/pull/2045) @@ -24,7 +25,7 @@ * Fix Docker bug with some cron values [#2032](https://github.com/FreshRSS/FreshRSS/pull/2032) * Perform `git clean -f -d -f` (removes unknown files and folders) before git auto-update method [#2036](https://github.com/FreshRSS/FreshRSS/pull/2036) * I18n - * Fix missing German translation for *Sharing with Known* [#2059](https://github.com/FreshRSS/FreshRSS/pull/2059) + * Fix missing German translations, e.g. for *Sharing with Known* [#2059](https://github.com/FreshRSS/FreshRSS/pull/2059) * Bug fixing * Ask confirmation for important configuration actions [#2048](https://github.com/FreshRSS/FreshRSS/pull/2048) * Fix database size in the Web UI for users about to be deleted [#2047](https://github.com/FreshRSS/FreshRSS/pull/2047) diff --git a/CREDITS.md b/CREDITS.md index 95bf8adce..9d3c07c0e 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -26,6 +26,7 @@ People are sorted by name so please keep this order. * [gsongsong](https://github.com/gsongsong): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong) * [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/) * [Guillaume Hayot](https://github.com/postblue): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:postblue), [Web](https://postblue.info/) +* [Gregor Nathanael Meyer](https://github.com/spackmat): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:spackmat), [Web](https://der-meyer.de) * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb) * [hoilc](https://github.com/hoilc): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:hoilc) * [Jan van den Berg](https://github.com/jan-vandenberg): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jan-vandenberg), [Web](https://j11g.com/) -- cgit v1.2.3