From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 8 Mar 2016 17:02:34 +0100
Subject: manage assets through npm

first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
---
 app/Resources/static/themes/material/css/main.css  | 611 +++++++++++++++++++++
 app/Resources/static/themes/material/css/print.css |  64 +++
 app/Resources/static/themes/material/js/init.js    | 116 ++++
 3 files changed, 791 insertions(+)
 create mode 100755 app/Resources/static/themes/material/css/main.css
 create mode 100755 app/Resources/static/themes/material/css/print.css
 create mode 100755 app/Resources/static/themes/material/js/init.js

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
new file mode 100755
index 00000000..473b0308
--- /dev/null
+++ b/app/Resources/static/themes/material/css/main.css
@@ -0,0 +1,611 @@
+/* ==========================================================================
+   Sommaire
+
+   0 = Common
+   1 = Nav
+   2 = Side-nav
+   3 = Filters slider
+   4 = Cards
+   5 = Article
+   6 = Media queries
+   7 = Font
+   8 = Others
+
+   ========================================================================== */
+
+/* ==========================================================================
+   0 = Common
+   ========================================================================== */
+
+@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");
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Material Icons';
+  font-style: normal;
+  font-weight: 400;
+  src: url(../fonts/MaterialIcons-Regular.eot);
+  /* For IE6-8 */
+  src: local("Material Icons"), local("MaterialIcons-Regular"), url(../fonts/MaterialIcons-Regular.woff2) format("woff2"), url(../fonts/MaterialIcons-Regular.woff) format("woff"), url(../fonts/MaterialIcons-Regular.ttf) format("truetype");
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;  /* Preferred icon size */
+  width: 1em;
+  height: 1em;
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
+
+[class^="icon-"],
+[class*=" icon-"] {
+  font-family: icomoon;
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+body {
+  display: flex;
+  min-height: 100vh;
+  flex-direction: column;
+  background: #f0f0f0;
+}
+
+body.login main {
+  padding: 0;
+}
+
+.border-bottom {
+  border-bottom: 1px solid #ddd;
+}
+
+nav,
+main,
+footer {
+  padding-left: 240px;
+}
+
+main,
+#content,
+.valign-wrapper {
+  height: 100%;
+}
+
+#main {
+  flex: 1 0 auto;
+}
+
+.results {
+  height: 1em;
+  line-height: 30px;
+}
+
+.results .nb-results,
+.results .pagination {
+  margin: 15px;
+  margin-bottom: 0;
+}
+
+.pagination {
+    float: right;
+}
+
+.pagination ul {
+    margin: 0 !important;
+}
+
+.pagination li {
+  padding: 0;
+}
+
+.pagination a {
+  padding: 0 10px;
+  height: 30px;
+  display: block;
+}
+
+.pagination .disabled {
+    margin-right: 10px;
+    margin-left: 10px;
+}
+
+div.pagination ul .prev.disabled,
+div.pagination ul .next.disabled {
+  display: none;
+}
+
+.pagination li.active span {
+    padding: 0px 10px;
+    height: 30px;
+    display: block;
+    color: #fff;
+}
+
+.page-footer .footer-copyright p {
+  display: inline;
+}
+
+.hidden {
+  display: none;
+}
+
+.picker__date-display {
+  display: none;
+}
+
+footer.page-footer {
+  margin-top: 10px;
+  padding-top: 10px;
+}
+
+footer .row {
+  margin-bottom: 10px;
+}
+
+/* ==========================================================================
+   1 = Nav
+   ========================================================================== */
+
+nav input {
+  color: #aaa;
+}
+
+.nav-wrapper .button-collapse {
+  padding: 0 15px;
+}
+
+.nav-input {
+  display: none;
+}
+
+.nav-panels {
+  overflow: hidden;
+}
+
+.nav-panel-buttom li {
+  max-height: 64px;
+}
+
+.nav-panels {
+  transition: background 0.2s ease;
+}
+
+.nav-panel-add .add,
+.nav-panel-search .search,
+.nav-panels .close {
+  color: #444 !important;
+}
+
+.nav-panels .action {
+  padding-left: 0.75rem;
+  font-size: 2.1rem;
+  white-space: nowrap;
+}
+
+.nav-panels .input-field input {
+  display: block;
+  line-height: inherit;
+  padding-left: 4rem !important;
+  width: calc(100% - 8rem);
+}
+
+.nav-panels .input-field input:focus {
+  background-color: #fff;
+  border: 0;
+  box-shadow: none;
+  color: #444;
+}
+
+.input-field.nav-panel-add label {
+  left: 1rem;
+}
+
+.input-field.nav-panel-add .close {
+  position: absolute;
+  top: 0;
+  right: 1rem;
+  color: transparent;
+  cursor: pointer;
+  font-size: 2rem;
+  transition: 0.3s color;
+}
+
+#button_filters {
+  display: none;
+}
+
+#button_export {
+  display: none;
+}
+
+/* ==========================================================================
+   2 = Side-nav
+   ========================================================================== */
+
+.side-nav.fixed a {
+  font-size: 13px;
+  line-height: 44px;
+  height: 44px;
+}
+
+.side-nav .collapsible-header,
+.side-nav.fixed .collapsible-header {
+    height: 45px;
+    line-height: 44px;
+    padding: 0 20px;
+}
+
+.bold > a {
+  font-weight: bold;
+}
+
+.side-nav > li.logo {
+  line-height: 0;
+  text-align: center;
+}
+
+#main .logo a {
+  height: 100pt;
+}
+
+#main .logo img {
+  height: 100pt;
+  width: 100pt;
+}
+
+#main .logo:hover {
+  background: transparent;
+}
+
+.side-nav li {
+  padding: 0;
+}
+
+.side-nav a {
+  margin: 0 1rem;
+}
+
+/* ==========================================================================
+ * 3 = Filters slider
+ * ========================================================================== */
+
+#filters button {
+  padding: 0;
+  width: 100%;
+}
+
+.side-nav.fixed.right-aligned {
+  right: -250px;
+  left: auto !important;
+  overflow-y: visible;
+}
+
+#filters div.with-checkbox {
+  height: 3rem;
+  margin-top: 0;
+}
+
+/* ==========================================================================
+   4 = Cards
+   ========================================================================== */
+
+main #content {
+  padding: 0 0.5rem;
+}
+
+main ul.row {
+  padding: 0 0.75rem;
+}
+
+.data .card .card-body {
+  height: 22em;
+  overflow: hidden;
+}
+
+.card .card-content .card-title {
+  line-height: 32px;
+}
+
+.card .card-content .estimatedTime {
+  margin-bottom: 10px;
+}
+
+.card .card-action .original {
+  line-height: 24px;
+}
+
+.card .card-action ul.links {
+  margin: 0;
+  font-size: 24px;
+  line-height: 24px;
+}
+
+.card .card-action a {
+  color: #fff;
+  margin: 0;
+}
+
+.card .card-action a:hover {
+  color: #fff;
+}
+
+.settings .div_tabs {
+  padding-bottom: 15px;
+}
+
+.card.sw {
+  max-width: 370px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.card .card-image {
+  height: 14em;
+}
+
+.card .card-image .preview {
+  height: 14em;
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-position: 50%;
+}
+
+/* ==========================================================================
+   5 = Article
+   ========================================================================== */
+
+#article {
+  font-size: 20px;
+  margin: 0 auto;
+  max-width: 40em;
+}
+
+#article img {
+  max-width: 100%;
+  height: auto;
+}
+
+.reader-mode {
+  width: 95px !important;
+  transition: width 0.2s ease;
+}
+
+.reader-mode:hover {
+  width: 240px !important;
+}
+
+.reader-mode .collapsible-body {
+  height: 0;
+  overflow: hidden;
+}
+
+.reader-mode:hover .collapsible-body {
+  height: auto;
+}
+
+.reader-mode span {
+  opacity: 0;
+  transition: opacity 0.2s ease;
+}
+
+.reader-mode:hover span {
+  opacity: 1;
+}
+
+.progress {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  height: 3px;
+  margin: 0;
+  z-index: 9999;
+}
+
+#article aside .link {
+  color: #000;
+  font-size: 0.8em;
+  text-decoration: none;
+}
+
+#article aside #list {
+  float: right;
+  margin-right: 15px;
+}
+
+#article aside .chip {
+  background-color: #039be5;
+  color: #fff;
+}
+
+#article aside .chip i {
+  color: #fff;
+}
+
+/* ==========================================================================
+   6 = Media queries
+   ========================================================================== */
+
+@media only screen and (max-width: 992px) {
+  header,
+  main,
+  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;
+  }
+}
+
+@media only screen and (min-width: 400px) {
+  .nav-panel-buttom {
+    float: right;
+  }
+}
+
+@media only screen and (min-width: 993px) and (max-width: 1180px) {
+  .row .col.l1 {
+    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;
+  }
+}
+
+@media only screen and (max-width: 350px) {
+  .nb-results {
+    display: none;
+  }
+}
+
+/* ==========================================================================
+   7 = Font
+   ========================================================================== */
+
+.icon-google-plus2::before {
+  content: "\ea89";
+}
+
+.icon-facebook2::before {
+  content: "\ea8d";
+}
+
+.icon-twitter::before {
+  content: "\ea91";
+}
+
+.icon-apple::before {
+  content: "\eabf";
+}
+
+.icon-android::before {
+  content: "\eac1";
+}
+
+.icon-chrome::before {
+  content: "\eae5";
+}
+
+.icon-firefox::before {
+  content: "\eae6";
+}
+
+footer [class^="icon-"],
+footer [class*=" icon-"] {
+  font-size: 2em;
+  transition: text-shadow 0.2s ease;
+  padding-right: 10px;
+}
+
+footer [class^="icon-"]::hover,
+footer [class*=" icon-"]::hover {
+  text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
+}
+
+/* ==========================================================================
+   8 = Others
+   ========================================================================== */
+
+/* force height on non-input field in the settings page */
+div.settings div.input-field div,
+div.settings div.input-field ul {
+  margin-top: 40px;
+}
+
+/* but avoid to kill all file input */
+div.settings div.file-field div {
+  margin-top: inherit;
+}
diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
new file mode 100755
index 00000000..a16be71e
--- /dev/null
+++ b/app/Resources/static/themes/material/css/print.css
@@ -0,0 +1,64 @@
+@media print {
+  /* ### Layout ### */
+
+  body {
+    font-family: Serif;
+    background-color: #fff;
+  }
+
+  @page {
+    margin: 1cm;
+  }
+
+  img {
+    max-width: 100% !important;
+  }
+
+  /* ### Content ### */
+
+  /* Hide useless blocks */
+  body > header,
+  #article_toolbar,
+  #links,
+  #sort,
+  body > footer,
+  .top_link,
+  div.tools,
+  header div,
+  .messages,
+  .entry + .results {
+    display: none !important;
+  }
+
+  article {
+    border: none !important;
+  }
+
+  /* Add URL after links */
+  .vieworiginal a::after {
+    content: " (" attr(href) ")";
+  }
+
+  /* Add explanation after abbr */
+  abbr[title]::after {
+    content: " (" attr(title) ")";
+  }
+
+  /* Change border on current pager item */
+  .pagination span.current {
+    border-style: dashed;
+  }
+
+  #main {
+    width: 100%;
+    padding: 0;
+    margin: 0;
+    margin-left: 0;
+    padding-right: 0;
+    padding-bottom: 0;
+  }
+
+  #article {
+    width: 100%;
+  }
+}
diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
new file mode 100755
index 00000000..33019d3d
--- /dev/null
+++ b/app/Resources/static/themes/material/js/init.js
@@ -0,0 +1,116 @@
+var $ = require("jquery"),
+materialize = require("materialize");
+var annotator = require('annotator');
+
+function init_filters() {
+    // no display if filters not aviable
+    if ($("div").is("#filters")) {
+        $('#button_filters').show();
+        $('.button-collapse-right').sideNav({ edge: 'right' });
+        $('#clear_form_filters').on('click', function(){
+            $('#filters input').val('');
+            $('#filters :checked').removeAttr('checked');
+            return false;
+        });
+    }
+}
+
+function init_export() {
+    // no display if export not aviable
+    if ($("div").is("#export")) {
+        $('#button_export').show();
+        $('.button-collapse-right').sideNav({ edge: 'right' });
+    }
+}
+
+$(document).ready(function(){
+    // sideNav
+    $('.button-collapse').sideNav();
+    $('select').material_select();
+    $('.collapsible').collapsible({
+        accordion : false
+    });
+    $('.datepicker').pickadate({
+        selectMonths: true,
+        selectYears: 15,
+        formatSubmit: 'dd/mm/yyyy',
+        hiddenName: true,
+        format: 'dd/mm/yyyy',
+    });
+    init_filters();
+    init_export();
+
+    $('#nav-btn-add-tag').on('click', function(){
+       $(".nav-panel-add-tag").toggle(100);
+       $(".nav-panel-menu").addClass('hidden');
+       $("#tag_label").focus();
+       return false;
+    });
+    $('#nav-btn-add').on('click', function(){
+       $(".nav-panel-buttom").hide(100);
+       $(".nav-panel-add").show(100);
+       $(".nav-panels .action").hide(100);
+       $(".nav-panel-menu").addClass('hidden');
+       $(".nav-panels").css('background', 'white');
+       $("#entry_url").focus();
+       return false;
+    });
+    $('#nav-btn-search').on('click', function(){
+        $(".nav-panel-buttom").hide(100);
+        $(".nav-panel-search").show(100);
+        $(".nav-panels .action").hide(100);
+        $(".nav-panel-menu").addClass('hidden');
+        $(".nav-panels").css('background', 'white');
+        $("#searchfield").focus();
+        return false;
+    });
+    $('.close').on('click', function(){
+        $(".nav-panel-add").hide(100);
+        $(".nav-panel-search").hide(100);
+        $(".nav-panel-buttom").show(100);
+        $(".nav-panels .action").show(100);
+        $(".nav-panel-menu").removeClass('hidden');
+        $(".nav-panels").css('background', 'transparent');
+        return false;
+    });
+    $(window).scroll(function () {
+        var s = $(window).scrollTop(),
+        d = $(document).height(),
+        c = $(window).height();
+        var scrollPercent = (s / (d-c)) * 100;
+        $(".progress .determinate").css('width', scrollPercent+'%');
+    });
+
+  /* ==========================================================================
+     Annotations & Remember position
+     ========================================================================== */
+
+    if ($("article").length) {
+        var app = new annotator.App();
+
+        app.include(annotator.ui.main, {
+            element: document.querySelector('article')
+        });
+
+        var x = JSON.parse($('#annotationroutes').html());
+        app.include(annotator.storage.http, x);
+
+        app.start().then(function () {
+             app.annotations.load({entry: x.entryId});
+        });
+
+        $(window).scroll(function(e){
+            var scrollTop = $(window).scrollTop();
+            var docHeight = $(document).height();
+            var scrollPercent = (scrollTop) / (docHeight);
+            var scrollPercentRounded = Math.round(scrollPercent*100)/100;
+            savePercent(x.entryId, scrollPercentRounded);
+        });
+
+        retrievePercent(x.entryId);
+
+        $(window).resize(function(){
+            retrievePercent(x.entryId);
+        });
+    }
+});
-- 
cgit v1.2.3


