aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml2
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css2
-rw-r--r--[-rwxr-xr-x]src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md2
-rw-r--r--[-rwxr-xr-x]src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig0
-rw-r--r--[-rwxr-xr-x]src/Wallabag/CoreBundle/Resources/views/themes/material/README.md2
-rw-r--r--[-rwxr-xr-x]src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig0
6 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 25d71cba..7d24d488 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -15,7 +15,7 @@ services:
15 - { name: form.type } 15 - { name: form.type }
16 16
17 wallabag_core.filter.type.entry: 17 wallabag_core.filter.type.entry:
18 class: Wallabag\CoreBundle\Filter\EntryFilterType 18 class: Wallabag\CoreBundle\Form\Type\EntryFilterType
19 arguments: 19 arguments:
20 - "@wallabag_core.entry_repository" 20 - "@wallabag_core.entry_repository"
21 - "@security.token_storage" 21 - "@security.token_storage"
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
index d3f92926..62f2964c 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
@@ -564,7 +564,7 @@ img.preview {
564 height: 100%; 564 height: 100%;
565 width: 100%; 565 width: 100%;
566 margin: 0; 566 margin: 0;
567 margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */ 567 margin-top: -30% !important;
568 padding: 2em; 568 padding: 2em;
569 display: none; 569 display: none;
570 border-left: 1px #EEE solid; 570 border-left: 1px #EEE solid;
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
index 1f0054a4..3db07873 100755..100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
@@ -1,3 +1,3 @@
1# Baggy Theme 1# Baggy Theme
2 2
3theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ \ No newline at end of file 3theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
index 38f08da6..38f08da6 100755..100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md
index 534eea30..54e8a0e2 100755..100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md
@@ -2,4 +2,4 @@
2 2
3Theme created by Danilow (@modos189) Alexandr http://modos189.ru/ 3Theme created by Danilow (@modos189) Alexandr http://modos189.ru/
4 4
5Used framework http://materializecss.com/ \ No newline at end of file 5Used framework http://materializecss.com/
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
index d6b8e28a..d6b8e28a 100755..100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig