From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Mon, 3 Oct 2016 07:09:45 +0000 (+0200)
Subject: Merge pull request #2314 from wallabag/assets
X-Git-Tag: 2.1.0~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2314 from wallabag/assets

Assets work
---

ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f
diff --combined app/Resources/static/themes/material/css/main.css
index 005cc302,67be1d22..00d7a869
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@@ -19,12 -19,7 +19,7 @@@
  
  @font-face {
    font-family: icomoon;
-   src: url("../fonts/icomoon.eot");
-   src:
-     url("../fonts/icomoon.eot#iefix") format("embedded-opentype"),
-     url("../fonts/icomoon.ttf") format("truetype"),
-     url("../fonts/icomoon.woff") format("woff"),
-     url("../fonts/icomoon.svg#icomoon") format("svg");
+   src: url("../fonts/IcoMoon-Free.ttf");
    font-weight: normal;
    font-style: normal;
  }
@@@ -174,7 -169,7 +169,7 @@@ div.pagination ul .next.disabled 
  
  footer.page-footer {
    margin-top: 10px;
-   padding-top: 0px;
+   padding-top: 0;
  }
  
  footer .row {
@@@ -257,8 -252,9 +252,9 @@@ nav input 
    display: none;
  }
  
- .input-field.nav-panel-add, .input-field.nav-panel-add form {
-     height: 100%;
+ .input-field.nav-panel-add,
+ .input-field.nav-panel-add form {
+   height: 100%;
  }
  
  /* ==========================================================================
@@@ -352,10 -348,12 +348,11 @@@ main ul.row 
  .card .card-content .card-title {
    line-height: 32px;
    max-height: 64px;
 -  display: block;
  }
  
- .card .card-content i.right, .card .card-reveal i.right {
-     margin-left: 0;
+ .card .card-content i.right,
+ .card .card-reveal i.right {
+   margin-left: 0;
  }
  
  .card .card-entry-labels {
@@@ -411,12 -409,12 +408,12 @@@
  }
  
  .card .card-action a {
 -  color: #fff;
 +  color: #fff !important;
    margin: 0;
  }
  
  .card .card-action a:hover {
 -  color: #fff;
 +  color: #fff !important;
  }
  
  .settings .div_tabs {
@@@ -527,30 -525,38 +524,38 @@@
    footer {
      padding-left: 0;
    }
+ 
    nav,
    main,
    footer {
      padding-left: 0;
    }
+ 
    .pagination {
      width: auto;
    }
+ 
    .reader-mode {
      width: 240px !important;
    }
+ 
    .reader-mode span {
      opacity: 1;
    }
+ 
    .tabs {
      display: inline-block;
      height: auto;
    }
+ 
    .tab {
      min-width: 100%;
    }
+ 
    .indicator {
      display: none;
    }
+ 
    .pagination li.prev,
    .pagination li.next {
      width: auto;
@@@ -568,38 -574,47 +573,47 @@@
      width: 25%;
      margin-left: 0;
    }
+ 
    .row .col.l2 {
      width: 33.33333%;
      margin-left: 0;
    }
+ 
    .row .col.l3 {
      width: 41.66667%;
      margin-left: 0;
    }
+ 
    .row .col.l4 {
      width: 50%;
      margin-left: 0;
    }
+ 
    .row .col.l5 {
      width: 58.33333%;
      margin-left: 0;
    }
+ 
    .row .col.l6 {
      width: 66.66667%;
      margin-left: 0;
    }
+ 
    .row .col.l7 {
      width: 75%;
      margin-left: 0;
    }
+ 
    .row .col.l8 {
      width: 83.33333%;
      margin-left: 0;
    }
+ 
    .row .col.l9 {
      width: 91.66667%;
      margin-left: 0;
    }
+ 
    .row .col.l10 {
      width: 100%;
      margin-left: 0;
@@@ -645,7 -660,7 +659,7 @@@
  }
  
  .icon-link::before {
-     content: "\e9cb";
+   content: "\e9cb";
  }
  
  footer [class^="icon-"],
@@@ -676,5 -691,5 +690,5 @@@ div.settings div.file-field div 
  }
  
  .input-field label.active {
-     font-size: 1rem;
+   font-size: 1rem;
  }
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index ffc5bec6,8d841b4c..1c0430e8
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@@ -1,7 -1,7 +1,7 @@@
  {% extends "WallabagCoreBundle::layout.html.twig" %}
  
  {% block title %}
 -    {% include "@WallabagCore/themes/_title.html.twig" %}
 +    {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
  {% endblock %}
  
  {% block content %}
@@@ -67,7 -67,7 +67,7 @@@
  
      <!-- Filter -->
      {% if form is not null %}
-     <aside id="filter-form" class="">
+     <div id="filters" class="">
          <form method="get" action="{{ path('all') }}">
              <h2>{{ 'entry.filters.title'|trans }}</h2>
              <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
@@@ -147,6 -147,6 +147,6 @@@
                  <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{{ 'entry.filters.action.filter'|trans }}</button>
              </div>
          </form>
-     </aside>
+     </div>
      {% endif %}
  {% endblock %}
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index e889dea8,1c5057dd..01fde953
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@@ -1,7 -1,7 +1,7 @@@
  {% extends "WallabagCoreBundle::layout.html.twig" %}
  
  {% block title %}
 -  {% include "@WallabagCore/themes/_title.html.twig" %}
 +  {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
  {% endblock %}
  
  {% block content %}
@@@ -66,7 -66,7 +66,7 @@@
  
                              <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
  
-                             <ul class="card-entry-tags">
+                             <ul class="card-entry-labels-hidden">
                                  {% for tag in entry.tags %}
                                      <li>{{ tag.label }}</li>
                                  {% endfor %}