aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/static
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-10-04 16:26:50 +0200
committerGitHub <noreply@github.com>2016-10-04 16:26:50 +0200
commit57386125abc5c50c1438cf7e78d01f06021adc0a (patch)
treed3f26102f9697247c93ac69db6000d15e96fbb23 /app/Resources/static
parentf2ab290f0fc8a2909bb490e0ed2d91a677a95cc4 (diff)
parentc10adc1f762d004350a7921250c6821baa866e2d (diff)
downloadwallabag-57386125abc5c50c1438cf7e78d01f06021adc0a.tar.gz
wallabag-57386125abc5c50c1438cf7e78d01f06021adc0a.tar.zst
wallabag-57386125abc5c50c1438cf7e78d01f06021adc0a.zip
Merge pull request #2353 from wallabag/assets-fix
Basically, fix everything
Diffstat (limited to 'app/Resources/static')
-rw-r--r--app/Resources/static/themes/_global/img/icons/shaarli.pngbin0 -> 2143 bytes
-rwxr-xr-xapp/Resources/static/themes/baggy/css/main.css32
-rwxr-xr-xapp/Resources/static/themes/baggy/js/init.js6
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css63
-rwxr-xr-xapp/Resources/static/themes/material/js/init.js4
5 files changed, 95 insertions, 10 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
Binary files differ
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 {
796 text-transform: none; 796 text-transform: none;
797 line-height: 1; 797 line-height: 1;
798 798
799 /* Enable Ligatures ================ */
800 letter-spacing: 0;
801 -webkit-font-feature-settings: "liga";
802 -moz-font-feature-settings: "liga=1";
803 -moz-font-feature-settings: "liga";
804 -ms-font-feature-settings: "liga" 1;
805 -o-font-feature-settings: "liga";
806 font-feature-settings: "liga";
807
799 /* Better Font Rendering =========== */ 808 /* Better Font Rendering =========== */
800 -webkit-font-smoothing: antialiased; 809 -webkit-font-smoothing: antialiased;
801 -moz-osx-font-smoothing: grayscale; 810 -moz-osx-font-smoothing: grayscale;
@@ -838,7 +847,7 @@ a.add-to-wallabag-link-after::after {
838} 847}
839 848
840.icon-twitter::before { 849.icon-twitter::before {
841 content: "\ea91"; 850 content: "\ea96";
842} 851}
843 852
844.icon-down-open::before { 853.icon-down-open::before {
@@ -877,6 +886,22 @@ a.add-to-wallabag-link-after::after {
877 content: "\e936"; 886 content: "\e936";
878} 887}
879 888
889.icon-eye::before {
890 content: "\e9ce";
891}
892
893.icon-no-eye::before {
894 content: "\e9d1";
895}
896
897.icon-calendar::before {
898 content: "\e953";
899}
900
901.icon-time::before {
902 content: "\e952";
903}
904
880/* .icon-image class, for image-based icons 905/* .icon-image class, for image-based icons
881 ========================================================================== */ 906 ========================================================================== */
882 907
@@ -898,6 +923,11 @@ a.add-to-wallabag-link-after::after {
898 background-image: url("../../_global/img/icons/diaspora-icon--black.png"); 923 background-image: url("../../_global/img/icons/diaspora-icon--black.png");
899} 924}
900 925
926/* shaarli */
927.icon-image--shaarli {
928 background-image: url("../../_global/img/icons/shaarli.png");
929}
930
901/* ========================================================================== 931/* ==========================================================================
902 Icon selected 932 Icon selected
903 ========================================================================== */ 933 ========================================================================== */
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 @@
1import { savePercent, retrievePercent } from '../../_global/js/tools';
2import { toggleSaveLinkForm } from './uiTools';
3
1const $ = global.jquery = require('jquery'); 4const $ = global.jquery = require('jquery');
2require('jquery.cookie'); 5require('jquery.cookie');
3require('jquery-ui-browserify'); 6require('jquery-ui-browserify');
4const annotator = require('annotator'); 7const annotator = require('annotator');
5import { savePercent, retrievePercent } from '../../_global/js/tools.js';
6import { split, extractLast } from './autoCompleteTags.js';
7import { toggleSaveLinkForm } from './uiTools.js';
8 8
9 9
10$.fn.ready(() => { 10$.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 @@
62 font-feature-settings: 'liga'; 62 font-feature-settings: 'liga';
63} 63}
64 64
65[class^="icon-"], 65[class^="icon-"]::before,
66[class*=" icon-"] { 66[class*=" icon-"]::before {
67 font-family: icomoon; 67 font-family: icomoon;
68 speak: none; 68 speak: none;
69 font-style: normal; 69 font-style: normal;
@@ -71,12 +71,64 @@
71 font-variant: normal; 71 font-variant: normal;
72 text-transform: none; 72 text-transform: none;
73 line-height: 1; 73 line-height: 1;
74 background-size: 24px;
75
76 /* Enable Ligatures ================ */
77 letter-spacing: 0;
78 -webkit-font-feature-settings: "liga";
79 -moz-font-feature-settings: "liga=1";
80 -moz-font-feature-settings: "liga";
81 -ms-font-feature-settings: "liga" 1;
82 -o-font-feature-settings: "liga";
83 font-feature-settings: "liga";
74 84
75 /* Better Font Rendering =========== */ 85 /* Better Font Rendering =========== */
76 -webkit-font-smoothing: antialiased; 86 -webkit-font-smoothing: antialiased;
77 -moz-osx-font-smoothing: grayscale; 87 -moz-osx-font-smoothing: grayscale;
78} 88}
79 89
90.icon-image {
91 background-size: 16px;
92 background-repeat: no-repeat;
93 padding-right: 1em !important;
94 padding-left: 1em !important;
95}
96
97.icon-eye::before {
98 content: "\e9ce";
99}
100
101.icon-no-eye::before {
102 content: "\e9d1";
103}
104
105.icon-calendar::before {
106 content: "\e953";
107}
108
109.icon-mail::before {
110 content: "\ea86";
111}
112
113.icon-time::before {
114 content: "\e952";
115}
116
117/* Carrot (http://carrot.org) */
118.icon-image--carrot {
119 background-image: url("../../_global/img/icons/carrot-icon--black.png");
120}
121
122/* Diaspora */
123.icon-image--diaspora {
124 background-image: url("../../_global/img/icons/diaspora-icon--black.png");
125}
126
127/* Shaarli */
128.icon-image--shaarli {
129 background-image: url("../../_global/img/icons/shaarli.png");
130}
131
80body { 132body {
81 display: flex; 133 display: flex;
82 min-height: 100vh; 134 min-height: 100vh;
@@ -416,8 +468,9 @@ main ul.row {
416 color: #fff; 468 color: #fff;
417} 469}
418 470
419.quickstart .card .card-action a, .quickstart .card .card-action a:hover { 471.quickstart .card .card-action a,
420 color: #fff !important; 472.quickstart .card .card-action a:hover {
473 color: #fff !important;
421} 474}
422 475
423.settings .div_tabs { 476.settings .div_tabs {
@@ -643,7 +696,7 @@ main ul.row {
643} 696}
644 697
645.icon-twitter::before { 698.icon-twitter::before {
646 content: "\ea91"; 699 content: "\ea96";
647} 700}
648 701
649.icon-apple::before { 702.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 @@
1import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
2
1const $ = require('jquery'); 3const $ = require('jquery');
4
2global.jQuery = $; 5global.jQuery = $;
3require('materialize'); // eslint-disable-line 6require('materialize'); // eslint-disable-line
4const annotator = require('annotator'); 7const annotator = require('annotator');
5import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools.js';
6 8
7$(document).ready(() => { 9$(document).ready(() => {
8 // sideNav 10 // sideNav