From 56349e470ab9e4fd5f4fd4754f4a6c9989701795 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 14 Feb 2016 20:12:03 +0100 Subject: improve baggy theme (add new tag panel) --- .../Resources/public/themes/baggy/css/main.css | 12 ++++++++---- .../Resources/public/themes/baggy/js/init.js | 12 ++++++++++++ .../views/themes/baggy/Entry/entry.html.twig | 21 ++++++++++++++------- .../Resources/views/themes/baggy/layout.html.twig | 8 ++++---- 4 files changed, 38 insertions(+), 15 deletions(-) (limited to 'src') 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 62f2964c..1cb2ddf3 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css @@ -298,7 +298,7 @@ h2:after { ========================================================================== */ #content { - margin-top: 5em; + margin-top: 2em; min-height: 30em; } @@ -884,9 +884,13 @@ blockquote { text-decoration: none; } - #article_toolbar a:hover, #article_toolbar a:focus { - background-color: #999; - } +#article_toolbar a:hover, #article_toolbar a:focus { + background-color: #999; +} + +#nav-btn-add-tag { + cursor: pointer; +} .shaarli:before { content: "*"; diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js index 74cbae68..9bdc6f21 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js @@ -48,4 +48,16 @@ $.fn.ready(function() { $listmode.addClass("tablemode"); } + /* ========================================================================== + Add tag panel + ========================================================================== */ + + + $('#nav-btn-add-tag').on('click', function(){ + $(".nav-panel-add-tag").toggle(100); + $(".nav-panel-menu").addClass('hidden'); + $("#tag_label").focus(); + return false; + }); + }); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 27a88287..a3a9baa2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -3,13 +3,19 @@ {% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} {% block content %} -
+
+
+

{{ entry.title|raw }}

+
+ +
-
-
-

{{ entry.title|raw }}

-
+ {% if entry.previewPicture is not null %}
{{ entry.title|raw }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index b630070c..84604762 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -35,8 +35,8 @@
-- cgit v1.2.3 From a8d5f8971eec8e84d80da1cf0834445f3874b2e4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 15 Feb 2016 17:04:48 +0100 Subject: fix typos --- .../CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index a3a9baa2..32dc0859 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -5,7 +5,7 @@ {% block content %}
-

{{ entry.title|raw }}

+

{{ entry.title|raw }}

@@ -32,8 +32,8 @@