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

.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory" : "app/Resources/static/lib",
+  "json" : "bower.json"
+}

.gitignore

@@ -38,3 +38,11 @@ docker/data/
 
 # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
 composer.lock
+
+# assets stuff
+/node_modules/
+!app/Resources/static/lib
+app/Resources/static/lib/*
+/bin
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*

.travis.yml

@@ -15,6 +15,9 @@ cache:
     directories:
         - vendor
         - $HOME/.composer/cache
+        - node_modules
+        - $HOME/.cache/bower
+        - $HOME/.npm
 
 php:
     - 5.5
@@ -22,16 +25,21 @@ php:
     - 7.0
     - hhvm
 
+node_js:
+    - "5"
+
 env:
-    - DB=mysql
-    - DB=pgsql
-    - DB=sqlite
+    - DB=mysql ASSETS=nobuild
+    - DB=pgsql ASSETS=nobuild
+    - DB=sqlite ASSETS=nobuild
 
 matrix:
     fast_finish: true
     include:
         - php: 7.0
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild
+        - php: 7.0
+          env: DB=sqlite ASSETS=build
     exclude:
         - php: hhvm
           env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
@@ -49,11 +57,15 @@ before_script:
     - composer self-update --no-progress
     - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 
+install:
+    - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
+    - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi;
+
 before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
+    - travis_wait bash install.sh
     - ant prepare-$DB
     - bin/phpunit -v
     - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.5] - 2016-05-31
+
+### Added
+
+- [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (Dan Bartram)
+
+### Changed
+
+- [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (Nicolas Lœuillet)
+- [#2054](https://github.com/wallabag/wallabag/pull/2054) Update italian translation (Daniele Conca)
+- [#2068](https://github.com/wallabag/wallabag/pull/2068), [#2049](https://github.com/wallabag/wallabag/pull/2049) Update documentation (Josh Panter, Mario Vormstein)
+
+### Fixed
+
+- [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (Jeremy Benoist, Nicolas Lœuillet)
+- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet)
+- [#2092](https://github.com/wallabag/wallabag/pull/2092) API: Starred and archived clears if article is already exists (Rurik19)
+- [#2097](https://github.com/wallabag/wallabag/issues/2097) Fix image path in 2-factor authentification email (Baptiste Mille-Mathias)
+- [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (Merouane Atig)
+
 ## [2.0.4] - 2016-05-07
 
 ### Added

Gruntfile.js

@@ -0,0 +1,219 @@
+module.exports = function (grunt) {
+  require('load-grunt-tasks')(grunt);
+
+  grunt.initConfig({
+    appDir: 'app/Resources/static',
+    buildDir: 'web/bundles/wallabagcore',
+
+    postcss: {
+      material: {
+        options: {
+          map: {
+              inline: false
+          },
+
+          processors: [
+            require('pixrem')(),
+            require('autoprefixer')({browsers: 'last 2 versions'}),
+            require('cssnano')()
+          ]
+        },
+        src: '<%= buildDir %>/material.css',
+        dest: '<%= buildDir %>/themes/material/css/style.min.css'
+      },
+      baggy: {
+        options: {
+          map: {
+              inline: false
+          },
+
+          processors: [
+            require('pixrem')(),
+            require('autoprefixer')({browsers: 'last 2 versions'}),
+            require('cssnano')()
+          ]
+        },
+        src: '<%= buildDir %>/baggy.css',
+        dest: '<%= buildDir %>/themes/baggy/css/style.min.css'
+      }
+    },
+    concat: {
+      options: {
+        separator: ';'
+      },
+      jsMaterial: {
+        src: [
+          'node_modules/jquery/dist/jquery.js',
+          'node_modules/jquery-ui/jquery-ui.js',
+          'node_modules/materialize-css/bin/materialize.js',
+          '<%= appDir %>/themes/_global/js/restoreScroll.js',
+          '<%= appDir %>/themes/material/js/init.js'
+        ],
+        dest: '<%= buildDir %>/material.js'
+      },
+      jsBaggy: {
+        src: [
+          'node_modules/jquery/dist/jquery.js',
+          'node_modules/jquery-ui/jquery-ui.js',
+          '<%= appDir %>/themes/baggy/js/init.js',
+          '<%= appDir %>/themes/_global/js/restoreScroll.js',
+          '<%= appDir %>/themes/baggy/js/autoClose.js',
+          '<%= appDir %>/themes/baggy/js/autoCompleteTags.js',
+          '<%= appDir %>/themes/baggy/js/closeMessage.js',
+          '<%= appDir %>/themes/baggy/js/popupForm.js',
+          '<%= appDir %>/themes/baggy/js/saveLink.js'
+        ],
+        dest: '<%= buildDir %>/baggy.js'
+      },
+      cssMaterial: {
+        src: [
+          'node_modules/materialize-css/bin/materialize.css',
+          '<%= appDir %>/themes/material/css/*.css'
+        ],
+        dest: '<%= buildDir %>/material.css'
+      },
+      cssBaggy: {
+        src: [
+          '<%= appDir %>/themes/baggy/css/*.css'
+        ],
+        dest: '<%= buildDir %>/baggy.css'
+      }
+    },
+    browserify: {
+      '<%= buildDir %>/material.browser.js': ['<%= buildDir %>/material.js'],
+      '<%= buildDir %>/baggy.browser.js': ['<%= buildDir %>/baggy.js']
+    },
+    uglify: {
+      material: {
+        files: {
+          '<%= buildDir %>/themes/material/js/material.min.js':
+            ['<%= buildDir %>/material.browser.js']
+        },
+        options: {
+          sourceMap: true,
+        },
+      },
+      baggy: {
+        files: {
+          '<%= buildDir %>/themes/baggy/js/baggy.min.js':
+            ['<%= buildDir %>/baggy.browser.js']
+        },
+        options: {
+          sourceMap: true,
+        },
+      },
+    },
+    copy: {
+      pickerjs: {
+        expand: true,
+        cwd: 'node_modules/pickadate/lib',
+        src: 'picker.js',
+        dest: '<%= buildDir %>'
+      },
+      annotator: {
+        expand: true,
+        cwd: 'node_modules/annotator/pkg',
+        src: 'annotator.min.js',
+        dest: '<%= buildDir %>/themes/_global/js/'
+      }
+    },
+    symlink: {
+      baggyfonts: {
+        files: [
+          {
+            expand: true,
+            overwrite: true,
+            cwd: "<%= appDir %>/lib/icomoon-bower/",
+            src: "fonts",
+            dest: "<%= buildDir %>/themes/baggy/"
+          },
+          {
+            expand: true,
+            overwrite: true,
+            cwd: "<%= appDir %>/lib/bower-pt-sans/fonts",
+            src: "*",
+            dest: "<%= buildDir %>/themes/baggy/fonts/"
+          }
+        ]
+      },
+      materialfonts: {
+        files: [
+          {
+            expand: true,
+            overwrite: true,
+            cwd: "<%= appDir %>/lib/icomoon-bower/",
+            src: "fonts",
+            dest: "<%= buildDir %>/themes/material/"
+          },
+          {
+            expand: true,
+            overwrite: true,
+            cwd: "node_modules/materialize-css/",
+            src: "font",
+            dest: "<%= buildDir %>/themes/material"
+          },
+          {
+            expand: true,
+            overwrite: true,
+            cwd: "<%= appDir %>/lib/roboto-fontface/fonts/",
+            src: "*",
+            dest: "<%= buildDir %>/themes/material/fonts/roboto/"
+          },
+          {
+            expand: true,
+            overwrite: true,
+            cwd: "<%= appDir %>/lib/material-design-icons/iconfont/",
+            src: "*",
+            dest: "<%= buildDir %>/themes/material/fonts/"
+          }
+        ]
+      },
+      pics: {
+        files: [
+          {
+            expand: true,
+            overwrite: true,
+            cwd: '<%= appDir %>/themes/_global/',
+            src: 'img',
+            dest: '<%= buildDir %>/themes/_global/'
+          }
+        ]
+      }
+    },
+    clean: {
+      css: {
+        src: [ '<%= buildDir %>/**/*.css' ]
+      },
+      js: {
+        src: ['<%= buildDir %>/**/*.js', '<%= buildDir %>/**/*.map']
+      },
+      all: {
+        src: ['./<%= buildDir %>']
+      }
+    }
+  });
+
+  grunt.registerTask(
+    'fonts',
+    'Install fonts',
+    ['symlink:baggyfonts', 'symlink:materialfonts']
+    );
+
+  grunt.registerTask(
+    'js',
+    'Build and install js files',
+    ['clean:js', 'copy:pickerjs', 'concat:jsMaterial', 'concat:jsBaggy', 'browserify', 'uglify']
+    );
+
+  grunt.registerTask(
+    'default',
+    'Build and install everything',
+    ['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'symlink']
+    );
+
+  grunt.registerTask(
+    'css',
+    'Compiles the stylesheets.',
+    ['clean:css', 'concat:cssMaterial', 'concat:cssBaggy', 'postcss']
+  );
+}

README.md

