]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #2260 from wallabag/fix-config-fontsize
authorNicolas LÅ“uillet <nicolas@loeuillet.org>
Fri, 2 Sep 2016 09:17:47 +0000 (11:17 +0200)
committerGitHub <noreply@github.com>
Fri, 2 Sep 2016 09:17:47 +0000 (11:17 +0200)
Fixed different font-size for labels in config screen

app/Resources/static/themes/material/css/main.css
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig

index dbae5fafdd28df50459f6b48e8c30a9f3e8aaaf2..68f3f2ee57e55c84605eba8ad3c15b7fd7bd1172 100755 (executable)
@@ -671,3 +671,7 @@ div.settings div.input-field ul {
 div.settings div.file-field div {
   margin-top: inherit;
 }
+
+.input-field label.active {
+    font-size: 1rem;
+}
index 11b02294b131dc8e4cc40f9446e3c4a0525598fe..bf390e8994d81d81b96ce3d45cc0357959b1eac6 100644 (file)
                     </div>
 
                     <div id="set5" class="col s12">
+                        {% if app.user.config.taggingRules is not empty %}
                         <div class="row">
                             <div class="input-field col s12">
                                 <ul>
                                 </ul>
                             </div>
                         </div>
+                        {% endif %}
 
                         {{ form_start(form.new_tagging_rule) }}
                             {{ form_errors(form.new_tagging_rule) }}