diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index edfd60071..83543c9c8 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -54,7 +54,7 @@ } a { - border-bottom: 1px dotted $blueAccentColor; + border-bottom: 1px dotted $blue-accent-color; text-decoration: none; } @@ -105,7 +105,7 @@ margin: 2.1rem 0 0.68rem; } - aside { + .entry-info { .tools { display: flex; flex-flow: row wrap; diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index f46971781..11b84732c 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -73,7 +73,7 @@ main { .card-entry-labels-hidden li { display: inline-block; - background-color: $blueAccentColor; + background-color: $blue-accent-color; margin: 0 5px; padding: 5px 12px; border-radius: 3px; @@ -85,10 +85,6 @@ main { white-space: nowrap; } - .card-content .estimatedTime { - margin-bottom: 10px; - } - .card-action { padding: 10px 10px 10px 15px; @@ -160,7 +156,7 @@ a.original:not(.waves-effect) { .card-tag-labels li { margin: 10px 10px 10px auto; padding: 5px 12px 5px 16px !important; - background-color: $blueAccentColor; + background-color: $blue-accent-color; border-radius: 3px; color: #fff; cursor: default; @@ -251,7 +247,7 @@ a.original:not(.waves-effect) { } .chip { - background-color: $blueAccentColor; + background-color: $blue-accent-color; padding: 0 7px; margin: auto 1px; border-radius: 6px; @@ -315,7 +311,7 @@ a.original:not(.waves-effect) { color: #fff !important; } -.settings .div_tabs { +.settings .tabs-container { padding-bottom: 15px; } diff --git a/app/Resources/static/themes/material/css/dark_theme.scss b/app/Resources/static/themes/material/css/dark_theme.scss index 8a95679f2..b4a449dbe 100644 --- a/app/Resources/static/themes/material/css/dark_theme.scss +++ b/app/Resources/static/themes/material/css/dark_theme.scss @@ -131,7 +131,7 @@ background-color: #282c34; } - nav input { + nav input { color: #abb2bf; } diff --git a/app/Resources/static/themes/material/css/icons.scss b/app/Resources/static/themes/material/css/icons.scss index a16d90ee8..54b9c81f5 100644 --- a/app/Resources/static/themes/material/css/icons.scss +++ b/app/Resources/static/themes/material/css/icons.scss @@ -27,7 +27,7 @@ -webkit-font-smoothing: antialiased; /* Support for Safari and Chrome. */ - text-rendering: optimizeLegibility; + text-rendering: optimizelegibility; /* Support for Firefox. */ -moz-osx-font-smoothing: grayscale; diff --git a/app/Resources/static/themes/material/css/layout.scss b/app/Resources/static/themes/material/css/layout.scss index a81001897..d27d20076 100755 --- a/app/Resources/static/themes/material/css/layout.scss +++ b/app/Resources/static/themes/material/css/layout.scss @@ -19,7 +19,7 @@ body { } a { - color: $blueAccentColor; + color: $blue-accent-color; } main, diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss index 3fb2504e3..13286d83c 100644 --- a/app/Resources/static/themes/material/css/nav.scss +++ b/app/Resources/static/themes/material/css/nav.scss @@ -131,11 +131,11 @@ nav { margin: 0 1%; } -#button_filters { +.button-filters { display: none; } -#button_export { +.button-export { display: none; } diff --git a/app/Resources/static/themes/material/css/print.scss b/app/Resources/static/themes/material/css/print.scss index 0bf9300c9..2aae8a221 100755 --- a/app/Resources/static/themes/material/css/print.scss +++ b/app/Resources/static/themes/material/css/print.scss @@ -18,20 +18,16 @@ /* Hide useless blocks */ body > header, - #article_toolbar, - #links, - #sort, body > footer, - .top_link, - div.tools, + .entry-tools, header div, .messages, .entry + .results, - #slide-out, + .left-bar, .progress, .hide-on-large-only, - #article > aside, - #article .mbm a { + .entry-info, + .title-edit { display: none !important; } @@ -39,7 +35,7 @@ padding-left: 0 !important; } - #article { + .article { margin: inherit !important; } diff --git a/app/Resources/static/themes/material/css/sidenav.scss b/app/Resources/static/themes/material/css/sidenav.scss index f0932e4ab..00e4c5c2a 100644 --- a/app/Resources/static/themes/material/css/sidenav.scss +++ b/app/Resources/static/themes/material/css/sidenav.scss @@ -45,6 +45,6 @@ font-weight: bold; } -span.numberItems { +.items-number { float: right; } diff --git a/app/Resources/static/themes/material/css/variables.scss b/app/Resources/static/themes/material/css/variables.scss index fb0f0bb16..184991289 100644 --- a/app/Resources/static/themes/material/css/variables.scss +++ b/app/Resources/static/themes/material/css/variables.scss @@ -2,4 +2,4 @@ Variables ========================================================================== */ -$blueAccentColor: #00acc1; +$blue-accent-color: #00acc1; diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index d0e6005c7..134e623d6 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -9,7 +9,7 @@
-
+
  • {{ 'config.tab_menu.settings'|trans }}
  • {{ 'config.tab_menu.feed'|trans }}
  • diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig index ee03e131c..84b29d241 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig @@ -36,7 +36,7 @@
-
    +
    • arrow_back @@ -232,12 +232,12 @@ {% endblock %} {% block content %} -
      +
      -

      {{ entry.title|striptags|default('entry.default_title'|trans)|raw }} create

      +

      {{ entry.title|striptags|default('entry.default_title'|trans)|raw }} create

      -