@@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands:
 ```
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.4
+    git checkout 2.0.5
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
     php bin/console server:run --env=prod

app/AppKernel.php

@@ -13,7 +13,6 @@ class AppKernel extends Kernel
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new FOS\RestBundle\FOSRestBundle(),

app/Resources/static/themes/_global/js/restoreScroll.js

@@ -8,7 +8,7 @@ function supportsLocalStorage() {
 
 function savePercent(id, percent) {
     if (!supportsLocalStorage()) { return false; }
-    localStorage["poche.article." + id + ".percent"] = percent;
+    localStorage["wallabag.article." + id + ".percent"] = percent;
     return true;
 }
 
@@ -16,10 +16,10 @@ function retrievePercent(id) {
     if (!supportsLocalStorage()) { return false; }
 
     var bheight = $(document).height();
-    var percent = localStorage["poche.article." + id + ".percent"];
+    var percent = localStorage["wallabag.article." + id + ".percent"];
     var scroll = bheight * percent;
 
     $('html,body').animate({scrollTop: scroll}, 'fast');
 
     return true;
-}
+}

app/Resources/static/themes/baggy/css/font.css

@@ -0,0 +1,6 @@
+@font-face {
+  font-family: "PT Sans";
+  font-style: normal;
+  font-weight: 700;
+  src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/pt_sans/regular/PTS55F.woff") format("woff");
+}

app/Resources/static/themes/baggy/css/messages.css

@@ -0,0 +1,19 @@
+.messages.error.install {
+  border: 1px solid #c42608;
+  color: #c00 !important;
+  background: #fff0ef;
+  text-align: left;
+}
+
+.messages.notice.install {
+  border: 1px solid #ebcd41;
+  color: #000;
+  background: #fffcd3;
+  text-align: left;
+}
+
+.messages.success.install {
+  border: 1px solid #6dc70c;
+  background: #e0fbcc !important;
+  text-align: left;
+}

app/Resources/static/themes/baggy/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,
+  .entrie + .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%;
+  }
+}

app/Resources/static/themes/baggy/css/ratatouille.css

@@ -6,8 +6,8 @@
 
 * {
   -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
 }
 
 html {
@@ -18,7 +18,7 @@ html {
 
 body {
   font-size: 1em;
-  line-height:1.5;
+  line-height: 1.5;
   margin: 0;
 }
 
@@ -35,7 +35,7 @@ h6:first-child,
 p:first-child,
 ul:first-child,
 ol:first-child,
-dl:first-child{
+dl:first-child {
   margin-top: 0;
 }
 
@@ -43,14 +43,13 @@ code,
 kbd,
 pre,
 samp {
-    font-family: monospace, serif;
+  font-family: monospace, serif;
 }
 
 pre {
-    white-space: pre-wrap;
+  white-space: pre-wrap;
 }
 
-
 .upper {
   text-transform: uppercase;
 }
@@ -61,12 +60,13 @@ pre {
 
 .inner {
   margin: 0 auto;
-  max-width: 61.25em;/*980px*/
+  max-width: 61.25em; /* 980px */
 }
 
-table, img {
+table,
+img {
   max-width: 100%;
-  height :auto;
+  height: auto;
 }
 
 iframe {
@@ -93,13 +93,13 @@ button,
 input,
 select,
 textarea {
-    font-family: inherit;
-    font-size: 100%;
-    margin: 0;
+  font-family: inherit;
+  font-size: 100%;
+  margin: 0;
 }
 
 input[type="search"] {
-    -webkit-appearance: textfield;
+  -webkit-appearance: textfield;
 }
 
 /* ==========================================================================
@@ -115,11 +115,17 @@ input[type="search"] {
   display: none;
 }
 
-.dtable { display:table }
+.dtable {
+  display: table;
+}
 
-  .dtable > * { display:table-row; }
+.dtable > * {
+  display: table-row;
+}
 
-    .dtable > * > * { display:table-cell; }
+.dtable > * > * {
+  display: table-cell;
+}
 
 .element-invisible {
   border: 0;
@@ -133,32 +139,60 @@ input[type="search"] {
 }
 
 .small {
-  font-size:0.8em;
+  font-size: 0.8em;
 }
 
 .big {
   font-size: 1.2em;
 }
 
-/*Width*/
+/* Width */
 
-.w100 { width:100%; }
-.w90 { width:90%; }
-.w80 { width:80%; }
-.w70 { width:70%; }
-.w60 { width:60%; }
-.w50 { width:50%; }
-.w40 { width:40%; }
-.w30 { width:30%; }
-.w20 { width:20%; }
-.w10 { width:10%; }
+.w100 {
+  width: 100%;
+}
 
+.w90 {
+  width: 90%;
+}
+
+.w80 {
+  width: 80%;
+}
+
+.w70 {
+  width: 70%;
+}
+
+.w60 {
+  width: 60%;
+}
+
+.w50 {
+  width: 50%;
+}
+
+.w40 {
+  width: 40%;
+}
+
+.w30 {
+  width: 30%;
+}
+
+.w20 {
+  width: 20%;
+}
+
+.w10 {
+  width: 10%;
+}
 
 /* ==========================================================================
    Internet Explorer
    ========================================================================== */
 
-/*IE8 and IE9*/
+/* IE8 and IE9 */
 
 article,
 aside,
@@ -172,40 +206,20 @@ main,
 nav,
 section,
 summary {
-    display: block;
+  display: block;
 }
 
-/*IE8 and IE9*/
+/* IE8 and IE9 */
 
 audio,
 canvas,
 video {
-    display: inline-block;
+  display: inline-block;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0){
-  select{
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  select {
     -webkit-appearance: none;
     border-radius: 0;
   }
 }
-
-/* ==========================================================================
-   Medias Queries
-   ========================================================================== */
-
-/*Desktop 1080px*/
-
-@media screen and (max-width: 67.50em) {
-}
-
-/*Tablet 800px*/
-
-@media screen and (max-width: 50em) {
-}
-
-/*Mobile 640px*/
-
-@media screen and (max-width: 40em) {
-}
-

app/Resources/static/themes/baggy/js/init.js

@@ -1,3 +1,9 @@
+var $ = global.jquery = require('jquery');
+require('jquery.cookie');
+require('jquery-ui');
+var annotator = require('annotator');
+
+
 $.fn.ready(function() {
 
   var $listmode = $('#listmode'),
@@ -19,7 +25,7 @@ $.fn.ready(function() {
      ========================================================================== */
 
   $listmode.click(function(){
-    if ( $.cookie("listmode") == 1 ) {
+    if ( jquery.cookie("listmode") == 1 ) {
       // Cookie
       $.removeCookie("listmode");
 
@@ -29,7 +35,7 @@ $.fn.ready(function() {
     }
     else {
       // Cookie
-      $.cookie("listmode", 1, {expires: 365});
+      jquery.cookie("listmode", 1, {expires: 365});
 
       $listentries.addClass("listmode");
       $listmode.removeClass("listmode");
@@ -42,7 +48,7 @@ $.fn.ready(function() {
      Cookie listmode
      ========================================================================== */
 
-  if ( $.cookie("listmode") == 1 ) {
+  if ( jquery.cookie("listmode") == 1 ) {
     $listentries.addClass("listmode");
     $listmode.removeClass("listmode");
     $listmode.addClass("tablemode");
@@ -60,4 +66,36 @@ $.fn.ready(function() {
        return false;
     });
 
+  /* ==========================================================================
+     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);
+        });
+    }
 });

app/Resources/static/themes/baggy/js/popupForm.js

@@ -3,6 +3,7 @@ $(document).ready(function() {
     $("#search-form").hide();
     $("#bagit-form").hide();
     $("#filter-form").hide();
+    $("#download-form").hide();
 
     //---------------------------------------------------------------------------
     // Toggle the "Search" popup in the sidebar
@@ -26,6 +27,13 @@ $(document).ready(function() {
         $("#filter-form").toggle();
     }
 
+    //---------------------------------------------------------------------------
+    // Toggle the "Download" popup on entries list
+    //---------------------------------------------------------------------------
+    function toggleDownload() {
+        $("#download-form").toggle();
+    }
+
     //---------------------------------------------------------------------------
     // Toggle the "Save a Link" popup in the sidebar
     //---------------------------------------------------------------------------
@@ -58,11 +66,16 @@ $(document).ready(function() {
         $("#searchfield").focus();
     });
 
-    $("#filter").click(function(){
+    $(".filter-btn").click(function(){
         closePopups();
         toggleFilter();
     });
 
+    $(".download-btn").click(function(){
+        closePopups();
+        toggleDownload();
+    });
+
     $("#bagit").click(function(){
         closePopups();
         toggleBagit();
@@ -77,6 +90,10 @@ $(document).ready(function() {
         toggleFilter();
     });
 
+    $("#download-form-close").click(function(){
+        toggleDownload();
+    });
+
     $("#bagit-form-close").click(function(){
         toggleBagit();
     });

app/Resources/static/themes/baggy/js/saveLink.js

@@ -36,23 +36,6 @@ $.fn.ready(function() {
     $('#plainurl').focus();
   }
 
-	//---------------------------------------------------------------------------
-	// These two functions are now taken care of in popupForm.js
-	//---------------------------------------------------------------------------
-
-  // $bagit.click(function(){
-  //   $bagit.toggleClass("current");
-  //   $("#bagit-arrow").toggleClass("arrow-down");
-  //   toggleSaveLinkForm();
-  // });
-
-  // $("#bagit-form-close").click(function(){
-  //   $bagit.removeClass("current");
-  //   $("#bagit-arrow").removeClass("arrow-down");
-  //   toggleSaveLinkForm();
-  // });
-
-
   //send "bag it link" form request via ajax
   $bagitFormForm.submit( function(event) {
     $("body").css("cursor", "wait");
@@ -67,7 +50,6 @@ $.fn.ready(function() {
         $('#plainurl').val('');
         $('#plainurl').blur('');
         $("body").css("cursor", "auto");
-        //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay
       },
       error: function(data) {
         $('#add-link-result').html("Failed!");

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;
+}

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%;
+  }
+}

app/Resources/static/themes/material/js/init.js

@@ -1,3 +1,7 @@
+var $ = require("jquery"),
+materialize = require("materialize");
+var annotator = require('annotator');
+
 function init_filters() {
     // no display if filters not aviable
     if ($("div").is("#filters")) {
@@ -60,7 +64,7 @@ $(document).ready(function(){
         $("#searchfield").focus();
         return false;
     });
-    $('.mdi-navigation-close').on('click', function(){
+    $('.close').on('click', function(){
         $(".nav-panel-add").hide(100);
         $(".nav-panel-search").hide(100);
         $(".nav-panel-buttom").show(100);
@@ -76,4 +80,37 @@ $(document).ready(function(){
         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);
+        });
+    }
 });

app/config/config.yml

@@ -28,7 +28,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.0.4
+    version: 2.0.5
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -59,19 +59,6 @@ twig:
     form_themes:
         - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
 
-# Assetic Configuration
-assetic:
-    debug:          "%kernel.debug%"
-    use_controller: false
-    bundles:        [ ]
-    #java: /usr/bin/java
-    filters:
-        cssrewrite: ~
-        #closure:
-        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
-        #yui_css:
-        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
-
 # Doctrine Configuration
 doctrine:
     dbal:

app/config/config_dev.yml

@@ -34,9 +34,6 @@ monolog:
                 VERBOSITY_DEBUG: DEBUG
             channels: [doctrine]
 
-assetic:
-    use_controller: true
-
 swiftmailer:
     # see http://mailcatcher.me/
     transport: smtp

bower.json

@@ -0,0 +1,38 @@
+{
+  "name": "wallabag",
+  "version": "2.0.0-beta.1",
+  "homepage": "https://github.com/wallabag/wallabag",
+  "authors": [
+    {
+      "name": "Nicolas Lœuillet",
+      "email": "nicolas@loeuillet.org",
+      "homepage": "http://www.cdetc.fr",
+      "role": "Developer"
+    },
+    {
+      "name": "Thomas Citharel",
+      "homepage": "http://tcit.fr",
+      "role": "Developer"
+    },
+    {
+      "name": "Jérémy Benoist",
+      "homepage": "http://www.j0k3r.net",
+      "role": "Developer"
+    }
+  ],
+  "description": "wallabag is a self hostable application for saving web pages",
+  "license": "MIT",
+  "main": "bower.json",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "icomoon-bower": "^0.1.0",
+    "bower-pt-sans": "pt-sans#*",
+    "roboto-fontface": "^0.4.5"
+  }
+}

composer.json

@@ -48,7 +48,6 @@
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "twig/extensions": "~1.0",
-        "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "^2.3",
         "symfony/monolog-bundle": "^2.8",
         "sensio/distribution-bundle": "^5.0",
@@ -81,7 +80,8 @@
         "mnapoli/piwik-twig-extension": "^1.0",
         "lexik/maintenance-bundle": "~2.1",
         "ocramius/proxy-manager": "1.*",
-        "white-october/pagerfanta-bundle": "^1.0"
+        "white-october/pagerfanta-bundle": "^1.0",
+        "mouf/nodejs-installer": "~1.0"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
@@ -95,7 +95,6 @@
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
         ],
@@ -112,7 +111,6 @@
         "symfony-var-dir": "var",
         "symfony-web-dir": "web",
         "symfony-tests-dir": "tests",
-        "symfony-assets-install": "relative",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"
         }

docs/en/user/android.rst

@@ -13,61 +13,61 @@ Steps to configure your app
 
 When you first start the app, you see the welcome screen, where you are adviced to configure the app for your wallabag instance at first.
 
-.. image:: ../../img/user/android_welcome_screen.de.png
+.. image:: ../../img/user/android_welcome_screen.en.png
     :alt: Welcome screen
     :align: center
 
 Just confirm that message and you get redirected to the settings screen.
 
-.. image:: ../../img/user/android_configuration_screen.de.png
+.. image:: ../../img/user/android_configuration_screen.en.png
     :alt: Settings screen
     :align: center
 
 Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field.
 
-.. image:: ../../img/user/android_configuration_filled_in.de.png
+.. image:: ../../img/user/android_configuration_filled_in.en.png
     :alt: Filled in settings
     :align: center
 
 After you have filled in your data, push the button Connection test and wait for the test to finish. 
 
-.. image:: ../../img/user/android_configuration_connection_test.de.png
+.. image:: ../../img/user/android_configuration_connection_test.en.png
     :alt: Connection test with your wallabag data
     :align: center
 
 The connection test shall finish with success. If not, you need to fix this first until you proceed. 
 
-.. image:: ../../img/user/android_configuration_connection_test_success.de.png
+.. image:: ../../img/user/android_configuration_connection_test_success.en.png
     :alt: Connection test successful
     :align: center
 
 After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your wallabag instance and get the user id and the corresponding token for the feeds.
 
-.. image:: ../../img/user/android_configuration_get_feed_credentials.de.png
+.. image:: ../../img/user/android_configuration_get_feed_credentials.en.png
     :alt: Getting the feed credentials
     :align: center
 
 When the process of getting your feed credentials finishes with success you see a toast message that the user id and the token were automatically filled in to the form.
 
-.. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.de.png
+.. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.en.png
     :alt: Getting feed credentials successful
     :align: center
 
 Now you need to scroll to the bottom of the settings menu. Of course you can adjust the given settings to your needs. Finish the configuration of your app with pushing the save button.
 
-.. image:: ../../img/user/android_configuration_scroll_bottom.de.png
+.. image:: ../../img/user/android_configuration_scroll_bottom.en.png
     :alt: Bottom of the settings screen
     :align: center
 
 After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes.
 
-.. image:: ../../img/user/android_configuration_saved_feed_update.de.png
+.. image:: ../../img/user/android_configuration_saved_feed_update.en.png
     :alt: Settings saved the first time
     :align: center
 
 Finally after the syncronisation finished successfully, you are presented the list of unread articles. 
 
-.. image:: ../../img/user/android_unread_feed_synced.de.png
+.. image:: ../../img/user/android_unread_feed_synced.en.png
     :alt: Filled article list cause feeds successfully syncronized
     :align: center
 

docs/en/user/faq.rst

@@ -1,26 +1,39 @@
 Frequently Asked Questions
 ==========================
 
-During the installation, I've got this error ``Error Output: sh: 1: @post-cmd: not found``
-------------------------------------------------------------------------------------------
+During the installation, I got the error ``Error Output: sh: 1: @post-cmd: not found``
+--------------------------------------------------------------------------------------
 
 It seems you have a problem with your ``composer`` installation. Try to uninstall and reinstall it.
 
 `Read the documentation about composer to know how to install it
 <https://getcomposer.org/doc/00-intro.md>`__.
 
