From eff75729a119c429e1eb526739fd45ff9aa18885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 3 Apr 2016 10:08:22 +0200 Subject: :rocket: Prepare v2.0.0 :birthday: --- src/Wallabag/CoreBundle/Resources/views/base.html.twig | 4 ---- .../CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | 7 +++---- .../CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig | 2 +- .../Resources/views/themes/material/Static/about.html.twig | 7 +++---- .../Resources/views/themes/material/Static/howto.html.twig | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig index dacdb9ca..f024b633 100644 --- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig @@ -70,10 +70,6 @@ {% block footer %}{% endblock %} -
- You're trying wallabag v2, which is in beta version. If you find a bug, please have a look to our issues list and open a new one if necessary. -
- {% if craue_setting('piwik_enabled') %} {{ piwik(craue_setting('piwik_host'), craue_setting('piwik_site_id')) }} {% endif %} 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 5c0046d1..5687e48c 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 @@ -7,7 +7,7 @@
{{ 'about.who_behind_wallabag.developped_by'|trans }}
-
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
+
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
@@ -25,9 +25,8 @@
{{ 'about.getting_help.documentation'|trans }}
-
english
-
français
-
deutsch
+
english
+
français
{{ 'about.getting_help.bug_reports'|trans }}
{{ 'about.getting_help.support'|trans|raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig index 8da1afa0..eab092c7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig @@ -11,7 +11,7 @@

{{ 'howto.top_menu.browser_addons'|trans }}

{{ 'howto.top_menu.mobile_apps'|trans }}

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 a294b74d..4b1fdcce 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 @@ -21,7 +21,7 @@
{{ 'about.who_behind_wallabag.developped_by'|trans }}
-
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
+
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
@@ -34,9 +34,8 @@
{{ 'about.getting_help.documentation'|trans }}
-
english
-
français
-
deutsch
+
english
+
français
{{ 'about.getting_help.bug_reports'|trans }}
{{ 'about.getting_help.support'|trans|raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig index 15b548d8..4354a6b7 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig @@ -18,7 +18,7 @@
{{ 'howto.top_menu.browser_addons'|trans }}
-- cgit v1.2.3 From 163517da79d027458d5cadaa736962f4b4df8ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 3 Apr 2016 20:35:53 +0200 Subject: Remove useless CSS --- .../Resources/public/themes/material/css/main.css | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index 6f44e1da..96c38822 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css @@ -54,20 +54,6 @@ body.login main { padding: 0; } -#warning_message { - position: fixed; - background-color: #ff6347; - z-index: 1000; - bottom: 0; - left: 0; - width: 100%; - color: #000; -} - -#warning_message a { - color: #555; -} - .border-bottom { border-bottom: 1px solid #DDD; } -- cgit v1.2.3