aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-09-02 11:17:47 +0200
committerGitHub <noreply@github.com>2016-09-02 11:17:47 +0200
commit9972ab467af3a9d6d1c7f3588dbb940b38298aaa (patch)
tree90255b22ceceec92ecebff73b1ef94fbde8330bb
parent336262e6ee9c57437793a06fb416206ac73a1702 (diff)
parentb1e0a586e8222ca1fc59bcff0a57e2a3f8c11534 (diff)
downloadwallabag-9972ab467af3a9d6d1c7f3588dbb940b38298aaa.tar.gz
wallabag-9972ab467af3a9d6d1c7f3588dbb940b38298aaa.tar.zst
wallabag-9972ab467af3a9d6d1c7f3588dbb940b38298aaa.zip
Merge pull request #2260 from wallabag/fix-config-fontsize
Fixed different font-size for labels in config screen
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig2
2 files changed, 6 insertions, 0 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index dbae5faf..68f3f2ee 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -671,3 +671,7 @@ div.settings div.input-field ul {
671div.settings div.file-field div { 671div.settings div.file-field div {
672 margin-top: inherit; 672 margin-top: inherit;
673} 673}
674
675.input-field label.active {
676 font-size: 1rem;
677}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 11b02294..bf390e89 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -196,6 +196,7 @@
196 </div> 196 </div>
197 197
198 <div id="set5" class="col s12"> 198 <div id="set5" class="col s12">
199 {% if app.user.config.taggingRules is not empty %}
199 <div class="row"> 200 <div class="row">
200 <div class="input-field col s12"> 201 <div class="input-field col s12">
201 <ul> 202 <ul>
@@ -213,6 +214,7 @@
213 </ul> 214 </ul>
214 </div> 215 </div>
215 </div> 216 </div>
217 {% endif %}
216 218
217 {{ form_start(form.new_tagging_rule) }} 219 {{ form_start(form.new_tagging_rule) }}
218 {{ form_errors(form.new_tagging_rule) }} 220 {{ form_errors(form.new_tagging_rule) }}