Merge pull request #2353 from wallabag/assets-fix

Basically, fix everything

7 files changed, 96 insertions, 11 deletions

diff --git a/app/Resources/static/themes/_global/img/icons/shaarli.png b/app/Resources/static/themes/_global/img/icons/shaarli.png
new file mode 100644
index 00000000..0e83c46e
--- /dev/null
+++ b/app/Resources/static/themes/_global/img/icons/shaarli.png
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index eeedd277..99ea6c6b 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -796,6 +796,15 @@ a.add-to-wallabag-link-after::after {
   text-transform: none;
   line-height: 1;
 
+  /* Enable Ligatures ================ */
+  letter-spacing: 0;
+  -webkit-font-feature-settings: "liga";
+  -moz-font-feature-settings: "liga=1";
+  -moz-font-feature-settings: "liga";
+  -ms-font-feature-settings: "liga" 1;
+  -o-font-feature-settings: "liga";
+  font-feature-settings: "liga";
+
   /* Better Font Rendering =========== */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -838,7 +847,7 @@ a.add-to-wallabag-link-after::after {
 }
 
 .icon-twitter::before {
-  content: "\ea91";
+  content: "\ea96";
 }
 
 .icon-down-open::before {
@@ -877,6 +886,22 @@ a.add-to-wallabag-link-after::after {
   content: "\e936";
 }
 
+.icon-eye::before {
+  content: "\e9ce";
+}
+
+.icon-no-eye::before {
+  content: "\e9d1";
+}
+
+.icon-calendar::before {
+  content: "\e953";
+}
+
+.icon-time::before {
+  content: "\e952";
+}
+
 /* .icon-image class, for image-based icons
   ========================================================================== */
 
@@ -898,6 +923,11 @@ a.add-to-wallabag-link-after::after {
   background-image: url("../../_global/img/icons/diaspora-icon--black.png");
 }
 
+/* shaarli */
+.icon-image--shaarli {
+  background-image: url("../../_global/img/icons/shaarli.png");
+}
+
 /* ==========================================================================
    Icon selected
    ========================================================================== */
diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js
index 8da9a859..dc11043a 100755
--- a/app/Resources/static/themes/baggy/js/init.js
+++ b/app/Resources/static/themes/baggy/js/init.js
@@ -1,10 +1,10 @@
+import { savePercent, retrievePercent } from '../../_global/js/tools';
+import { toggleSaveLinkForm } from './uiTools';
+
 const $ = global.jquery = require('jquery');
 require('jquery.cookie');
 require('jquery-ui-browserify');
 const annotator = require('annotator');
-import { savePercent, retrievePercent } from '../../_global/js/tools.js';
-import { split, extractLast } from './autoCompleteTags.js';
-import { toggleSaveLinkForm } from './uiTools.js';
 
 
 $.fn.ready(() => {
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 397622bd..9c501de5 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -62,8 +62,8 @@
   font-feature-settings: 'liga';
 }
 
-[class^="icon-"],
-[class*=" icon-"] {
+[class^="icon-"]::before,
+[class*=" icon-"]::before {
   font-family: icomoon;
   speak: none;
   font-style: normal;
@@ -71,12 +71,64 @@
   font-variant: normal;
   text-transform: none;
   line-height: 1;
+  background-size: 24px;
+
+  /* Enable Ligatures ================ */
+  letter-spacing: 0;
+  -webkit-font-feature-settings: "liga";
+  -moz-font-feature-settings: "liga=1";
+  -moz-font-feature-settings: "liga";
+  -ms-font-feature-settings: "liga" 1;
+  -o-font-feature-settings: "liga";
+  font-feature-settings: "liga";
 
   /* Better Font Rendering =========== */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-image {
+  background-size: 16px;
+  background-repeat: no-repeat;
+  padding-right: 1em !important;
+  padding-left: 1em !important;
+}
+
+.icon-eye::before {
+  content: "\e9ce";
+}
+
+.icon-no-eye::before {
+  content: "\e9d1";
+}
+
+.icon-calendar::before {
+  content: "\e953";
+}
+
+.icon-mail::before {
+  content: "\ea86";
+}
+
+.icon-time::before {
+  content: "\e952";
+}
+
+/* Carrot (http://carrot.org) */
+.icon-image--carrot {
+  background-image: url("../../_global/img/icons/carrot-icon--black.png");
+}
+
+/* Diaspora */
+.icon-image--diaspora {
+  background-image: url("../../_global/img/icons/diaspora-icon--black.png");
+}
+
+/* Shaarli */
+.icon-image--shaarli {
+  background-image: url("../../_global/img/icons/shaarli.png");
+}
+
 body {
   display: flex;
   min-height: 100vh;
@@ -416,8 +468,9 @@ main ul.row {
   color: #fff;
 }
 
-.quickstart .card .card-action a, .quickstart .card .card-action a:hover {
-    color: #fff !important;
+.quickstart .card .card-action a,
+.quickstart .card .card-action a:hover {
+  color: #fff !important;
 }
 
 .settings .div_tabs {
@@ -643,7 +696,7 @@ main ul.row {
 }
 
 .icon-twitter::before {
-  content: "\ea91";
+  content: "\ea96";
 }
 
 .icon-apple::before {
diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js
index 18f7b40a..a68269e0 100755
--- a/app/Resources/static/themes/material/js/init.js
+++ b/app/Resources/static/themes/material/js/init.js
@@ -1,8 +1,10 @@
+import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
+
 const $ = require('jquery');
+
 global.jQuery = $;
 require('materialize'); // eslint-disable-line
 const annotator = require('annotator');
-import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools.js';
 
 $(document).ready(() => {
   // sideNav
diff --git a/app/Resources/views/.gitkeep b/app/Resources/views/.gitkeep
deleted file mode 100644
index e69de29b..00000000
--- a/app/Resources/views/.gitkeep
+++ /dev/null
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml
index 6e9f98de..1952e3a6 100644
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@@ -5,4 +5,4 @@ parameters:
     test_database_name: ~
     test_database_user: ~
     test_database_password: ~
-    test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite"
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"