aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml6
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml6
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml6
-rwxr-xr-xapp/Resources/static/themes/baggy/css/print.css4
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css19
-rwxr-xr-xapp/Resources/static/themes/material/css/print.css15
13 files changed, 61 insertions, 2 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index c46fdb14..3478d638 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID for din side hos Piwik
27piwik_enabled: Aktiver Piwik 27piwik_enabled: Aktiver Piwik
28demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" 28demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
29demo_mode_username: "Demobruger" 29demo_mode_username: "Demobruger"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index fa2093b5..f655a27f 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID deiner Webseite in Piwik
27piwik_enabled: Piwik aktivieren 27piwik_enabled: Piwik aktivieren
28demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" 28demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
29demo_mode_username: "Test-Benutzer" 29demo_mode_username: "Test-Benutzer"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index b627376e..48d0ec4b 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID of your website in Piwik
27piwik_enabled: Enable Piwik 27piwik_enabled: Enable Piwik
28demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 28demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
29demo_mode_username: "Demo user" 29demo_mode_username: "Demo user"
30share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index af1657e4..7aac9adf 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID de tu website de Piwik
27piwik_enabled: Activar Piwik 27piwik_enabled: Activar Piwik
28demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)" 28demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
29demo_mode_username: "Nombre de usuario demo" 29demo_mode_username: "Nombre de usuario demo"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index 7cb4e833..613cf86d 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -22,3 +22,9 @@ export: "برون‌سپاری"
22import: "درون‌ریزی" 22import: "درون‌ریزی"
23misc: "غیره" 23misc: "غیره"
24modify_settings: "اعمال" 24modify_settings: "اعمال"
25# piwik_host: Host of your website in Piwik
26# piwik_site_id: ID of your website in Piwik
27# piwik_enabled: Enable Piwik
28# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
29# demo_mode_username: "Demo user"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index 084eb6df..f21f2439 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID de votre site dans Piwik
27piwik_enabled: Activer Piwik 27piwik_enabled: Activer Piwik
28demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" 28demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
29demo_mode_username: "Utilisateur de la démo" 29demo_mode_username: "Utilisateur de la démo"
30share_public: Autoriser une URL publique pour les articles
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index e4417139..1202edd5 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID del tuo sito in Piwik
27piwik_enabled: Abilita Piwik 27piwik_enabled: Abilita Piwik
28demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" 28demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
29demo_mode_username: "Utente Demo" 29demo_mode_username: "Utente Demo"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 67880b8b..dd91ee49 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -27,3 +27,4 @@ piwik_site_id: ID de vòstre site dins Piwik
27piwik_enabled: Activar Piwik 27piwik_enabled: Activar Piwik
28demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" 28demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
29demo_mode_username: "Utilizaire de la demostracion" 29demo_mode_username: "Utilizaire de la demostracion"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 87ca5060..93b36c8f 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -22,3 +22,9 @@ export: "eksport"
22import: "import" 22import: "import"
23misc: "różne" 23misc: "różne"
24modify_settings: "zatwierdz" 24modify_settings: "zatwierdz"
25# piwik_host: Host of your website in Piwik
26# piwik_site_id: ID of your website in Piwik
27# piwik_enabled: Enable Piwik
28# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
29# demo_mode_username: "Demo user"
30# share_public: Allow public url for entries
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index f5ff8c6a..326c9f90 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -22,3 +22,9 @@ export: "exportă"
22import: "importă" 22import: "importă"
23misc: "diverse" 23misc: "diverse"
24modify_settings: "aplică" 24modify_settings: "aplică"
25# piwik_host: Host of your website in Piwik
26# piwik_site_id: ID of your website in Piwik
27# piwik_enabled: Enable Piwik
28# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
29# demo_mode_username: "Demo user"
30# share_public: Allow public url for entries
diff --git a/app/Resources/static/themes/baggy/css/print.css b/app/Resources/static/themes/baggy/css/print.css
index 6f187ff5..f7f6a8ad 100755
--- a/app/Resources/static/themes/baggy/css/print.css
+++ b/app/Resources/static/themes/baggy/css/print.css
@@ -26,7 +26,9 @@
26 div.tools, 26 div.tools,
27 header div, 27 header div,
28 .messages, 28 .messages,
29 .entrie + .results { 29 .entrie + .results,
30 #article .mbm a,
31 #article-informations {
30 display: none !important; 32 display: none !important;
31 } 33 }
32 34
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 99892401..f4230734 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -91,6 +91,7 @@ body {
91 91
92body.login main { 92body.login main {
93 padding: 0; 93 padding: 0;
94 min-height: 100vh;
94} 95}
95 96
96.border-bottom { 97.border-bottom {
@@ -256,6 +257,10 @@ nav input {
256 display: none; 257 display: none;
257} 258}
258 259
260.input-field.nav-panel-add, .input-field.nav-panel-add form {
261 height: 100%;
262}
263
259/* ========================================================================== 264/* ==========================================================================
260 2 = Side-nav 265 2 = Side-nav
261 ========================================================================== */ 266 ========================================================================== */
@@ -346,6 +351,12 @@ main ul.row {
346 351
347.card .card-content .card-title { 352.card .card-content .card-title {
348 line-height: 32px; 353 line-height: 32px;
354 max-height: 64px;
355 display: block;
356}
357
358.card .card-content i.right, .card .card-reveal i.right {
359 margin-left: 0;
349} 360}
350 361
351.card .card-entry-labels { 362.card .card-entry-labels {
@@ -634,6 +645,10 @@ main ul.row {
634 content: "\eae6"; 645 content: "\eae6";
635} 646}
636 647
648.icon-link::before {
649 content: "\e9cb";
650}
651
637footer [class^="icon-"], 652footer [class^="icon-"],
638footer [class*=" icon-"] { 653footer [class*=" icon-"] {
639 font-size: 2em; 654 font-size: 2em;
@@ -660,3 +675,7 @@ div.settings div.input-field ul {
660div.settings div.file-field div { 675div.settings div.file-field div {
661 margin-top: inherit; 676 margin-top: inherit;
662} 677}
678
679.input-field label.active {
680 font-size: 1rem;
681}
diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
index a16be71e..1eb96735 100755
--- a/app/Resources/static/themes/material/css/print.css
+++ b/app/Resources/static/themes/material/css/print.css
@@ -26,10 +26,23 @@
26 div.tools, 26 div.tools,
27 header div, 27 header div,
28 .messages, 28 .messages,
29 .entry + .results { 29 .entry + .results,
30 #slide-out,
31 .progress, .hide-on-large-only,
32 #article > aside,
33 #article .mbm a
34 {
30 display: none !important; 35 display: none !important;
31 } 36 }
32 37
38 main {
39 padding-left: 0 !important;
40 }
41
42 #article {
43 margin: inherit !important;
44 }
45
33 article { 46 article {
34 border: none !important; 47 border: none !important;
35 } 48 }