-I can't valid the registration form
------------------------------------
+I can't validate the registration form
+--------------------------------------
 
-Make sure that all fields are well filled:
+Ensure that all fields are properly filled:
 
 * valid email address
 * same passwords in two fields
 
-I don't receive my activation email
------------------------------------
+I'm not receiving my activation email
+-------------------------------------
 
-Are you sure your email address was correct? Did you check your spams folder?
+Are you sure your email address was correct? Did you check your spam folder?
+
+If you still don't see the activation email, please ensure that you have
+installed and properly configured a mail transfer agent. Be sure to include a
+firewall rule for SMTP. E.g., if using firewalld:
+
+::
+
+    firewall-cmd --permanent --add-service=smtp
+    firewall-cmd --reload
+
+Lastly, if you have SELinux enabled, set the following rule:
+
+``setsebool -P httpd_can_sendmail 1``
 
 When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
 ----------------------------------------------------------------------------------------------------------------------------------

docs/en/user/installation.rst

@@ -23,13 +23,13 @@ You'll need the following extensions for wallabag to work. Some of these may alr
 - php-gettext
 - php-tokenizer
 
-wallabag uses PDO to connect to database, so you'll need one of:
+wallabag uses PDO to connect to the database, so you'll need one of the following:
 
 - pdo_mysql
 - pdo_sqlite
 - pdo_pgsql
 
-and it's corresponding database server.
+and its corresponding database server.
 
 Installation
 ------------
@@ -37,7 +37,7 @@ Installation
 On a dedicated web server (recommended way)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-wallabag uses a big number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you don't already have.
+wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so.
 
 Install Composer:
 
@@ -47,13 +47,13 @@ Install Composer:
 
 You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__:
 
-To install wallabag itself, you must run these two commands:
+To install wallabag itself, you must run the following commands:
 
 ::
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.4
+    git checkout 2.0.5
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
@@ -67,17 +67,17 @@ And access wallabag at http://yourserverip:8000
 
 .. tip::
 
-    To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the `Symfony documentation <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
+    To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look at `Symfony documentation <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
 
 On a shared hosting
 ~~~~~~~~~~~~~~~~~~~
 
-We provide you a package with all dependancies inside.
+We provide a package with all dependencies inside.
 The default configuration uses SQLite for the database. If you want to change these settings, please edit ``app/config/parameters.yml``.
 
 We already created a user: login and password are ``wallabag``.
 
-.. caution:: With this package, wallabag don't check mandatory extensions used in the application (theses checks are made during ``composer install`` when you have a dedicated web server, see above).
+.. caution:: With this package, wallabag doesn't check for mandatory extensions used in the application (theses checks are made during ``composer install`` when you have a dedicated web server, see above).
 
 Execute this command to download and extract the latest package:
 
@@ -85,7 +85,7 @@ Execute this command to download and extract the latest package:
 
     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
 
-Now, read the following documentation to create your virtual host, then access to your wallabag.
+Now, read the following documentation to create your virtual host, then access your wallabag.
 If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``.
 
 Installation with Docker
@@ -151,7 +151,7 @@ After reloading or restarting Apache, you should now be able to access wallabag
 Configuration on Nginx
 ~~~~~~~~~~~~~~~~~~~~~~
 
-Assuming you install wallabag in the ``/var/www/wallabag`` folder, here's the recipe for wallabag :
+Assuming you installed wallabag in the ``/var/www/wallabag`` folder, here's the recipe for wallabag :
 
 ::
 
@@ -258,7 +258,7 @@ It has to be the same for the following folders
 * /var/www/wallabag/bin/
 * /var/www/wallabag/app/config/
 * /var/www/wallabag/vendor/
-* /var/www/wallabag/data/  
+* /var/www/wallabag/data/
 
 by entering
 
@@ -269,10 +269,56 @@ by entering
    chown -R www-data:www-data /var/www/wallabag/vendor
    chown -R www-data:www-data /var/www/wallabag/data/
 
-otherwise, sooner or later you will meet this error messages
+otherwise, sooner or later you will see these error messages:
 
 .. code-block:: bash
 
     Unable to write to the "bin" directory.
     file_put_contents(app/config/parameters.yml): failed to open stream: Permission denied
     file_put_contents(/.../wallabag/vendor/autoload.php): failed to open stream: Permission denied
+
+Additional rules for SELinux
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If SELinux is enabled on your system, you will need to configure additional contexts in order for wallabag to function properly. To check if SELinux is enabled, simply enter the following:
+
+``getenforce``
+
+This will return ``Enforcing`` if SELinux is enabled. Creating a new context involves the following syntax:
+
+``semanage fcontext -a -t <context type> <full path>``
+
+For example:
+
+``semanage fcontext -a -t httpd_sys_content_t "/var/www/wallabag(/.*)?"``
+
+This will recursively apply the httpd_sys_content_t context to the wallabag directory and all underlying files and folders. The following rules are needed:
+
++-----------------------------------+----------------------------+
+| Full path                         | Context                    |
++===================================+============================+
+| /var/www/wallabag(/.*)?           | ``httpd_sys_content_t``    |
++-----------------------------------+----------------------------+
+| /var/www/wallabag/data(/.*)?      | ``httpd_sys_rw_content_t`` |
++-----------------------------------+----------------------------+
+| /var/www/wallabag/var/logs(/.*)?  | ``httpd_log_t``            |
++-----------------------------------+----------------------------+
+| /var/www/wallabag/var/cache(/.*)? | ``httpd_cache_t``          |
++-----------------------------------+----------------------------+
+
+After creating these contexts, enter the following in order to apply your rules:
+
+``restorecon -R -v /var/www/wallabag``
+
+You can check contexts in a directory by typing ``ls -lZ`` and you can see all of your current rules with ``semanage fcontext -l -C``.
+
+If you're installing the preconfigured latest-v2-package, then an additional rule is needed during the initial setup:
+
+``semanage fcontext -a -t httpd_sys_rw_content_t "/var/www/wallabag/var"``
+
+After you successfully access your wallabag and complete the initial setup, this context can be removed:
+
+::
+
+    semanage fcontext -d -t httpd_sys_rw_content_t "/var/www/wallabag/var"
+    retorecon -R -v /var/www/wallabag/var

docs/fr/user/installation.rst

@@ -51,7 +51,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.4
+    git checkout 2.0.5
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 

install.sh

@@ -0,0 +1,29 @@
+#! /usr/bin/env bash
+
+if [[ $ASSETS == 'nobuild' ]]; then
+    composer install --no-interaction --no-progress --prefer-dist -o
+else
+
+    echo "Installing PHP dependencies through Composer..."
+    if [[ $ASSETS == 'build' ]]; then
+        composer install --no-interaction --no-progress --prefer-dist -o
+    else
+        SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    fi
+
+    chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
+    echo "Downloading javascript librairies through npm..."
+    vendor/mouf/nodejs-installer/bin/local/npm install
+
+    echo "Downloading fonts librairies through bower..."
+    node_modules/bower/bin/bower install
+
+    echo "Concat, minify and installing assets..."
+    node_modules/grunt/bin/grunt
+
+    if [[ $ASSETS != 'build' ]]; then
+        echo "Installing wallabag..."
+        php bin/console wallabag:install --env=prod
+    fi
+
+fi

install_dev.sh

@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+
+echo "Installing PHP dependencies (including dev) through Composer..."
+composer install
+
+echo "Downloading javascript librairies through npm..."
+npm install
+
+echo "Downloading fonts librairies through bower..."
+bower install
+
+echo "Concat, minify and installing assets..."
+grunt
+
+echo "Installing wallabag..."
+php bin/console wallabag:install

package.json