From 0743287f955fd19fd1a04c91f3b40a4ac2236423 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 9 Jun 2016 19:02:38 +0200
Subject: clean & lint stuff

---
 app/Resources/static/themes/material/js/init.js | 201 ++++++++++++------------
 1 file changed, 101 insertions(+), 100 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
index 33019d3d..d6a87941 100755
--- a/app/Resources/static/themes/material/js/init.js
+++ b/app/Resources/static/themes/material/js/init.js
@@ -1,116 +1,117 @@
-var $ = require("jquery"),
-materialize = require("materialize");
+var $ = require('jquery');
+require('materialize');
 var annotator = require('annotator');
 
-function init_filters() {
-    // no display if filters not aviable
-    if ($("div").is("#filters")) {
-        $('#button_filters').show();
-        $('.button-collapse-right').sideNav({ edge: 'right' });
-        $('#clear_form_filters').on('click', function(){
-            $('#filters input').val('');
-            $('#filters :checked').removeAttr('checked');
-            return false;
-        });
-    }
+function initFilters() {
+  // no display if filters not aviable
+  if ($('div').is('#filters')) {
+    $('#button_filters').show();
+    $('.button-collapse-right').sideNav({ edge: 'right' });
+    $('#clear_form_filters').on('click', function () {
+      $('#filters input').val('');
+      $('#filters :checked').removeAttr('checked');
+      return false;
+    });
+  }
 }
 
-function init_export() {
-    // no display if export not aviable
-    if ($("div").is("#export")) {
-        $('#button_export').show();
-        $('.button-collapse-right').sideNav({ edge: 'right' });
-    }
+function initExport() {
+  // no display if export not aviable
+  if ($('div').is('#export')) {
+    $('#button_export').show();
+    $('.button-collapse-right').sideNav({ edge: 'right' });
+  }
 }
 
-$(document).ready(function(){
-    // sideNav
-    $('.button-collapse').sideNav();
-    $('select').material_select();
-    $('.collapsible').collapsible({
-        accordion : false
-    });
-    $('.datepicker').pickadate({
-        selectMonths: true,
-        selectYears: 15,
-        formatSubmit: 'dd/mm/yyyy',
-        hiddenName: true,
-        format: 'dd/mm/yyyy',
-    });
-    init_filters();
-    init_export();
+$(document).ready(function () {
+  // sideNav
+  $('.button-collapse').sideNav();
+  $('select').material_select();
+  $('.collapsible').collapsible({
+    accordion: false,
+  });
+  $('.datepicker').pickadate({
+    selectMonths: true,
+    selectYears: 15,
+    formatSubmit: 'dd/mm/yyyy',
+    hiddenName: true,
+    format: 'dd/mm/yyyy',
+  });
+  initFilters();
+  initExport();
 
-    $('#nav-btn-add-tag').on('click', function(){
-       $(".nav-panel-add-tag").toggle(100);
-       $(".nav-panel-menu").addClass('hidden');
-       $("#tag_label").focus();
-       return false;
-    });
-    $('#nav-btn-add').on('click', function(){
-       $(".nav-panel-buttom").hide(100);
-       $(".nav-panel-add").show(100);
-       $(".nav-panels .action").hide(100);
-       $(".nav-panel-menu").addClass('hidden');
-       $(".nav-panels").css('background', 'white');
-       $("#entry_url").focus();
-       return false;
-    });
-    $('#nav-btn-search').on('click', function(){
-        $(".nav-panel-buttom").hide(100);
-        $(".nav-panel-search").show(100);
-        $(".nav-panels .action").hide(100);
-        $(".nav-panel-menu").addClass('hidden');
-        $(".nav-panels").css('background', 'white');
-        $("#searchfield").focus();
-        return false;
-    });
-    $('.close').on('click', function(){
-        $(".nav-panel-add").hide(100);
-        $(".nav-panel-search").hide(100);
-        $(".nav-panel-buttom").show(100);
-        $(".nav-panels .action").show(100);
-        $(".nav-panel-menu").removeClass('hidden');
-        $(".nav-panels").css('background', 'transparent');
-        return false;
-    });
-    $(window).scroll(function () {
-        var s = $(window).scrollTop(),
-        d = $(document).height(),
-        c = $(window).height();
-        var scrollPercent = (s / (d-c)) * 100;
-        $(".progress .determinate").css('width', scrollPercent+'%');
-    });
+  $('#nav-btn-add-tag').on('click', function () {
+    $('.nav-panel-add-tag').toggle(100);
+    $('.nav-panel-menu').addClass('hidden');
+    $('#tag_label').focus();
+    return false;
+  });
+  $('#nav-btn-add').on('click', function () {
+    $('.nav-panel-buttom').hide(100);
+    $('.nav-panel-add').show(100);
+    $('.nav-panels .action').hide(100);
+    $('.nav-panel-menu').addClass('hidden');
+    $('.nav-panels').css('background', 'white');
+    $('#entry_url').focus();
+    return false;
+  });
+  $('#nav-btn-search').on('click', function () {
+    $('.nav-panel-buttom').hide(100);
+    $('.nav-panel-search').show(100);
+    $('.nav-panels .action').hide(100);
+    $('.nav-panel-menu').addClass('hidden');
+    $('.nav-panels').css('background', 'white');
+    $('#searchfield').focus();
+    return false;
+  });
+  $('.close').on('click', function () {
+    $('.nav-panel-add').hide(100);
+    $('.nav-panel-search').hide(100);
+    $('.nav-panel-buttom').show(100);
+    $('.nav-panels .action').show(100);
+    $('.nav-panel-menu').removeClass('hidden');
+    $('.nav-panels').css('background', 'transparent');
+    return false;
+  });
+  $(window).scroll(function () {
+    var s = $(window).scrollTop();
+    var d = $(document).height();
+    var c = $(window).height();
+    var scrollPercent = (s / (d - c)) * 100;
+    $('.progress .determinate').css('width', scrollPercent + '%');
+  });
+
+/* ==========================================================================
+   Annotations & Remember position
+   ========================================================================== */
 
-  /* ==========================================================================
-     Annotations & Remember position
-     ========================================================================== */
+  if ($('article').length) {
+    var app = new annotator.App();
+    var x = JSON.parse($('#annotationroutes').html());
 
-    if ($("article").length) {
-        var app = new annotator.App();
 
-        app.include(annotator.ui.main, {
-            element: document.querySelector('article')
-        });
+    app.include(annotator.ui.main, {
+      element: document.querySelector('article'),
+    });
 
-        var x = JSON.parse($('#annotationroutes').html());
-        app.include(annotator.storage.http, x);
+    app.include(annotator.storage.http, x);
 
-        app.start().then(function () {
-             app.annotations.load({entry: x.entryId});
-        });
+    app.start().then(function () {
+      app.annotations.load({ entry: x.entryId });
+    });
 
-        $(window).scroll(function(e){
-            var scrollTop = $(window).scrollTop();
-            var docHeight = $(document).height();
-            var scrollPercent = (scrollTop) / (docHeight);
-            var scrollPercentRounded = Math.round(scrollPercent*100)/100;
-            savePercent(x.entryId, scrollPercentRounded);
-        });
+    $(window).scroll(function (e) {
+      var scrollTop = $(window).scrollTop();
+      var docHeight = $(document).height();
+      var scrollPercent = (scrollTop) / (docHeight);
+      var scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
+      savePercent(x.entryId, scrollPercentRounded);
+    });
 
-        retrievePercent(x.entryId);
+    retrievePercent(x.entryId);
 
-        $(window).resize(function(){
-            retrievePercent(x.entryId);
-        });
-    }
+    $(window).resize(function () {
+      retrievePercent(x.entryId);
+    });
+  }
 });
-- 
cgit v1.2.3


From 25dc07d3c9d88dcb84444d69fd0b4822315c3fac Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 09:06:54 +0200
Subject: Add tags on entries view

Should be tested on old browsers
---
 app/Resources/static/themes/material/css/main.css | 38 +++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 473b0308..e70bb2b1 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -342,6 +342,44 @@ main ul.row {
   line-height: 32px;
 }
 
+.card .card-entry-labels {
+    position: absolute;
+    top:10px;
+    z-index: 90;
+    max-width: 50%;
+}
+
+.card .card-entry-labels li {
+    margin: 10px 10px 10px auto;
+    padding: 5px 12px 5px 16px;
+    background-color: rgba(0,151,167,0.85);
+    border-radius: 0 3px 3px 0;
+    color: #fff;
+    cursor: default;
+    max-height: 2em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.card .card-entry-labels-hidden {
+    margin-top: 5px;
+}
+
+.card .card-entry-labels-hidden li {
+    display: inline-block;
+    background-color: rgba(0,151,167,0.85);
+    margin: 0 5px;
+    padding: 5px 12px;
+    border-radius: 3px;
+    color: #fff;
+    max-height: 2em;
+    max-width: calc(100% - 15px);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 .card .card-content .estimatedTime {
   margin-bottom: 10px;
 }
-- 
cgit v1.2.3


From a15022db96fb031f7a9bccbdcc9420a8ca94174c Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 23 Jun 2016 23:13:25 +0200
Subject: minor ui fixes

---
 app/Resources/static/themes/material/css/main.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index e70bb2b1..cfc77d06 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -439,6 +439,10 @@ main ul.row {
   height: auto;
 }
 
+#article > header > h1 {
+  font-size: 2em;
+}
+
 .reader-mode {
   width: 95px !important;
   transition: width 0.2s ease;
-- 
cgit v1.2.3


From eef833d644f90518c712eccac7805d99562fd263 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 24 Jun 2016 12:07:45 +0200
Subject: uniformize tags on article view too

---
 app/Resources/static/themes/material/css/main.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index cfc77d06..053dfd91 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -487,12 +487,13 @@ main ul.row {
 
 #article aside #list {
   float: right;
-  margin-right: 15px;
+  margin: 0 15px 10px;
 }
 
 #article aside .chip {
-  background-color: #039be5;
+  background-color: rgba(0,151,167,0.85);
   color: #fff;
+  padding: 0 15px 0 10px;
 }
 
 #article aside .chip i {
-- 
cgit v1.2.3


From 1d4d9aaf2971e5b4d00a28f935c815e88bcf1487 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 1 Jul 2016 13:59:30 +0200
Subject: Bring tags on entries view to baggy

Also, a couple of UI improvement and CSS fixing
---
 app/Resources/static/themes/material/css/main.css | 87 ++++++++++++-----------
 1 file changed, 45 insertions(+), 42 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 053dfd91..2ffe0b46 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -34,6 +34,7 @@
   font-style: normal;
   font-weight: 400;
   src: url(../fonts/MaterialIcons-Regular.eot);
+
   /* For IE6-8 */
   src: local("Material Icons"), local("MaterialIcons-Regular"), url(../fonts/MaterialIcons-Regular.woff2) format("woff2"), url(../fonts/MaterialIcons-Regular.woff) format("woff"), url(../fonts/MaterialIcons-Regular.ttf) format("truetype");
 }
@@ -55,6 +56,7 @@
 
   /* Support for all WebKit browsers. */
   -webkit-font-smoothing: antialiased;
+
   /* Support for Safari and Chrome. */
   text-rendering: optimizeLegibility;
 
@@ -123,11 +125,11 @@ main,
 }
 
 .pagination {
-    float: right;
+  float: right;
 }
 
 .pagination ul {
-    margin: 0 !important;
+  margin: 0 !important;
 }
 
 .pagination li {
@@ -141,8 +143,8 @@ main,
 }
 
 .pagination .disabled {
-    margin-right: 10px;
-    margin-left: 10px;
+  margin-right: 10px;
+  margin-left: 10px;
 }
 
 div.pagination ul .prev.disabled,
@@ -151,10 +153,10 @@ div.pagination ul .next.disabled {
 }
 
 .pagination li.active span {
-    padding: 0px 10px;
-    height: 30px;
-    display: block;
-    color: #fff;
+  padding: 0 10px;
+  height: 30px;
+  display: block;
+  color: #fff;
 }
 
 .page-footer .footer-copyright p {
@@ -266,9 +268,9 @@ nav input {
 
 .side-nav .collapsible-header,
 .side-nav.fixed .collapsible-header {
-    height: 45px;
-    line-height: 44px;
-    padding: 0 20px;
+  height: 45px;
+  line-height: 44px;
+  padding: 0 20px;
 }
 
 .bold > a {
@@ -343,41 +345,41 @@ main ul.row {
 }
 
 .card .card-entry-labels {
-    position: absolute;
-    top:10px;
-    z-index: 90;
-    max-width: 50%;
+  position: absolute;
+  top: 10px;
+  z-index: 90;
+  max-width: 50%;
 }
 
 .card .card-entry-labels li {
-    margin: 10px 10px 10px auto;
-    padding: 5px 12px 5px 16px;
-    background-color: rgba(0,151,167,0.85);
-    border-radius: 0 3px 3px 0;
-    color: #fff;
-    cursor: default;
-    max-height: 2em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  margin: 10px 10px 10px auto;
+  padding: 5px 12px 5px 16px;
+  background-color: rgba(0, 151, 167, 0.85);
+  border-radius: 0 3px 3px 0;
+  color: #fff;
+  cursor: default;
+  max-height: 2em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .card .card-entry-labels-hidden {
-    margin-top: 5px;
+  margin-top: 5px;
 }
 
 .card .card-entry-labels-hidden li {
-    display: inline-block;
-    background-color: rgba(0,151,167,0.85);
-    margin: 0 5px;
-    padding: 5px 12px;
-    border-radius: 3px;
-    color: #fff;
-    max-height: 2em;
-    max-width: calc(100% - 15px);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  display: inline-block;
+  background-color: rgba(0, 151, 167, 0.85);
+  margin: 0 5px;
+  padding: 5px 12px;
+  border-radius: 3px;
+  color: #fff;
+  max-height: 2em;
+  max-width: calc(100% - 15px);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .card .card-content .estimatedTime {
@@ -491,7 +493,7 @@ main ul.row {
 }
 
 #article aside .chip {
-  background-color: rgba(0,151,167,0.85);
+  background-color: rgba(0, 151, 167, 0.85);
   color: #fff;
   padding: 0 15px 0 10px;
 }
@@ -517,7 +519,7 @@ main ul.row {
   }
   .pagination {
     width: auto;
-    }
+  }
   .reader-mode {
     width: 240px !important;
   }
@@ -534,7 +536,8 @@ main ul.row {
   .indicator {
     display: none;
   }
-  .pagination li.prev, .pagination li.next {
+  .pagination li.prev,
+  .pagination li.next {
     width: auto;
   }
 }
@@ -633,8 +636,8 @@ footer [class*=" icon-"] {
   padding-right: 10px;
 }
 
-footer [class^="icon-"]::hover,
-footer [class*=" icon-"]::hover {
+footer [class^="icon-"]:hover,
+footer [class*=" icon-"]:hover {
   text-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
 
-- 
cgit v1.2.3


From 8315130a75c8f411f76134b6205a017409583d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 21 Apr 2016 22:30:50 +0200
Subject: Display entries number for each category

---
 app/Resources/static/themes/material/css/main.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index cade37f6..99892401 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -303,6 +303,10 @@ nav input {
   margin: 0 1rem;
 }
 
+span.numberItems {
+  float: right;
+}
+
 /* ==========================================================================
  * 3 = Filters slider
  * ========================================================================== */
-- 
cgit v1.2.3


From 8e06720ff3bce85838e9ef76263d51ef8cdf1469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 25 Aug 2016 16:19:21 +0200
Subject: Add icon for public share link

---
 app/Resources/static/themes/material/css/main.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index cade37f6..b81335eb 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -630,6 +630,10 @@ main ul.row {
   content: "\eae6";
 }
 
+.icon-link::before {
+    content: "\e9cb";
+}
+
 footer [class^="icon-"],
 footer [class*=" icon-"] {
   font-size: 2em;
-- 
cgit v1.2.3


From 52ef49709918809d6fbe40bc68e4ff090b84e6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 26 Aug 2016 14:26:47 +0200
Subject: Fix print / article views

---
 app/Resources/static/themes/material/css/print.css | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
index a16be71e..37228cff 100755
--- a/app/Resources/static/themes/material/css/print.css
+++ b/app/Resources/static/themes/material/css/print.css
@@ -26,10 +26,23 @@
   div.tools,
   header div,
   .messages,
-  .entry + .results {
+  .entry + .results,
+  #slide-out,
+  .progress, .hide-on-large-only,
+  #article > aside,
+  #article .mbm a
+  {
     display: none !important;
   }
 
+  main {
+      padding-left: 0 !important;
+  }
+
+  #article {
+      margin: inherit !important;
+  }
+
   article {
     border: none !important;
   }
-- 
cgit v1.2.3


From a374ac0fd34d8fe6eb5540617ab3f5b0a8b81095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 30 Aug 2016 13:52:28 +0200
Subject: Fixed last merge who caused CSS/JS bugs

---
 app/Resources/static/themes/material/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d3cd1244..dbae5faf 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -257,7 +257,7 @@ nav input {
   display: none;
 }
 
-input-field.nav-panel-add, .input-field.nav-panel-add form {
+.input-field.nav-panel-add, .input-field.nav-panel-add form {
     height: 100%;
 }
 
-- 
cgit v1.2.3


From be20e6f00945accc65849e14558bcdb50c08a6ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 1 Sep 2016 19:18:39 +0200
Subject: CSS indentation

---
 app/Resources/static/themes/material/css/print.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
index 37228cff..1eb96735 100755
--- a/app/Resources/static/themes/material/css/print.css
+++ b/app/Resources/static/themes/material/css/print.css
@@ -36,11 +36,11 @@
   }
 
   main {
-      padding-left: 0 !important;
+    padding-left: 0 !important;
   }
 
   #article {
-      margin: inherit !important;
+    margin: inherit !important;
   }
 
   article {
-- 
cgit v1.2.3


From b1e0a586e8222ca1fc59bcff0a57e2a3f8c11534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 2 Sep 2016 10:53:22 +0200
Subject: Fixed different font-size for labels in config screen Fix #1788

---
 app/Resources/static/themes/material/css/main.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/Resources/static/themes/material')

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 {
 div.settings div.file-field div {
   margin-top: inherit;
 }
+
+.input-field label.active {
+    font-size: 1rem;
+}
-- 
cgit v1.2.3


From d49c88f15adfc97399e12b96283bb412b41a6d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 13 Sep 2016 20:31:06 +0200
Subject: Remove footer part

---
 app/Resources/static/themes/material/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index f4230734..65b708c7 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -174,7 +174,7 @@ div.pagination ul .next.disabled {
 
 footer.page-footer {
   margin-top: 10px;
-  padding-top: 10px;
+  padding-top: 0px;
 }
 
 footer .row {
-- 
cgit v1.2.3


From 1ed965beb99656253ec2fa344ddc2800f413d9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 27 Sep 2016 20:52:30 +0200
Subject: Remove CSS class who caused long loading on Firefox Fix #2302 #2281

---
 app/Resources/static/themes/material/css/main.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 65b708c7..9ea59eb0 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -352,7 +352,6 @@ 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 {
-- 
cgit v1.2.3


From c146f6940a176142084b4fc3c610d13aca60d90e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 28 Sep 2016 10:30:18 +0200
Subject: Assets work

* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
---
 app/Resources/static/themes/material/css/main.css  | 33 +++++++---
 app/Resources/static/themes/material/css/print.css |  6 +-
 app/Resources/static/themes/material/js/init.js    | 70 ++++++++--------------
 3 files changed, 54 insertions(+), 55 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 65b708c7..1d14448f 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -174,7 +174,7 @@ div.pagination ul .next.disabled {
 
 footer.page-footer {
   margin-top: 10px;
-  padding-top: 0px;
+  padding-top: 0;
 }
 
 footer .row {
@@ -257,8 +257,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%;
 }
 
 /* ==========================================================================
@@ -355,8 +356,9 @@ main ul.row {
   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 {
@@ -528,30 +530,38 @@ main ul.row {
   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;
@@ -569,38 +579,47 @@ main ul.row {
     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;
@@ -646,7 +665,7 @@ main ul.row {
 }
 
 .icon-link::before {
-    content: "\e9cb";
+  content: "\e9cb";
 }
 
 footer [class^="icon-"],
@@ -677,5 +696,5 @@ div.settings div.file-field div {
 }
 
 .input-field label.active {
-    font-size: 1rem;
+  font-size: 1rem;
 }
diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
index 1eb96735..98505aae 100755
--- a/app/Resources/static/themes/material/css/print.css
+++ b/app/Resources/static/themes/material/css/print.css
@@ -28,10 +28,10 @@
   .messages,
   .entry + .results,
   #slide-out,
-  .progress, .hide-on-large-only,
+  .progress,
+  .hide-on-large-only,
   #article > aside,
-  #article .mbm a
-  {
+  #article .mbm a {
     display: none !important;
   }
 
diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
index d6a87941..18f7b40a 100755
--- a/app/Resources/static/themes/material/js/init.js
+++ b/app/Resources/static/themes/material/js/init.js
@@ -1,29 +1,10 @@
-var $ = require('jquery');
-require('materialize');
-var annotator = require('annotator');
+const $ = require('jquery');
+global.jQuery = $;
+require('materialize'); // eslint-disable-line
+const annotator = require('annotator');
+import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools.js';
 
-function initFilters() {
-  // no display if filters not aviable
-  if ($('div').is('#filters')) {
-    $('#button_filters').show();
-    $('.button-collapse-right').sideNav({ edge: 'right' });
-    $('#clear_form_filters').on('click', function () {
-      $('#filters input').val('');
-      $('#filters :checked').removeAttr('checked');
-      return false;
-    });
-  }
-}
-
-function initExport() {
-  // no display if export not aviable
-  if ($('div').is('#export')) {
-    $('#button_export').show();
-    $('.button-collapse-right').sideNav({ edge: 'right' });
-  }
-}
-
-$(document).ready(function () {
+$(document).ready(() => {
   // sideNav
   $('.button-collapse').sideNav();
   $('select').material_select();
@@ -40,13 +21,13 @@ $(document).ready(function () {
   initFilters();
   initExport();
 
-  $('#nav-btn-add-tag').on('click', function () {
+  $('#nav-btn-add-tag').on('click', () => {
     $('.nav-panel-add-tag').toggle(100);
     $('.nav-panel-menu').addClass('hidden');
     $('#tag_label').focus();
     return false;
   });
-  $('#nav-btn-add').on('click', function () {
+  $('#nav-btn-add').on('click', () => {
     $('.nav-panel-buttom').hide(100);
     $('.nav-panel-add').show(100);
     $('.nav-panels .action').hide(100);
@@ -55,7 +36,7 @@ $(document).ready(function () {
     $('#entry_url').focus();
     return false;
   });
-  $('#nav-btn-search').on('click', function () {
+  $('#nav-btn-search').on('click', () => {
     $('.nav-panel-buttom').hide(100);
     $('.nav-panel-search').show(100);
     $('.nav-panels .action').hide(100);
@@ -64,7 +45,7 @@ $(document).ready(function () {
     $('#searchfield').focus();
     return false;
   });
-  $('.close').on('click', function () {
+  $('.close').on('click', () => {
     $('.nav-panel-add').hide(100);
     $('.nav-panel-search').hide(100);
     $('.nav-panel-buttom').show(100);
@@ -73,12 +54,12 @@ $(document).ready(function () {
     $('.nav-panels').css('background', 'transparent');
     return false;
   });
-  $(window).scroll(function () {
-    var s = $(window).scrollTop();
-    var d = $(document).height();
-    var c = $(window).height();
-    var scrollPercent = (s / (d - c)) * 100;
-    $('.progress .determinate').css('width', scrollPercent + '%');
+  $(window).scroll(() => {
+    const s = $(window).scrollTop();
+    const d = $(document).height();
+    const c = $(window).height();
+    const scrollPercent = (s / (d - c)) * 100;
+    $('.progress .determinate').css('width', `${scrollPercent}%`);
   });
 
 /* ==========================================================================
@@ -86,9 +67,8 @@ $(document).ready(function () {
    ========================================================================== */
 
   if ($('article').length) {
-    var app = new annotator.App();
-    var x = JSON.parse($('#annotationroutes').html());
-
+    const app = new annotator.App();
+    const x = JSON.parse($('#annotationroutes').html());
 
     app.include(annotator.ui.main, {
       element: document.querySelector('article'),
@@ -96,21 +76,21 @@ $(document).ready(function () {
 
     app.include(annotator.storage.http, x);
 
-    app.start().then(function () {
+    app.start().then(() => {
       app.annotations.load({ entry: x.entryId });
     });
 
-    $(window).scroll(function (e) {
-      var scrollTop = $(window).scrollTop();
-      var docHeight = $(document).height();
-      var scrollPercent = (scrollTop) / (docHeight);
-      var scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
+    $(window).scroll(() => {
+      const scrollTop = $(window).scrollTop();
+      const docHeight = $(document).height();
+      const scrollPercent = (scrollTop) / (docHeight);
+      const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
       savePercent(x.entryId, scrollPercentRounded);
     });
 
     retrievePercent(x.entryId);
 
-    $(window).resize(function () {
+    $(window).resize(() => {
       retrievePercent(x.entryId);
     });
   }
-- 
cgit v1.2.3


From 0471e905b8b37ac226176ee9a708624c869bb046 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 29 Sep 2016 09:18:46 +0200
Subject: fonts & ligatures

---
 app/Resources/static/themes/material/css/main.css | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 1d14448f..67be1d22 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -19,12 +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;
 }
-- 
cgit v1.2.3


From a44d2613c730b8933ba17a1295ae6c170345cad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sat, 1 Oct 2016 16:09:31 +0200
Subject: Changed quickstart layout

---
 app/Resources/static/themes/material/css/main.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 9ea59eb0..005cc302 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -411,12 +411,12 @@ main ul.row {
 }
 
 .card .card-action a {
-  color: #fff;
+  color: #fff !important;
   margin: 0;
 }
 
 .card .card-action a:hover {
-  color: #fff;
+  color: #fff !important;
 }
 
 .settings .div_tabs {
-- 
cgit v1.2.3


From 0f70abd695136f6cfcfaf3c755223cf2d61af090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Mon, 3 Oct 2016 10:27:01 +0200
Subject: Fixed CSS for quickstart links

---
 app/Resources/static/themes/material/css/main.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 00d7a869..397622bd 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -408,12 +408,16 @@ main ul.row {
 }
 
 .card .card-action a {
-  color: #fff !important;
+  color: #fff;
   margin: 0;
 }
 
 .card .card-action a:hover {
-  color: #fff !important;
+  color: #fff;
+}
+
+.quickstart .card .card-action a, .quickstart .card .card-action a:hover {
+    color: #fff !important;
 }
 
 .settings .div_tabs {
-- 
cgit v1.2.3


From a494c33ef7e574e68ab5bb83d0bdbd67348af0ef Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 3 Oct 2016 23:08:26 +0200
Subject: Basically, fix everything

* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
---
 app/Resources/static/themes/material/css/main.css | 54 +++++++++++++++++++++--
 1 file changed, 51 insertions(+), 3 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 397622bd..20d1dded 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -62,8 +62,8 @@
   font-feature-settings: 'liga';
 }
 
-[class^="icon-"],
-[class*=" icon-"] {
+[class^="icon-"]::before,
+[class*=" icon-"]::before {
   font-family: icomoon;
   speak: none;
   font-style: normal;
@@ -72,11 +72,59 @@
   text-transform: none;
   line-height: 1;
 
+  /* Enable Ligatures ================ */
+  letter-spacing: 0;
+  -webkit-font-feature-settings: "liga";
+  -moz-font-feature-settings: "liga=1";
+  -moz-font-feature-settings: "liga";
+  -ms-font-feature-settings: "liga" 1;
+  -o-font-feature-settings: "liga";
+  font-feature-settings: "liga";
+
   /* Better Font Rendering =========== */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-image {
+  background-size: 16px 16px;
+  background: no-repeat center;
+  padding-right: 1em !important;
+  padding-left: 1em !important;
+}
+
+.icon-eye::before {
+  content: "\e9ce";
+}
+
+.icon-no-eye::before {
+  content: "\e9d1";
+}
+
+.icon-calendar::before {
+  content: "\e953";
+}
+
+.icon-time::before {
+  content: "\e952";
+}
+
+/* Carrot (http://carrot.org) */
+.icon-image--carrot {
+  background-image: url("../../_global/img/icons/carrot-icon--black.png");
+}
+
+/* Diaspora */
+.icon-image--diaspora {
+  background-image: url("../../_global/img/icons/diaspora-icon--black.png");
+}
+
+/* Shaarli */
+.icon-image--shaarli {
+  background-image: url("../../_global/img/icons/shaarli.png");
+}
+
+
 body {
   display: flex;
   min-height: 100vh;
@@ -643,7 +691,7 @@ main ul.row {
 }
 
 .icon-twitter::before {
-  content: "\ea91";
+  content: "\ea96";
 }
 
 .icon-apple::before {
-- 
cgit v1.2.3


From 9f7d154e3451f1ccc1d69f0013e98acf4639c63b Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 12:14:28 +0200
Subject: Add eslint & stylelint tests (fix a few things) and move dependencies
 to dev

---
 app/Resources/static/themes/material/css/main.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 20d1dded..5a46ec09 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -87,8 +87,9 @@
 }
 
 .icon-image {
-  background-size: 16px 16px;
-  background: no-repeat center;
+  background-size: 16px;
+  background-repeat: no-repeat;
+  background-position: center;
   padding-right: 1em !important;
   padding-left: 1em !important;
 }
@@ -124,7 +125,6 @@
   background-image: url("../../_global/img/icons/shaarli.png");
 }
 
-
 body {
   display: flex;
   min-height: 100vh;
@@ -464,8 +464,9 @@ main ul.row {
   color: #fff;
 }
 
-.quickstart .card .card-action a, .quickstart .card .card-action a:hover {
-    color: #fff !important;
+.quickstart .card .card-action a,
+.quickstart .card .card-action a:hover {
+  color: #fff !important;
 }
 
 .settings .div_tabs {
-- 
cgit v1.2.3


From 46d78f87d934bbc7679b85d0c78178444ff1b28e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 14:48:22 +0200
Subject: fix icons

---
 app/Resources/static/themes/material/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 5a46ec09..4751c645 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -71,6 +71,7 @@
   font-variant: normal;
   text-transform: none;
   line-height: 1;
+  background-size: 24px;
 
   /* Enable Ligatures ================ */
   letter-spacing: 0;
@@ -87,7 +88,7 @@
 }
 
 .icon-image {
-  background-size: 16px;
+  background-size: 24px;
   background-repeat: no-repeat;
   background-position: center;
   padding-right: 1em !important;
-- 
cgit v1.2.3


From 0c7f1ba79615be00d07a3fd4e9671f3c2356d38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Tue, 4 Oct 2016 14:58:06 +0200
Subject: Fixed icon position in share menu

---
 app/Resources/static/themes/material/css/main.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 4751c645..f3d09973 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -88,9 +88,8 @@
 }
 
 .icon-image {
-  background-size: 24px;
+  background-size: 16px;
   background-repeat: no-repeat;
-  background-position: center;
   padding-right: 1em !important;
   padding-left: 1em !important;
 }
@@ -107,6 +106,10 @@
   content: "\e953";
 }
 
+.icon-mail::before {
+    content: "\ea86";
+}
+
 .icon-time::before {
   content: "\e952";
 }
-- 
cgit v1.2.3


From 6cb364a2c123b96d245b1ca3c330fd0042c74cd1 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 15:30:05 +0200
Subject: use airbnb base rules and update eslint

---
 app/Resources/static/themes/material/js/init.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
index 18f7b40a..a68269e0 100755
--- a/app/Resources/static/themes/material/js/init.js
+++ b/app/Resources/static/themes/material/js/init.js
@@ -1,8 +1,10 @@
+import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
+
 const $ = require('jquery');
+
 global.jQuery = $;
 require('materialize'); // eslint-disable-line
 const annotator = require('annotator');
-import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools.js';
 
 $(document).ready(() => {
   // sideNav
-- 
cgit v1.2.3


From c10adc1f762d004350a7921250c6821baa866e2d Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 4 Oct 2016 15:59:56 +0200
Subject: typo and build on test

---
 app/Resources/static/themes/material/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index f3d09973..9c501de5 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -107,7 +107,7 @@
 }
 
 .icon-mail::before {
-    content: "\ea86";
+  content: "\ea86";
 }
 
 .icon-time::before {
-- 
cgit v1.2.3


From 15f1352ef8761d3e083fc17c8354c30ca3542050 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 5 Oct 2016 14:06:55 +0200
Subject: better tags on material

---
 app/Resources/static/themes/material/css/main.css | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 9c501de5..b66c88f9 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -445,6 +445,15 @@ main ul.row {
   white-space: nowrap;
 }
 
+.card-entry-tags a,
+.card-entry-labels a,
+.card-entry-labels-hidden a,
+#list .chip a {
+  text-decoration: none;
+  font-weight: normal;
+  color: #fff;
+}
+
 .card .card-content .estimatedTime {
   margin-bottom: 10px;
 }
-- 
cgit v1.2.3


From 28bb48905a2104adad65508f51737f987dc1ad4c Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 9 Oct 2016 18:41:19 +0200
Subject: Optimize the way tag list is rendered
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
---
 app/Resources/static/themes/material/css/main.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index b66c88f9..121e7bf4 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -414,9 +414,9 @@ main ul.row {
   max-width: 50%;
 }
 
-.card .card-entry-labels li {
+.card .card-entry-labels li, .card-tag-labels li {
   margin: 10px 10px 10px auto;
-  padding: 5px 12px 5px 16px;
+  padding: 5px 12px 5px 16px !important;
   background-color: rgba(0, 151, 167, 0.85);
   border-radius: 0 3px 3px 0;
   color: #fff;
@@ -447,6 +447,7 @@ main ul.row {
 
 .card-entry-tags a,
 .card-entry-labels a,
+.card-tag-labels a,
 .card-entry-labels-hidden a,
 #list .chip a {
   text-decoration: none;
-- 
cgit v1.2.3


From e08477803079d0097885e026797256da7fd30f6c Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 9 Oct 2016 19:35:27 +0200
Subject: CS

---
 app/Resources/static/themes/material/css/main.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 121e7bf4..d91b469f 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -414,7 +414,8 @@ main ul.row {
   max-width: 50%;
 }
 
-.card .card-entry-labels li, .card-tag-labels li {
+.card .card-entry-labels li,
+.card-tag-labels li {
   margin: 10px 10px 10px auto;
   padding: 5px 12px 5px 16px !important;
   background-color: rgba(0, 151, 167, 0.85);
-- 
cgit v1.2.3


From 38dc91be8ed04f14c180a729a0deb7a57e5cc64a Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Sat, 15 Oct 2016 11:17:55 +0300
Subject: Improved side menu, reduced the font size on small screens, fixed a
 form to add links on small screens

---
 app/Resources/static/themes/material/css/main.css | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index d91b469f..7c83d45d 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -360,6 +360,10 @@ span.numberItems {
   float: right;
 }
 
+nav ul a:hover {
+    background-color: initial;
+}
+
 /* ==========================================================================
  * 3 = Filters slider
  * ========================================================================== */
@@ -522,7 +526,7 @@ main ul.row {
 }
 
 #article > header > h1 {
-  font-size: 2em;
+  font-size: 1.6em;
 }
 
 .reader-mode {
@@ -603,6 +607,18 @@ main ul.row {
     width: auto;
   }
 
+  #article {
+    padding: 15px;
+    max-width: 35em;
+    margin-left: auto;
+    margin-right: auto;
+    font-size: 18px;
+  }
+
+  #article > header > h1 {
+    font-size: 1.33em;
+  }
+
   .reader-mode {
     width: 240px !important;
   }
@@ -760,3 +776,7 @@ div.settings div.file-field div {
 .input-field label.active {
   font-size: 1rem;
 }
+
+nav .input-field input {
+  margin: 0;
+}
-- 
cgit v1.2.3


From 08f5a5b6bd4442b8aaed597fedbea5fc87cfc3cf Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 15 Oct 2016 15:25:46 +0200
Subject: fix stylelint

---
 app/Resources/static/themes/material/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/Resources/static/themes/material')

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 7c83d45d..2cc2e8a0 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -361,7 +361,7 @@ span.numberItems {
 }
 
 nav ul a:hover {
-    background-color: initial;
+  background-color: initial;
 }
 
 /* ==========================================================================
-- 
cgit v1.2.3