aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-24 12:03:17 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-24 12:03:17 +0200
commit64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch)
tree311473a357e3dedd496e1417293eed9a2a116ad6 /app/Resources
parent9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff)
parentc64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff)
downloadwallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz
wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst
wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml10
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml2
-rw-r--r--app/Resources/CraueConfigBundle/views/Settings/modify.html.twig4
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css8
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css22
14 files changed, 46 insertions, 18 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index 85079330..3e11d675 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -23,7 +23,7 @@ export: "eksport"
23import: "import" 23import: "import"
24misc: "misc" 24misc: "misc"
25modify_settings: "Gem ændring" 25modify_settings: "Gem ændring"
26piwik_host: Hosting af din side hos Piwik 26piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
27piwik_site_id: ID for din side hos Piwik 27piwik_site_id: ID for din side hos Piwik
28piwik_enabled: Aktiver Piwik 28piwik_enabled: Aktiver Piwik
29demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" 29demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index eaba14cd..c74b5c1f 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -2,14 +2,14 @@ download_pictures: Bilder auf den Server herunterladen
2carrot: Teilen zu Carrot aktivieren 2carrot: Teilen zu Carrot aktivieren
3diaspora_url: Diaspora-URL, sofern der Service aktiviert ist 3diaspora_url: Diaspora-URL, sofern der Service aktiviert ist
4export_epub: ePUB-Export aktivieren 4export_epub: ePUB-Export aktivieren
5export_mobi: .mobi-Export aktivieren 5export_mobi: mobi-Export aktivieren
6export_pdf: PDF-Export aktivieren 6export_pdf: PDF-Export aktivieren
7export_csv: CSV-Export aktivieren 7export_csv: CSV-Export aktivieren
8export_json: JSON-Export aktivieren 8export_json: JSON-Export aktivieren
9export_txt: TXT-Export aktivieren 9export_txt: TXT-Export aktivieren
10export_xml: XML-Export aktivieren 10export_xml: XML-Export aktivieren
11# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 11import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren
12# import_with_redis: Enable Redis to import data asynchronously 12import_with_redis: Aktiviere Redis, um Artikel asynchron zu importieren
13shaarli_url: Shaarli-URL, sofern der Service aktiviert ist 13shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
14share_diaspora: Teilen zu Diaspora aktiveren 14share_diaspora: Teilen zu Diaspora aktiveren
15share_mail: Teilen via E-Mail aktiveren 15share_mail: Teilen via E-Mail aktiveren
@@ -23,9 +23,9 @@ export: "Export"
23import: "Import" 23import: "Import"
24misc: "Verschiedenes" 24misc: "Verschiedenes"
25modify_settings: "Übernehmen" 25modify_settings: "Übernehmen"
26piwik_host: Host deiner Webseite in Piwik 26piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://)
27piwik_site_id: ID deiner Webseite in Piwik 27piwik_site_id: ID deiner Webseite in Piwik
28piwik_enabled: Piwik aktivieren 28piwik_enabled: Piwik aktivieren
29demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" 29demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
30demo_mode_username: "Test-Benutzer" 30demo_mode_username: "Test-Benutzer"
31# share_public: Allow public url for entries 31share_public: Erlaube eine öffentliche URL für Einträge
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 8aaa27e7..77c09db4 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -23,7 +23,7 @@ export: "export"
23import: "import" 23import: "import"
24misc: "misc" 24misc: "misc"
25modify_settings: "apply" 25modify_settings: "apply"
26piwik_host: Host of your website in Piwik 26piwik_host: Host of your website in Piwik (without http:// ou https://)
27piwik_site_id: ID of your website in Piwik 27piwik_site_id: ID of your website in Piwik
28piwik_enabled: Enable Piwik 28piwik_enabled: Enable Piwik
29demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 29demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index bf3a79af..baa83849 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -23,7 +23,7 @@ export: "exportar"
23import: "importar" 23import: "importar"
24misc: "misc" 24misc: "misc"
25modify_settings: "modificar configuración" 25modify_settings: "modificar configuración"
26piwik_host: Host de tu website de Piwik 26piwik_host: Host de tu website de Piwik (sin http:// o https://)
27piwik_site_id: ID de tu website de Piwik 27piwik_site_id: ID de tu website de Piwik
28piwik_enabled: Activar Piwik 28piwik_enabled: Activar Piwik
29demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)" 29demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index d86c4343..b394977e 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -23,7 +23,7 @@ export: "برون‌سپاری"
23import: "درون‌ریزی" 23import: "درون‌ریزی"
24misc: "غیره" 24misc: "غیره"
25modify_settings: "اعمال" 25modify_settings: "اعمال"
26# piwik_host: Host of your website in Piwik 26# piwik_host: Host of your website in Piwik (without http:// or https://)
27# piwik_site_id: ID of your website in Piwik 27# piwik_site_id: ID of your website in Piwik
28# piwik_enabled: Enable Piwik 28# piwik_enabled: Enable Piwik
29# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 29# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index 5e1ecf26..31a80880 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -23,7 +23,7 @@ export: "export"
23import: "import" 23import: "import"
24misc: "divers" 24misc: "divers"
25modify_settings: "appliquer" 25modify_settings: "appliquer"
26piwik_host: URL de votre site dans Piwik 26piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
27piwik_site_id: ID de votre site dans Piwik 27piwik_site_id: ID de votre site dans Piwik
28piwik_enabled: Activer Piwik 28piwik_enabled: Activer Piwik
29demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" 29demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 9d820e4b..ba038556 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -23,7 +23,7 @@ export: "esporta"
23import: "importa" 23import: "importa"
24misc: "misc" 24misc: "misc"
25modify_settings: "applica" 25modify_settings: "applica"
26piwik_host: Host del tuo sito in Piwik 26piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
27piwik_site_id: ID del tuo sito in Piwik 27piwik_site_id: ID del tuo sito in Piwik
28piwik_enabled: Abilita Piwik 28piwik_enabled: Abilita Piwik
29demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" 29demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 49dc7732..55249e33 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -23,7 +23,7 @@ export: "expòrt"
23import: "impòrt" 23import: "impòrt"
24misc: "divèrs" 24misc: "divèrs"
25modify_settings: "aplicar" 25modify_settings: "aplicar"
26piwik_host: URL de vòstre site dins Piwik 26piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
27piwik_site_id: ID de vòstre site dins Piwik 27piwik_site_id: ID de vòstre site dins Piwik
28piwik_enabled: Activar Piwik 28piwik_enabled: Activar Piwik
29demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" 29demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 7432b0a7..42cc5b52 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -23,7 +23,7 @@ export: "eksport"
23import: "import" 23import: "import"
24misc: "różne" 24misc: "różne"
25modify_settings: "zatwierdz" 25modify_settings: "zatwierdz"
26piwik_host: Host twojej strony Piwik 26piwik_host: Host twojej strony Piwik (bez http:// lub https://)
27piwik_site_id: ID twojej strony Piwik 27piwik_site_id: ID twojej strony Piwik
28piwik_enabled: Włacz Piwik 28piwik_enabled: Włacz Piwik
29demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)" 29demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 20d664f7..8e72b955 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -23,7 +23,7 @@ export: "exportă"
23import: "importă" 23import: "importă"
24misc: "diverse" 24misc: "diverse"
25modify_settings: "aplică" 25modify_settings: "aplică"
26# piwik_host: Host of your website in Piwik 26# piwik_host: Host of your website in Piwik (without http:// or https://)
27# piwik_site_id: ID of your website in Piwik 27# piwik_site_id: ID of your website in Piwik
28# piwik_enabled: Enable Piwik 28# piwik_enabled: Enable Piwik
29# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 29# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index 4b4d3edb..55f70843 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -23,7 +23,7 @@
23# import: "import" 23# import: "import"
24# misc: "misc" 24# misc: "misc"
25# modify_settings: "apply" 25# modify_settings: "apply"
26# piwik_host: Host of your website in Piwik 26# piwik_host: Host of your website in Piwik (without http:// or https://)
27# piwik_site_id: ID of your website in Piwik 27# piwik_site_id: ID of your website in Piwik
28# piwik_enabled: Enable Piwik 28# piwik_enabled: Enable Piwik
29# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 29# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
diff --git a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
index f44db420..c4e735ee 100644
--- a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
+++ b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
@@ -1,6 +1,6 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %}{% trans %}internal settings{% endtrans %}{% endblock %} 3{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
4 4
5{% block content %} 5{% block content %}
6 <div class="row"> 6 <div class="row">
@@ -13,7 +13,7 @@
13 <div class="div_tabs col s12"> 13 <div class="div_tabs col s12">
14 <ul class="tabs"> 14 <ul class="tabs">
15 {% for section in sections | craue_sortSections %} 15 {% for section in sections | craue_sortSections %}
16 <li class="tab col s3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li> 16 <li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
17 {% endfor %} 17 {% endfor %}
18 </ul> 18 </ul>
19 </div> 19 </div>
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index 61e7b22a..44db2070 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -1192,6 +1192,14 @@ pre code {
1192 } 1192 }
1193} 1193}
1194 1194
1195@media screen and (max-height: 770px) {
1196 .menu.users,
1197 .menu.internal,
1198 .menu.developer {
1199 display: none;
1200 }
1201}
1202
1195@media screen and (max-width: 500px) { 1203@media screen and (max-width: 500px) {
1196 .entry { 1204 .entry {
1197 width: 100%; 1205 width: 100%;
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d91b469f..2cc2e8a0 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -360,6 +360,10 @@ span.numberItems {
360 float: right; 360 float: right;
361} 361}
362 362
363nav ul a:hover {
364 background-color: initial;
365}
366
363/* ========================================================================== 367/* ==========================================================================
364 * 3 = Filters slider 368 * 3 = Filters slider
365 * ========================================================================== */ 369 * ========================================================================== */
@@ -522,7 +526,7 @@ main ul.row {
522} 526}
523 527
524#article > header > h1 { 528#article > header > h1 {
525 font-size: 2em; 529 font-size: 1.6em;
526} 530}
527 531
528.reader-mode { 532.reader-mode {
@@ -603,6 +607,18 @@ main ul.row {
603 width: auto; 607 width: auto;
604 } 608 }
605 609
610 #article {
611 padding: 15px;
612 max-width: 35em;
613 margin-left: auto;
614 margin-right: auto;
615 font-size: 18px;
616 }
617
618 #article > header > h1 {
619 font-size: 1.33em;
620 }
621
606 .reader-mode { 622 .reader-mode {
607 width: 240px !important; 623 width: 240px !important;
608 } 624 }
@@ -760,3 +776,7 @@ div.settings div.file-field div {
760.input-field label.active { 776.input-field label.active {
761 font-size: 1rem; 777 font-size: 1rem;
762} 778}
779
780nav .input-field input {
781 margin: 0;
782}