@@ -0,0 +1,84 @@
+{
+  "name": "wallabag",
+  "version": "2.0.0",
+  "description": "wallabag is a self hostable application for saving web pages",
+  "main": "index.js",
+  "private": true,
+  "directories": {
+    "doc": "docs"
+  },
+  "dependencies": {
+    "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
+    "autoprefixer": "^6.3.6",
+    "bower": "^1.7.7",
+    "browserify": "^13.0.0",
+    "browserify-shim": "^3.8.12",
+    "cssnano": "^3.5.2",
+    "grunt": ">=0.4.0",
+    "grunt-browserify": "^5.0.0",
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-concat": "^1.0.0",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-cssmin": "^1.0.0",
+    "grunt-contrib-symlink": "^1.0.0",
+    "grunt-contrib-uglify": "^1.0.0",
+    "grunt-postcss": "^0.8.0",
+    "grunt-shell": "^1.2.1",
+    "hammerjs": "^2.0.6",
+    "jquery": "^2.2.1",
+    "jquery-ui": "^1.10.5",
+    "jquery.cookie": "^1.4.1",
+    "load-grunt-tasks": "^3.4.1",
+    "materialize-css": "0.97.5",
+    "npm": "^3.8.3",
+    "pickadate": "^3.5.6",
+    "pixrem": "^3.0.0",
+    "postcss-cssnext": "^2.5.1",
+    "prismjs": "^1.4.1"
+  },
+  "engines": {
+    "node": ">0.12"
+  },
+  "browser": {
+    "jquery": "./node_modules/jquery/dist/jquery.js",
+    "jQuery": "./node_modules/jquery/dist/jquery.js",
+    "materialize": "./node_modules/materialize-css/bin/materialize.js"
+  },
+  "browserify-shim": {
+    "jquery": "$",
+    "jQuery": "jQuery",
+    "materialize": "materialize"
+  },
+  "browserify": {
+    "transform": [
+      "browserify-shim"
+    ]
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/wallabag/wallabag"
+  },
+  "contributors": [
+    {
+      "name": "Nicolas Lœuillet",
+      "email": "nicolas@loeuillet.org",
+      "homepage": "http://www.cdetc.fr",
+      "role": "Developer"
+    },
+    {
+      "name": "Thomas Citharel",
+      "homepage": "http://tcit.fr",
+      "role": "Developer"
+    },
+    {
+      "name": "Jérémy Benoist",
+      "homepage": "http://www.j0k3r.net",
+      "role": "Developer"
+    }
+  ],
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/wallabag/wallabag/issues"
+  }
+}

src/Wallabag/CoreBundle/Command/InstallCommand.php

@@ -61,7 +61,6 @@ class InstallCommand extends ContainerAwareCommand
             ->setupDatabase()
             ->setupAdmin()
             ->setupConfig()
-            ->setupAsset()
         ;
 
         $output->writeln('<info>Wallabag has been successfully installed.</info>');
@@ -70,7 +69,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function checkRequirements()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
 
         $fulfilled = true;
 
@@ -120,7 +119,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupDatabase()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 2 of 5.</comment> Setting up database.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 2 of 4.</comment> Setting up database.</info>');
 
         // user want to reset everything? Don't care about what is already here
         if (true === $this->defaultInput->getOption('reset')) {
@@ -191,7 +190,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupAdmin()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 3 of 5.</comment> Administration setup.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
 
         $questionHelper = $this->getHelperSet()->get('question');
         $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -235,7 +234,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupConfig()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> Config setup.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Config setup.</info>');
         $em = $this->getContainer()->get('doctrine.orm.entity_manager');
 
         // cleanup before insert new stuff
@@ -374,20 +373,6 @@ class InstallCommand extends ContainerAwareCommand
         return $this;
     }
 
-    protected function setupAsset()
-    {
-        $this->defaultOutput->writeln('<info><comment>Step 5 of 5.</comment> Installing assets.</info>');
-
-        $this
-            ->runCommand('assets:install')
-            ->runCommand('assetic:dump')
-        ;
-
-        $this->defaultOutput->writeln('');
-
-        return $this;
-    }
-
     /**
      * Run a command.
      *

src/Wallabag/CoreBundle/Controller/EntryController.php

@@ -23,10 +23,16 @@ class EntryController extends Controller
     {
         try {
             $entry = $this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
+
             $em = $this->getDoctrine()->getManager();
             $em->persist($entry);
             $em->flush();
         } catch (\Exception $e) {
+            $this->get('logger')->error('Error while saving an entry', [
+                'exception' => $e,
+                'entry' => $entry,
+            ]);
+
             return false;
         }
 
@@ -60,11 +66,12 @@ class EntryController extends Controller
                 return $this->redirect($this->generateUrl('view', ['id' => $existingEntry->getId()]));
             }
 
-            $this->updateEntry($entry);
-            $this->get('session')->getFlashBag()->add(
-                'notice',
-                'flashes.entry.notice.entry_saved'
-            );
+            $message = 'flashes.entry.notice.entry_saved';
+            if (false === $this->updateEntry($entry)) {
+                $message = 'flashes.entry.notice.entry_saved_failed';
+            }
+
+            $this->get('session')->getFlashBag()->add('notice', $message);
 
             return $this->redirect($this->generateUrl('homepage'));
         }

src/Wallabag/CoreBundle/DataFixtures/ORM/LoadConfigData.php

@@ -6,7 +6,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\TaggingRule;
 
 class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -16,12 +15,6 @@ class LoadConfigData extends AbstractFixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager)
     {
         $adminConfig = new Config($this->getReference('admin-user'));
-        $taggingRule = new TaggingRule();
-
-        $taggingRule->setConfig($adminConfig);
-        $taggingRule->setRule('title matches "wallabag"');
-        $taggingRule->setTags(['wallabag']);
-        $manager->persist($taggingRule);
 
         $adminConfig->setTheme('material');
         $adminConfig->setItemsPerPage(30);

src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTaggingRuleData.php

@@ -28,6 +28,14 @@ class LoadTaggingRuleData extends AbstractFixture implements OrderedFixtureInter
 
         $manager->persist($tr2);
 
+        $tr3 = new TaggingRule();
+
+        $tr3->setRule('title matches "wallabag"');
+        $tr3->setTags(['wallabag']);
+        $tr3->setConfig($this->getReference('admin-config'));
+
+        $manager->persist($tr3);
+
         $manager->flush();
     }
 

src/Wallabag/CoreBundle/Entity/Entry.php

@@ -177,8 +177,16 @@ class Entry
     private $user;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist", "remove"})
-     * @ORM\JoinTable
+     * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist"})
+     * @ORM\JoinTable(
+     *  name="entry_tag",
+     *  joinColumns={
+     *      @ORM\JoinColumn(name="entry_id", referencedColumnName="id")
+     *  },
+     *  inverseJoinColumns={
+     *      @ORM\JoinColumn(name="tag_id", referencedColumnName="id")
+     *  }
+     * )
      *
      * @Groups({"entries_for_user", "export_all"})
      */
@@ -526,13 +534,18 @@ class Entry
             }
         }
 
-        $this->tags[] = $tag;
+        $this->tags->add($tag);
         $tag->addEntry($this);
     }
 
     public function removeTag(Tag $tag)
     {
+        if (!$this->tags->contains($tag)) {
+            return;
+        }
+
         $this->tags->removeElement($tag);
+        $tag->removeEntry($this);
     }
 
     /**

src/Wallabag/CoreBundle/Entity/Tag.php

@@ -98,9 +98,30 @@ class Tag
         return $this->slug;
     }
 
+    /**
+     * @param Entry $entry
+     */
     public function addEntry(Entry $entry)
     {
-        $this->entries[] = $entry;
+        if ($this->entries->contains($entry)) {
+            return;
+        }
+
+        $this->entries->add($entry);
+        $entry->addTag($this);
+    }
+
+    /**
+     * @param Entry $entry
+     */
+    public function removeEntry(Entry $entry)
+    {
+        if (!$this->entries->contains($entry)) {
+            return;
+        }
+
+        $this->entries->removeElement($entry);
+        $entry->removeTag($this);
     }
 
     public function hasEntry($entry)

src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php

@@ -87,6 +87,18 @@ class EntryFilterType extends AbstractType
             ->add('isStarred', CheckboxFilterType::class, [
                 'label' => 'entry.filters.starred_label',
             ])
+            ->add('isUnread', CheckboxFilterType::class, [
+                'label' => 'entry.filters.unread_label',
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    if (false === $values['value']) {
+                        return;
+                    }
+
+                    $expression = $filterQuery->getExpr()->eq('e.isArchived', 'false');
+
+                    return $filterQuery->createCondition($expression);
+                },
+            ])
             ->add('previewPicture', CheckboxFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     if (false === $values['value']) {

src/Wallabag/CoreBundle/Resources/public/themes/_global/js/jquery.cookie.js

@@ -1,117 +0,0 @@
-/*!
- * jQuery Cookie Plugin v1.4.0
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		// AMD. Register as anonymous module.
-		define(['jquery'], factory);
-	} else {
-		// Browser globals.
-		factory(jQuery);
-	}
-}(function ($) {
-
-	var pluses = /\+/g;
-
-	function encode(s) {
-		return config.raw ? s : encodeURIComponent(s);
-	}
-
-	function decode(s) {
-		return config.raw ? s : decodeURIComponent(s);
-	}
-
-	function stringifyCookieValue(value) {
-		return encode(config.json ? JSON.stringify(value) : String(value));
-	}
-
-	function parseCookieValue(s) {
-		if (s.indexOf('"') === 0) {
-			// This is a quoted cookie as according to RFC2068, unescape...
-			s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-		}
-
-		try {
-			// Replace server-side written pluses with spaces.
-			// If we can't decode the cookie, ignore it, it's unusable.
-			s = decodeURIComponent(s.replace(pluses, ' '));
-		} catch(e) {
-			return;
-		}
-
-		try {
-			// If we can't parse the cookie, ignore it, it's unusable.
-			return config.json ? JSON.parse(s) : s;
-		} catch(e) {}
-	}
-
-	function read(s, converter) {
-		var value = config.raw ? s : parseCookieValue(s);
-		return $.isFunction(converter) ? converter(value) : value;
-	}
-
-	var config = $.cookie = function (key, value, options) {
-
-		// Write
-		if (value !== undefined && !$.isFunction(value)) {
-			options = $.extend({}, config.defaults, options);
-
-			if (typeof options.expires === 'number') {
-				var days = options.expires, t = options.expires = new Date();
-				t.setDate(t.getDate() + days);
-			}
-
-			return (document.cookie = [
-				encode(key), '=', stringifyCookieValue(value),
-				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-				options.path    ? '; path=' + options.path : '',
-				options.domain  ? '; domain=' + options.domain : '',
-				options.secure  ? '; secure' : ''
-			].join(''));
-		}
-
-		// Read
-
-		var result = key ? undefined : {};
-
-		// To prevent the for loop in the first place assign an empty array
-		// in case there are no cookies at all. Also prevents odd result when
-		// calling $.cookie().
-		var cookies = document.cookie ? document.cookie.split('; ') : [];
-
-		for (var i = 0, l = cookies.length; i < l; i++) {
-			var parts = cookies[i].split('=');
-			var name = decode(parts.shift());
-			var cookie = parts.join('=');
-
-			if (key && key === name) {
-				// If second argument (value) is a function it's a converter...
-				result = read(cookie, value);
-				break;
-			}
-
-			// Prevent storing a cookie that we couldn't decode.
-			if (!key && (cookie = read(cookie)) !== undefined) {
-				result[name] = cookie;
-			}
-		}
-
-		return result;
-	};
-
-	config.defaults = {};
-
-	$.removeCookie = function (key, options) {
-		if ($.cookie(key) !== undefined) {
-			// Must not alter options, thus extending a fresh object...
-			$.cookie(key, '', $.extend({}, options, { expires: -1 }));
-			return true;
-		}
-		return false;
-	};
-
-}));

src/Wallabag/CoreBundle/Resources/public/themes/_global/js/restoreScroll.js

@@ -1,25 +0,0 @@
-function supportsLocalStorage() {
-    try {
-        return 'localStorage' in window && window['localStorage'] !== null;
-    } catch (e) {
-        return false;
-    }
-}
-
-function savePercent(id, percent) {
-    if (!supportsLocalStorage()) { return false; }
-    localStorage["poche.article." + id + ".percent"] = percent;
-    return true;
-}
-
-function retrievePercent(id) {
-    if (!supportsLocalStorage()) { return false; }
-
-    var bheight = $(document).height();
-    var percent = localStorage["poche.article." + id + ".percent"];
-    var scroll = bheight * percent;
-
-    $('html,body').animate({scrollTop: scroll}, 'fast');
-
-    return true;
-}

src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/font.css

@@ -1,6 +0,0 @@
-@font-face {
-  font-family: 'PT Sans';
-  font-style: normal;
-  font-weight: 700;
-  src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
-}

src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/messages.css

@@ -1,19 +0,0 @@
-.messages.error.install {
-    border: 1px solid #c42608;
-    color: #c00 !important;
-    background: #fff0ef;
-    text-align: left;
-}
-
-.messages.notice.install {
-    border: 1px solid #ebcd41;
-    color: #000;
-    background: #fffcd3;
-    text-align: left;
-}
-
-.messages.success.install {
-    border: 1px solid #6dc70c;
-    background: #e0fbcc !important;
-    text-align: left;
-}

src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/print.css

@@ -1,62 +0,0 @@
-/* ### 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,
-.entrie + .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%;
-}

src/Wallabag/CoreBundle/Resources/public/themes/baggy/fonts/icomoon.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="icomoon" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" d="" horiz-adv-x="512" />
-<glyph unicode="&#xe600;" d="M512 778.666c-188.544 0-341.334-152.832-341.334-341.332s152.788-341.334 341.334-341.334 341.334 152.832 341.334 341.334-152.788 341.332-341.334 341.332zM670.164 339.498c16.682-16.682 16.682-43.648 0-60.332-8.32-8.32-19.244-12.5-30.164-12.5s-21.846 4.182-30.164 12.5l-97.836 97.836-97.834-97.836c-8.32-8.32-19.242-12.5-30.166-12.5s-21.846 4.182-30.166 12.5c-16.682 16.682-16.682 43.648 0 60.332l97.834 97.836-97.834 97.834c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0l97.834-97.834 97.836 97.834c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332l-97.836-97.834 97.836-97.836z" />
-<glyph unicode="&#xe601;" d="M490.666 146.218c-74.070 0-143.7 28.842-196.096 81.196-52.352 52.394-81.236 122.028-81.236 196.14s28.884 143.744 81.236 196.14c16.682 16.682 43.648 16.682 60.332 0s16.682-43.648 0-60.332c-36.266-36.308-56.236-84.522-56.236-135.808s19.968-99.542 56.236-135.808c36.266-36.268 84.438-56.192 135.764-56.192s99.498 19.968 135.766 56.192c36.308 36.268 56.236 84.48 56.236 135.808s-19.968 99.542-56.236 135.808c-16.682 16.682-16.682 43.648 0 60.332s43.648 16.682 60.332 0c52.352-52.438 81.236-122.070 81.236-196.14s-28.884-143.744-81.236-196.14c-52.394-52.352-122.028-81.194-196.096-81.194zM490.666 469.334c-23.594 0-42.666 19.116-42.666 42.666v213.334c0 23.552 19.072 42.666 42.668 42.666s42.668-19.116 42.668-42.666v-213.334c0-23.552-19.072-42.666-42.668-42.666z" />
-<glyph unicode="&#xe602;" d="M512 803.328l-273.664-273.664c-33.324-33.322-33.324-87.34 0-120.662s87.338-33.322 120.662 0l67.668 67.67v-308.992c0-47.104 38.188-85.332 85.334-85.332 47.104 0 85.332 38.23 85.332 85.332v308.992l67.668-67.67c16.682-16.682 38.486-25.004 60.332-25.004s43.648 8.32 60.332 25.004c33.322 33.322 33.322 87.34 0 120.662l-273.664 273.664z" />
-<glyph unicode="&#xe603;" d="M887.757 752.282c0 58.88-88.678 65.382-88.678 65.382l-208.333 13.107c0 0-4.454 56.678-46.541 76.39-42.086 19.61-88.371 13.619-121.651 13.312-33.28-0.358-41.114-42.752-41.114-82.79 0-39.987 0.717-86.221 0.717-115.2 0-52.122-22.886-74.189-80.179-74.189h-118.118c-33.024 2.099-58.726-3.277-58.726-30.003 0-26.778 38.861-254.618 92.211-307.2 30.976-30.515 220.416-51.917 260.301-51.917s26.573 117.811 37.683 117.811c11.11 0 23.245-66.509 86.118-82.074 62.771-15.718 146.637-12.8 151.091-57.498 5.786-58.982 11.11-135.27-27.699-140.698l-87.859-3.482c-60.211 4.301-44.032 70.093-17.459 70.093s39.885 0.973 39.885 0.973l3.328 71.987c0 0-137.882 16.282-143.718-76.698-5.376-84.992 9.216-125.082 19.917-133.786 10.701-8.806 29.235-25.805 198.093-25.805 237.926 0 150.733 693.402 150.733 752.282zM790.528 444.416c-9.318-10.035-43.11 16.384-75.366 16.384-32.307 0-67.123-17.101-75.315-5.786-8.192 11.213 7.475 101.888 68.301 101.888s91.802-102.605 82.381-112.486zM297.165 759.501c0 11.725 2.97 152.781 2.97 152.781l-179.456-176.128c0 0 124.006 0 148.378 0 24.371 0.051 28.109 11.725 28.109 23.347z" />
-<glyph unicode="&#xe604;" d="M1024 369.556l-512 397.426-512-397.428v162.038l512 397.426 512-397.428zM896 384v-384h-256v256h-256v-256h-256v384l384 288z" />
-<glyph unicode="&#xe605;" d="M621.254 82.746l320 320c24.994 24.992 24.994 65.516 0 90.51l-320 320c-24.994 24.992-65.516 24.992-90.51 0-24.994-24.994-24.994-65.516 0-90.51l210.746-210.746h-613.49c-35.346 0-64-28.654-64-64s28.654-64 64-64h613.49l-210.746-210.746c-12.496-12.496-18.744-28.876-18.744-45.254s6.248-32.758 18.744-45.254c24.994-24.994 65.516-24.994 90.51 0z" />
-<glyph unicode="&#xe606;" d="M402.746 82.746l-320 320c-24.994 24.992-24.994 65.516 0 90.51l320 320c24.994 24.992 65.516 24.992 90.51 0 24.994-24.994 24.994-65.516 0-90.51l-210.746-210.746h613.49c35.346 0 64-28.654 64-64s-28.654-64-64-64h-613.49l210.746-210.746c12.496-12.496 18.744-28.876 18.744-45.254s-6.248-32.758-18.744-45.254c-24.994-24.994-65.516-24.994-90.51 0z" />
-<glyph unicode="&#xe607;" d="M262.14 960c-113.728-206.032-132.89-520.304 313.86-509.824v253.824l384-384-384-384v248.372c-534.96-13.942-594.572 472.214-313.86 775.628z" />
-<glyph unicode="&#xe800;" d="M0 51.712v526.336q0 183.296 87.040 284.672t265.216 101.376h561.152q-5.12-5.12-53.248-54.272t-102.4-103.424-111.616-111.616-97.28-95.232-43.008-37.888q-15.36 0-15.36 16.384v159.744h-49.152q-60.416 0-96.256-6.144t-64.512-26.624-39.936-58.368-12.288-98.304v-268.288zM68.608-68.096q5.12 5.12 54.272 54.272t102.4 103.424 111.616 112.64 97.28 95.232 41.984 36.864q15.36 0 15.36-16.384v-159.744h49.152q118.784 0 165.888 36.864t46.080 152.576v268.288l229.376 228.352v-526.336q0-183.296-86.016-284.672t-266.24-101.376h-561.152z" horiz-adv-x="982" />
-<glyph unicode="&#xe801;" d="M301.056 208.384q14.336 14.336 34.816 14.336t36.864-14.336q32.768-34.816 0-71.68l-43.008-40.96q-57.344-57.344-135.168-57.344-79.872 0-137.216 57.344t-57.344 135.168q0 79.872 57.344 137.216l151.552 151.552q71.68 69.632 147.456 78.848t131.072-44.032q16.384-16.384 16.384-36.864t-16.384-36.864q-36.864-32.768-71.68 0-51.2 49.152-135.168-34.816l-151.552-149.504q-26.624-26.624-26.624-65.536t26.624-63.488q26.624-26.624 64.512-26.624t64.512 26.624zM761.856 796.16q57.344-57.344 57.344-135.168 0-79.872-57.344-137.216l-161.792-161.792q-75.776-73.728-153.6-73.728-63.488 0-114.688 51.2-14.336 14.336-14.336 34.816t14.336 36.864q14.336 14.336 35.84 14.336t35.84-14.336q51.2-49.152 124.928 24.576l161.792 159.744q28.672 28.672 28.672 65.536 0 38.912-28.672 63.488-24.576 26.624-57.344 31.744t-61.44-21.504l-51.2-51.2q-16.384-14.336-36.864-14.336t-34.816 14.336q-34.816 34.816 0 71.68l51.2 51.2q55.296 55.296 130.048 52.224t132.096-62.464z" horiz-adv-x="820" />
-<glyph unicode="&#xe802;" d="M877.568 192v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 25.6t25.6 11.264h803.84q15.36 0 26.624-11.264t10.24-25.6zM877.568 484.864v-73.728q0-14.336-10.24-25.6t-26.624-10.24h-803.84q-15.36 0-25.6 10.24t-11.264 25.6v73.728q0 14.336 11.264 25.6t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-25.6zM877.568 776.704v-72.704q0-15.36-10.24-25.6t-26.624-11.264h-803.84q-15.36 0-25.6 11.264t-11.264 25.6v72.704q0 15.36 11.264 26.624t25.6 10.24h803.84q15.36 0 26.624-10.24t10.24-26.624z" horiz-adv-x="878" />
-<glyph unicode="&#xe803;" d="M471.040 919.040q194.56 0 332.8-138.24t138.24-332.8-138.24-332.8-332.8-138.24-332.8 138.24-138.24 332.8 138.24 332.8 332.8 138.24zM471.040 79.36q153.6 0 261.12 108.544t107.52 260.096q0 153.6-107.52 261.12t-261.12 107.52q-151.552 0-260.096-107.52t-108.544-261.12q0-151.552 108.544-260.096t260.096-108.544zM507.904 714.24v-249.856l153.6-153.6-51.2-51.2-174.080 174.080v280.576h71.68z" horiz-adv-x="942" />
-<glyph unicode="&#xe804;" d="M254.976 89.6q-34.816 0-57.344 28.672l-184.32 241.664q-16.384 24.576-12.288 53.248t26.624 47.104 52.224 14.336 48.128-28.672l120.832-157.696 303.104 485.376q16.384 24.576 44.032 30.72t54.272-8.192q24.576-16.384 30.72-44.032t-8.192-54.272l-358.4-573.44q-20.48-32.768-57.344-32.768z" horiz-adv-x="684" />
-<glyph unicode="&#xe805;" d="M450.56 898.56l122.88-344.064h327.68l-268.288-200.704 96.256-356.352-278.528 212.992-278.528-212.992 96.256 356.352-268.288 200.704h327.68z" horiz-adv-x="902" />
-<glyph unicode="&#xe806;" d="M921.6 99.84q-88.064 155.648-212.992 201.728t-337.92 46.080v-223.232l-370.688 342.016 370.688 329.728v-196.608q92.16 0 172.032-27.648t134.144-71.68 98.304-97.28 70.656-106.496 45.056-97.28 24.576-70.656z" horiz-adv-x="922" />
-<glyph unicode="&#xe807;" d="M942.080 740.864q-36.864-55.296-96.256-100.352v-24.576q0-133.12-61.44-256t-190.464-207.872-296.96-84.992q-163.84 0-296.96 86.016 14.336-2.048 47.104-2.048 135.168 0 239.616 81.92-63.488 2.048-112.64 38.912t-67.584 96.256q10.24-4.096 34.816-4.096 26.624 0 51.2 6.144-67.584 14.336-110.592 67.584t-43.008 122.88v2.048q36.864-20.48 86.016-24.576-86.016 59.392-86.016 161.792 0 49.152 26.624 96.256 157.696-192.512 399.36-200.704-6.144 18.432-6.144 43.008 0 79.872 56.32 136.192t138.24 56.32q83.968 0 139.264-59.392 61.44 12.288 122.88 45.056-20.48-67.584-83.968-106.496 57.344 8.192 110.592 30.72z" horiz-adv-x="942" />
-<glyph unicode="&#xe808;" d="M219.136 192q0-46.080-31.744-77.824t-77.824-31.744-77.824 31.744-31.744 77.824 31.744 77.824 77.824 31.744 77.824-31.744 31.744-77.824zM512 121.344q1.024-15.36-9.216-26.624-11.264-12.288-27.648-12.288h-76.8q-14.336 0-24.576 9.216t-11.264 23.552q-12.288 131.072-105.472 224.256t-224.256 105.472q-14.336 1.024-23.552 11.264t-9.216 24.576v76.8q0 16.384 12.288 26.624 9.216 10.24 24.576 10.24h3.072q91.136-7.168 174.080-46.080t148.48-103.424q64.512-64.512 103.424-148.48t46.080-175.104zM804.864 120.32q1.024-15.36-10.24-26.624-10.24-11.264-26.624-11.264h-81.92q-14.336 0-25.6 10.24t-11.264 23.552q-6.144 122.88-57.344 233.472t-132.096 192.512-192.512 132.096-232.448 58.368q-14.336 0-24.576 11.264t-10.24 24.576v81.92q0 15.36 11.264 26.624 10.24 10.24 25.6 10.24h1.024q150.528-8.192 286.72-68.608t243.712-167.936q106.496-106.496 167.936-243.712t68.608-286.72z" horiz-adv-x="804" />
-<glyph unicode="&#xe809;" d="M0 628.224l151.552 151.552 360.448-359.424 360.448 359.424 151.552-151.552-512-512-151.552 151.552z" />
-<glyph unicode="&#xe80a;" d="M951.296 100.864v438.272q-18.432-20.48-39.936-37.888-152.576-116.736-243.712-192.512-28.672-24.576-47.104-38.912t-49.152-27.648-58.368-13.312h-2.048q-26.624 0-58.368 13.312t-49.152 27.648-47.104 38.912q-90.112 75.776-243.712 192.512-21.504 17.408-39.936 37.888v-438.272q0-8.192 6.144-13.312t12.288-5.12h841.728q7.168 0 12.288 5.12t6.144 13.312zM951.296 700.928v14.336t-1.024 7.168-1.024 7.168-3.072 5.12-5.12 4.096-8.192 2.048h-841.728q-7.168 0-12.288-6.144t-6.144-12.288q0-96.256 83.968-162.816 110.592-87.040 229.376-181.248 4.096-2.048 20.48-16.384t25.6-21.504 25.6-18.432 28.672-15.36 24.576-5.12h2.048q11.264 0 24.576 5.12t28.672 15.36 25.6 18.432 25.6 21.504 20.48 16.384q118.784 94.208 229.376 181.248 30.72 24.576 57.344 66.56t26.624 74.752zM1024 722.432v-621.568q0-37.888-26.624-64.512t-64.512-27.648h-841.728q-36.864 0-64.512 27.648t-26.624 64.512v621.568q0 37.888 26.624 64.512t64.512 26.624h841.728q37.888 0 64.512-26.624t26.624-64.512z" />
-<glyph unicode="&#xe80b;" d="M0 267.776l512 512 512-512-151.552-151.552-360.448 359.424-360.448-359.424z" />
-<glyph unicode="&#xe80c;" d="M51.2 558.592q124.928-71.68 337.92-71.68t337.92 71.68l-55.296-497.664q-2.048-14.336-35.84-36.864t-102.4-44.032-144.384-21.504-143.36 21.504-102.4 44.032-36.864 36.864zM550.912 865.792q96.256-18.432 161.792-56.32t65.536-72.704v-10.24q0-59.392-114.688-101.376t-274.432-41.984-274.432 41.984-114.688 101.376v10.24q0 34.816 65.536 72.704t161.792 56.32l43.008 49.152q22.528 26.624 71.68 26.624h94.208q53.248 0 71.68-26.624zM495.616 751.104h86.016q-94.208 112.64-106.496 129.024-14.336 16.384-32.768 16.384h-104.448q-22.528 0-32.768-16.384l-108.544-129.024h86.016l65.536 67.584h83.968z" horiz-adv-x="778" />
-<glyph unicode="&#xe80d;" d="M256 896h512v-128h-512zM960 704h-896c-35.2 0-64-28.8-64-64v-320c0-35.2 28.796-64 64-64h192v-256h512v256h192c35.2 0 64 28.8 64 64v320c0 35.2-28.8 64-64 64zM704 64h-384v320h384v-320zM974.4 608c0-25.626-20.774-46.4-46.398-46.4-25.626 0-46.402 20.774-46.402 46.4s20.776 46.4 46.402 46.4c25.626 0 46.398-20.774 46.398-46.4z" />
-<glyph unicode="&#xe904;" d="M896 704v128h-896v-704c0-35.346 28.654-64 64-64h864c53.022 0 96 42.978 96 96v544h-128zM832 128h-768v640h768v-640zM128 640h640v-64h-640zM512 512h256v-64h-256zM512 384h256v-64h-256zM512 256h192v-64h-192zM128 512h320v-320h-320z" />
-<glyph unicode="&#xe90d;" d="M959.884 832c0.040-0.034 0.082-0.076 0.116-0.116v-767.77c-0.034-0.040-0.076-0.082-0.116-0.116h-895.77c-0.040 0.034-0.082 0.076-0.114 0.116v767.772c0.034 0.040 0.076 0.082 0.114 0.114h895.77zM960 896h-896c-35.2 0-64-28.8-64-64v-768c0-35.2 28.8-64 64-64h896c35.2 0 64 28.8 64 64v768c0 35.2-28.8 64-64 64v0zM832 672c0-53.020-42.98-96-96-96s-96 42.98-96 96 42.98 96 96 96 96-42.98 96-96zM896 128h-768v128l224 384 256-320h64l224 192z" />
-<glyph unicode="&#xe911;" d="M960 960h64v-736c0-88.366-100.29-160-224-160s-224 71.634-224 160c0 88.368 100.29 160 224 160 62.684 0 119.342-18.4 160-48.040v368.040l-512-113.778v-494.222c0-88.366-100.288-160-224-160s-224 71.634-224 160c0 88.368 100.288 160 224 160 62.684 0 119.342-18.4 160-48.040v624.040l576 128z" />
-<glyph unicode="&#xe913;" d="M0 832v-768h1024v768h-1024zM192 128h-128v128h128v-128zM192 384h-128v128h128v-128zM192 640h-128v128h128v-128zM768 128h-512v640h512v-640zM960 128h-128v128h128v-128zM960 384h-128v128h128v-128zM960 640h-128v128h128v-128zM384 640v-384l256 192z" />
-<glyph unicode="&#xe915;" d="M864 768h-512c-88 0-160-72-160-160v-512c0-88 72-160 160-160h512c88 0 160 72 160 160v512c0 88-72 160-160 160zM416 64c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM416 448c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM608 256c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM800 64c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM800 448c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM828.76 832c-14.93 72.804-79.71 128-156.76 128h-512c-88 0-160-72-160-160v-512c0-77.046 55.196-141.83 128-156.76v636.76c0 35.2 28.8 64 64 64h636.76z" />
-<glyph unicode="&#xe936;" d="M1232 960h-384c-26.4 0-63.274-15.274-81.942-33.942l-476.116-476.116c-18.668-18.668-18.668-49.214 0-67.882l412.118-412.118c18.668-18.668 49.214-18.668 67.882 0l476.118 476.118c18.666 18.666 33.94 55.54 33.94 81.94v384c0 26.4-21.6 48-48 48zM992 576c-53.020 0-96 42.98-96 96s42.98 96 96 96 96-42.98 96-96-42.98-96-96-96zM128 416l544 544h-80c-26.4 0-63.274-15.274-81.942-33.942l-476.116-476.116c-18.668-18.668-18.668-49.214 0-67.882l412.118-412.118c18.668-18.668 49.214-18.668 67.882 0l30.058 30.058-416 416z" horiz-adv-x="1280" />
-<glyph unicode="&#xe941;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM320 448c0 106.040 85.96 192 192 192s192-85.96 192-192-85.96-192-192-192-192 85.96-192 192zM925.98 276.524v0l-177.42 73.49c12.518 30.184 19.44 63.276 19.44 97.986s-6.922 67.802-19.44 97.986l177.42 73.49c21.908-52.822 34.020-110.73 34.020-171.476s-12.114-118.654-34.020-171.476v0zM683.478 861.98v0 0l-73.49-177.42c-30.184 12.518-63.276 19.44-97.988 19.44s-67.802-6.922-97.986-19.44l-73.49 177.422c52.822 21.904 110.732 34.018 171.476 34.018 60.746 0 118.654-12.114 171.478-34.020zM98.020 619.476l177.422-73.49c-12.518-30.184-19.442-63.276-19.442-97.986s6.922-67.802 19.44-97.986l-177.42-73.49c-21.906 52.822-34.020 110.73-34.020 171.476s12.114 118.654 34.020 171.476zM340.524 34.020l73.49 177.42c30.184-12.518 63.276-19.44 97.986-19.44s67.802 6.922 97.986 19.44l73.49-177.42c-52.822-21.904-110.73-34.020-171.476-34.020-60.744 0-118.654 12.114-171.476 34.020z" />
-<glyph unicode="&#xe96d;" d="M480 960v0c265.096 0 480-173.914 480-388.448s-214.904-388.448-480-388.448c-25.458 0-50.446 1.62-74.834 4.71-103.106-102.694-222.172-121.108-341.166-123.814v25.134c64.252 31.354 116 88.466 116 153.734 0 9.106-0.712 18.048-2.030 26.794-108.558 71.214-177.97 179.988-177.97 301.89 0 214.534 214.904 388.448 480 388.448zM996 89.314c0-55.942 36.314-104.898 92-131.772v-21.542c-103.126 2.318-197.786 18.102-287.142 106.126-21.14-2.65-42.794-4.040-64.858-4.040-95.47 0-183.408 25.758-253.614 69.040 144.674 0.506 281.26 46.854 384.834 130.672 52.208 42.252 93.394 91.826 122.414 147.348 30.766 58.866 46.366 121.582 46.366 186.406 0 10.448-0.45 20.836-1.258 31.168 72.57-59.934 117.258-141.622 117.258-231.676 0-104.488-60.158-197.722-154.24-258.764-1.142-7.496-1.76-15.16-1.76-22.966z" horiz-adv-x="1152" />
-<glyph unicode="&#xe994;" d="M933.79 349.75c-53.726 93.054-21.416 212.304 72.152 266.488l-100.626 174.292c-28.75-16.854-62.176-26.518-97.846-26.518-107.536 0-194.708 87.746-194.708 195.99h-201.258c0.266-33.41-8.074-67.282-25.958-98.252-53.724-93.056-173.156-124.702-266.862-70.758l-100.624-174.292c28.97-16.472 54.050-40.588 71.886-71.478 53.638-92.908 21.512-211.92-71.708-266.224l100.626-174.292c28.65 16.696 61.916 26.254 97.4 26.254 107.196 0 194.144-87.192 194.7-194.958h201.254c-0.086 33.074 8.272 66.57 25.966 97.218 53.636 92.906 172.776 124.594 266.414 71.012l100.626 174.29c-28.78 16.466-53.692 40.498-71.434 71.228zM512 240.668c-114.508 0-207.336 92.824-207.336 207.334 0 114.508 92.826 207.334 207.336 207.334 114.508 0 207.332-92.826 207.332-207.334-0.002-114.51-92.824-207.334-207.332-207.334z" />
-<glyph unicode="&#xe9ca;" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512-0.002c-62.958 0-122.872 13.012-177.23 36.452l233.148 262.29c5.206 5.858 8.082 13.422 8.082 21.26v96c0 17.674-14.326 32-32 32-112.99 0-232.204 117.462-233.374 118.626-6 6.002-14.14 9.374-22.626 9.374h-128c-17.672 0-32-14.328-32-32v-192c0-12.122 6.848-23.202 17.69-28.622l110.31-55.156v-187.886c-116.052 80.956-192 215.432-192 367.664 0 68.714 15.49 133.806 43.138 192h116.862c8.488 0 16.626 3.372 22.628 9.372l128 128c6 6.002 9.372 14.14 9.372 22.628v77.412c40.562 12.074 83.518 18.588 128 18.588 70.406 0 137.004-16.26 196.282-45.2-4.144-3.502-8.176-7.164-12.046-11.036-36.266-36.264-56.236-84.478-56.236-135.764s19.97-99.5 56.236-135.764c36.434-36.432 85.218-56.264 135.634-56.26 3.166 0 6.342 0.080 9.518 0.236 13.814-51.802 38.752-186.656-8.404-372.334-0.444-1.744-0.696-3.488-0.842-5.224-81.324-83.080-194.7-134.656-320.142-134.656z" />
-<glyph unicode="&#xea2e;" d="M889.68 793.68c-93.608 102.216-228.154 166.32-377.68 166.32-282.77 0-512-229.23-512-512h96c0 229.75 186.25 416 416 416 123.020 0 233.542-53.418 309.696-138.306l-149.696-149.694h352v352l-134.32-134.32zM928 448c0-229.75-186.25-416-416-416-123.020 0-233.542 53.418-309.694 138.306l149.694 149.694h-352v-352l134.32 134.32c93.608-102.216 228.154-166.32 377.68-166.32 282.77 0 512 229.23 512 512h-96z" />
-</font></defs></svg>

src/Wallabag/CoreBundle/Resources/public/themes/baggy/img/logo.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="64" height="64">
-    <circle cx="32" cy="32" r="29.5" style="fill:#000" />
-    <path d="m 16,18 33,0 0,26 -16.5,6 -16.5,-6 z" fill="#fff" />
-    <rect width="9" height="2.5" x="17.5" y="24.5" fill="#000" />
-    <rect width="9" height="2.5" x="28" y="24.5" fill="#000" />
-    <rect width="9" height="2.5" x="38.5" y="24.5" fill="#000" />
-</svg>

src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/restoreScroll.js

@@ -1,25 +0,0 @@
-function supportsLocalStorage() {
-    try {
-        return 'localStorage' in window && window['localStorage'] !== null;
-    } catch (e) {
-        return false;
-    }
-}
-
-function savePercent(id, percent) {
-    if (!supportsLocalStorage()) { return false; }
-    localStorage["poche.article." + id + ".percent"] = percent;
-    return true;
-}
-
-function retrievePercent(id) {
-    if (!supportsLocalStorage()) { return false; }
-
-    var bheight = $(document).height();
-    var percent = localStorage["poche.article." + id + ".percent"];
-    var scroll = bheight * percent;
-
-    $('html,body').animate({scrollTop: scroll}, 'fast');
-
-    return true;
-}

src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css

@@ -1,538 +0,0 @@
-/* ==========================================================================
-   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('../font/icomoon/icomoon.eot?yw303w');
-    src:url('../font/icomoon/icomoon.eot?yw303w#iefix') format('embedded-opentype'),
-        url('../font/icomoon/icomoon.ttf?yw303w') format('truetype'),
-        url('../font/icomoon/icomoon.woff?yw303w') format('woff'),
-        url('../font/icomoon/icomoon.svg?yw303w#icomoon') format('svg');
-    font-weight: normal;
-    font-style: normal;
-}
-
-[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: 0px 10px;
-    height: 30px;
-    display: block;
-}
-
-.pagination li.active span {
-    padding: 0px 10px;
-    height: 30px;
-    display: block;
-    color: #fff;
-}
-
-.pagination .disabled {
-    margin-right: 10px;
-    margin-left: 10px;
-}
-
-.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: 0px 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 .mdi-content-add,
-.nav-panel-search .mdi-action-search,
-.nav-panels .mdi-navigation-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 .mdi-navigation-close {
-    position: absolute;
-    top: 0;
-    right: 1rem;
-    color: transparent;
-    cursor: pointer;
-    font-size: 2rem;
-    transition: .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;
-}
-
-.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: 0px;
-}
-
-.side-nav a {
-    margin: 0px 1rem;
-}
-
-/* ==========================================================================
- * 3 = Filters slider
- * ========================================================================== */
-
-#filters button {
-    padding: 0px;
-    width: 100%;
-}
-
-.side-nav.fixed.right-aligned {
-    right: -250px;
-    left: auto !important;
-    overflow-y: visible;
-}
-
-#filters div.with-checkbox {
-    height: 3rem;
-    margin-top: 0px;
-}
-
-/* ==========================================================================
-   4 = Cards
-   ========================================================================== */
-
-main #content {
-    padding: 0px 0.5rem;
-}
-
-main ul.row {
-    padding: 0px 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: #ffffff;
-    margin: 0;
-}
-
-.card .card-action a:hover {
-    color: #ffffff;
-}
-
-.settings .div_tabs {
-    padding-bottom: 15px;
-}
-
-.card.sw {
-    max-width: 370px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-.mdi-card-close:before {
-    content: "\e8aa";
-}
-
-.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: 0px 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:0px;
-    width: 100%;
-    height: 3px;
-    margin: 0;
-    z-index: 9999;
-}
-
-#article aside .link {
-    color: #000;
-    font-size: 0.6em;
-    text-decoration: none;
-}
-
-#article aside #list {
-    float: right;
-    margin-right: 15px;
-}
-
-#article aside .chip {
-    background-color: #039be5;
-    color: #ffffff;
-}
-
-#article aside .chip i {
-    color: #ffffff;
-}
-
-/* ==========================================================================
-   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: "\e800";
-}
-.icon-facebook2:before {
-    content: "\e801";
-}
-.icon-twitter:before {
-    content: "\e802";
-}
-.icon-apple:before {
-    content: "\e803";
-}
-.icon-android:before {
-    content: "\e804";
-}
-.icon-chrome:before {
-    content: "\e805";
-}
-.icon-firefox:before {
-    content: "\e806";
-}
-
-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;
-}

src/Wallabag/CoreBundle/Resources/public/themes/material/css/print.css

@@ -1,62 +0,0 @@
-/* ### 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%;
-}

src/Wallabag/CoreBundle/Resources/public/themes/material/font/icomoon/icomoon.svg

@@ -1,17 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Generated by IcoMoon</metadata>
-<defs>
-<font id="icomoon" horiz-adv-x="1024">
-<font-face units-per-em="1024" ascent="960" descent="-64" />
-<missing-glyph horiz-adv-x="1024" />
-<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
-<glyph unicode="&#xe800;" glyph-name="google-plus2" d="M0.806 90.336c-0.244 2.532-0.452 5.070-0.584 7.63 0.13-2.56 0.34-5.098 0.584-7.63zM235.908 394.852c92.010-2.738 153.734 92.698 137.862 213.198-15.894 120.48-103.396 217.168-195.408 219.922-92.026 2.73-153.74-89.482-137.852-210 15.882-120.468 103.352-220.374 195.398-223.12zM1024 704v85.31c0 93.88-76.782 170.69-170.658 170.69h-682.656c-92.276 0-168.012-74.232-170.564-165.926 58.362 51.386 139.324 94.316 222.874 94.316 89.304 0 357.244 0 357.244 0l-79.948-67.618h-113.268c75.13-28.804 115.156-116.124 115.156-205.722 0-75.248-41.81-139.954-100.888-185.968-57.644-44.902-68.572-63.708-68.572-101.878 0-32.578 61.746-88 94.032-110.788 94.382-66.538 124.916-128.312 124.916-231.456 0-16.428-2.042-32.83-6.066-48.96h307.742c93.874 0 170.656 76.75 170.656 170.69v533.308h-192v-191.998h-64v192h-191.998v64h191.998v192h64v-192h192zM185.886 194.064c21.614 0 41.422 0.59 61.936 0.59-27.146 26.334-48.626 58.6-48.626 98.38 0 23.608 7.564 46.336 18.134 66.52-10.782-0.77-21.79-0.994-33.126-0.994-74.356 0-137.506 24.076-184.204 63.854v-67.242l0.006-201.73c53.44 25.374 116.888 40.622 185.88 40.622zM3.42 72.742c-1.112 5.458-1.966 11.006-2.542 16.634 0.574-5.628 1.43-11.176 2.542-16.634zM455.45 7.154c-15.058 58.806-68.454 87.964-142.888 139.568-27.072 8.732-56.894 13.874-88.894 14.208-89.618 0.964-173.108-34.942-220.216-88.372 15.92-77.706 85.034-136.558 167.234-136.558h286.444c1.816 11.128 2.696 22.632 2.696 34.432 0 12.534-1.534 24.792-4.376 36.722z" />
-<glyph unicode="&#xe801;" glyph-name="facebook2" d="M853.35 960h-682.702c-94.25 0-170.648-76.42-170.648-170.686v-682.63c0-94.266 76.398-170.684 170.648-170.684h341.352v448h-128v128h128v96c0 88.366 71.634 160 160 160h160v-128h-160c-17.674 0-32-14.328-32-32v-96h176l-32-128h-144v-448h213.35c94.25 0 170.65 76.418 170.65 170.684v682.63c0 94.266-76.4 170.686-170.65 170.686z" />
-<glyph unicode="&#xe802;" glyph-name="twitter" d="M1024 765.582c-37.676-16.708-78.164-28.002-120.66-33.080 43.372 26 76.686 67.17 92.372 116.23-40.596-24.078-85.556-41.56-133.41-50.98-38.32 40.83-92.922 66.34-153.346 66.34-116.022 0-210.088-94.058-210.088-210.078 0-16.466 1.858-32.5 5.44-47.878-174.6 8.764-329.402 92.4-433.018 219.506-18.084-31.028-28.446-67.116-28.446-105.618 0-72.888 37.088-137.192 93.46-174.866-34.438 1.092-66.832 10.542-95.154 26.278-0.020-0.876-0.020-1.756-0.020-2.642 0-101.788 72.418-186.696 168.522-206-17.626-4.8-36.188-7.372-55.348-7.372-13.538 0-26.698 1.32-39.528 3.772 26.736-83.46 104.32-144.206 196.252-145.896-71.9-56.35-162.486-89.934-260.916-89.934-16.958 0-33.68 0.994-50.116 2.94 92.972-59.61 203.402-94.394 322.042-94.394 386.422 0 597.736 320.124 597.736 597.744 0 9.108-0.206 18.168-0.61 27.18 41.056 29.62 76.672 66.62 104.836 108.748z" />
-<glyph unicode="&#xe803;" glyph-name="apple" d="M791.498 415.908c-1.294 129.682 105.758 191.876 110.542 194.966-60.152 88.020-153.85 100.078-187.242 101.472-79.742 8.074-155.596-46.948-196.066-46.948-40.368 0-102.818 45.754-168.952 44.552-86.916-1.292-167.058-50.538-211.812-128.38-90.304-156.698-23.126-388.84 64.89-515.926 43.008-62.204 94.292-132.076 161.626-129.58 64.842 2.588 89.362 41.958 167.756 41.958s100.428-41.958 169.050-40.67c69.774 1.296 113.982 63.398 156.692 125.796 49.39 72.168 69.726 142.038 70.924 145.626-1.548 0.706-136.060 52.236-137.408 207.134zM662.562 796.478c35.738 43.358 59.86 103.512 53.28 163.522-51.478-2.096-113.878-34.29-150.81-77.55-33.142-38.376-62.148-99.626-54.374-158.436 57.466-4.484 116.128 29.204 151.904 72.464z" />
-<glyph unicode="&#xe804;" glyph-name="android" d="M896 576c-35.2 0-64-28.8-64-64v-256c0-35.2 28.8-64 64-64s64 28.8 64 64v256c0 35.2-28.8 64-64 64zM128 576c-35.2 0-64-28.8-64-64v-256c0-35.2 28.8-64 64-64s64 28.8 64 64v256c0 35.2-28.802 64-64 64zM224 224c0-53.020 42.98-96 96-96v0-128c0-35.2 28.8-64 64-64s64 28.8 64 64v128h128v-128c0-35.2 28.8-64 64-64s64 28.8 64 64v128c53.020 0 96 42.98 96 96v352h-576v-352zM798.216 639.998c-9.716 87.884-59.004 163.792-129.62 209.646l32.024 64.046c7.904 15.806 1.496 35.028-14.31 42.932s-35.030 1.496-42.932-14.312l-32.142-64.286-8.35 3.316c-28.568 9.502-59.122 14.66-90.886 14.66-31.762 0-62.316-5.158-90.888-14.656l-8.348-3.316-32.142 64.282c-7.904 15.808-27.128 22.212-42.932 14.312-15.808-7.904-22.214-27.126-14.312-42.932l32.022-64.046c-70.616-45.852-119.904-121.762-129.622-209.644v-32h574.222v31.998h-1.784zM416 704c-17.674 0-32 14.328-32 32 0 17.648 14.288 31.958 31.93 31.996 0.032 0 0.062-0.002 0.094-0.002 0.018 0 0.036 0.002 0.052 0.002 17.638-0.042 31.924-14.35 31.924-31.996 0-17.672-14.326-32-32-32zM608 704c-17.674 0-32 14.328-32 32 0 17.646 14.286 31.954 31.924 31.996 0.016 0 0.034-0.002 0.050-0.002 0.032 0 0.064 0.002 0.096 0.002 17.64-0.038 31.93-14.348 31.93-31.996 0-17.672-14.326-32-32-32z" />
-<glyph unicode="&#xe805;" glyph-name="chrome" d="M258.278 513.458l-146.532 253.802c93.818 117.464 238.234 192.74 400.254 192.74 187.432 0 351.31-100.736 440.532-251h-417.77c-7.504 0.65-15.092 1-22.762 1-121.874 0-224.578-83.644-253.722-196.542zM695.306 635h293.46c22.74-57.93 35.234-121.004 35.234-187 0-280.826-226.1-508.804-506.186-511.926l209.394 362.678c29.48 42.378 46.792 93.826 46.792 149.248 0 73.17-30.164 139.42-78.694 187zM326 448c0 102.56 83.44 186 186 186s186-83.44 186-186c0-102.56-83.44-186-186-186s-186 83.44-186 186zM582.182 195.558l-146.578-253.878c-246.532 36.884-435.604 249.516-435.604 506.32 0 91.218 23.884 176.846 65.696 251.024l209.030-362.054c41.868-89.112 132.476-150.97 237.274-150.97 24.3 0 47.836 3.34 70.182 9.558z" />
-<glyph unicode="&#xe806;" glyph-name="firefox" d="M1022.526 625.86l-11.86-76.080c0 0-16.954 140.856-37.732 193.514-31.846 80.688-46.014 80.040-46.108 79.922 21.33-54.204 17.462-83.324 17.462-83.324s-37.792 102.998-137.712 135.768c-110.686 36.282-170.57 26.364-177.488 24.486-1.050 0.008-2.064 0.010-3.030 0.010 0.818-0.062 1.612-0.146 2.426-0.212-0.034-0.020-0.090-0.042-0.082-0.052 0.45-0.548 122.306-21.302 143.916-50.996 0 0-51.76 0-103.272-14.842-2.328-0.666 189.524-23.964 228.746-215.674 0 0-21.030 43.876-47.040 51.328 17.106-52.036 12.714-150.776-3.576-199.85-2.096-6.312-4.24 27.282-36.328 41.75 10.28-73.646-0.616-190.456-51.708-222.632-3.982-2.504 32.030 115.31 7.242 69.762-142.708-218.802-311.404-100.972-387.248-49.11 38.866-8.462 112.654 1.318 145.314 25.612 0.042 0.030 0.078 0.056 0.118 0.086 35.468 24.252 56.472 41.964 75.334 37.772 18.874-4.214 31.438 14.726 16.78 31.53-14.676 16.838-50.314 39.978-98.524 27.366-34-8.904-76.134-46.522-140.448-8.432-49.364 29.25-54.012 53.546-54.45 70.376 1.218 5.966 2.754 11.536 4.576 16.624 5.682 15.87 22.912 20.658 32.494 24.438 16.256-2.792 30.262-7.862 44.968-15.406 0.19 4.894 0.252 11.39-0.018 18.76 1.41 2.802 0.538 11.252-1.722 21.58-1.302 10.308-3.42 20.974-6.752 30.692 0.012 0.002 0.020 0.010 0.030 0.014 0.056 0.018 0.108 0.040 0.156 0.070 0.078 0.044 0.146 0.112 0.208 0.19 0.012 0.020 0.030 0.034 0.044 0.052 0.082 0.124 0.154 0.272 0.198 0.466 1.020 4.618 12.022 13.524 25.718 23.1 12.272 8.58 26.702 17.696 38.068 24.752 10.060 6.248 17.72 10.882 19.346 12.098 0.618 0.466 1.358 1.012 2.164 1.636 0.15 0.116 0.3 0.232 0.454 0.354 0.094 0.074 0.19 0.148 0.286 0.226 5.41 4.308 13.484 12.448 15.178 29.578 0.004 0.042 0.010 0.080 0.012 0.122 0.050 0.504 0.092 1.014 0.13 1.534 0.028 0.362 0.050 0.726 0.072 1.096 0.014 0.284 0.032 0.566 0.044 0.856 0.030 0.674 0.050 1.364 0.060 2.064 0 0.040 0.002 0.076 0.004 0.116 0.022 1.658-0.006 3.386-0.104 5.202-0.054 1.014-0.126 1.93-0.298 2.762-0.008 0.044-0.018 0.092-0.028 0.136-0.018 0.082-0.036 0.164-0.058 0.244-0.036 0.146-0.076 0.292-0.122 0.43-0.006 0.018-0.010 0.032-0.016 0.046-0.052 0.16-0.112 0.314-0.174 0.464-0.004 0.006-0.004 0.010-0.006 0.016-1.754 4.108-8.32 5.658-35.442 6.118-0.026 0.002-0.050 0.002-0.076 0.002v0c-11.066 0.188-25.538 0.194-44.502 0.118-33.25-0.134-51.628 32.504-57.494 45.132 8.040 44.46 31.276 76.142 69.45 97.626 0.722 0.406 0.58 0.742-0.274 0.978 7.464 4.514-90.246 0.124-135.186-57.036-39.888 9.914-74.654 9.246-104.616 2.214-5.754 0.162-12.924 0.88-21.434 2.652-19.924 18.056-48.448 51.402-49.976 91.208 0 0-0.092-0.072-0.252-0.204-0.020 0.382-0.056 0.76-0.072 1.142 0 0-60.716-46.664-51.628-173.882-0.022-2.036-0.064-3.986-0.12-5.874-16.432-22.288-24.586-41.020-25.192-45.156-14.56-29.644-29.334-74.254-41.356-141.98 0 0 8.408 26.666 25.284 56.866-12.412-38.022-22.164-97.156-16.436-185.856 0 0 1.514 19.666 6.874 47.994 4.186-55.010 22.518-122.924 68.858-202.788 88.948-153.32 225.67-230.74 376.792-242.616 26.836-2.212 54.050-2.264 81.424-0.186 2.516 0.178 5.032 0.364 7.55 0.574 30.964 2.174 62.134 6.852 93.238 14.366 425.172 102.798 378.942 616.198 378.942 616.198z" />
-</font></defs></svg>