aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/static
diff options
context:
space:
mode:
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.css48
-rwxr-xr-xapp/Resources/static/themes/baggy/js/init.js6
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css72
-rwxr-xr-xapp/Resources/static/themes/material/js/init.js4
5 files changed, 119 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
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..61e7b22a 100755
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -383,9 +383,11 @@ footer a {
383 max-height: 2em; 383 max-height: 2em;
384 overflow-y: hidden; 384 overflow-y: hidden;
385 padding: 0; 385 padding: 0;
386 margin: 0;
386} 387}
387 388
388.card-entry-tags li { 389.card-entry-tags li,
390.card-entry-tags span {
389 display: inline-block; 391 display: inline-block;
390 margin: 0 5px; 392 margin: 0 5px;
391 padding: 5px 12px; 393 padding: 5px 12px;
@@ -394,9 +396,19 @@ footer a {
394 max-height: 2em; 396 max-height: 2em;
395 overflow: hidden; 397 overflow: hidden;
396 text-overflow: ellipsis; 398 text-overflow: ellipsis;
399}
400
401.card-entry-tags a,
402.card-entry-labels a {
403 text-decoration: none;
404 font-weight: normal;
397 color: #fff; 405 color: #fff;
398} 406}
399 407
408.nav-panel-add-tag {
409 margin-top: 10px;
410}
411
400.list-entries + .results { 412.list-entries + .results {
401 margin-bottom: 2em; 413 margin-bottom: 2em;
402} 414}
@@ -509,6 +521,7 @@ img.preview {
509 color: #666; 521 color: #666;
510 font-size: 0.9em; 522 font-size: 0.9em;
511 line-height: 1.7; 523 line-height: 1.7;
524 margin-top: 5px;
512} 525}
513 526
514.entry h2 a::first-letter { 527.entry h2 a::first-letter {
@@ -796,6 +809,15 @@ a.add-to-wallabag-link-after::after {
796 text-transform: none; 809 text-transform: none;
797 line-height: 1; 810 line-height: 1;
798 811
812 /* Enable Ligatures ================ */
813 letter-spacing: 0;
814 -webkit-font-feature-settings: "liga";
815 -moz-font-feature-settings: "liga=1";
816 -moz-font-feature-settings: "liga";
817 -ms-font-feature-settings: "liga" 1;
818 -o-font-feature-settings: "liga";
819 font-feature-settings: "liga";
820
799 /* Better Font Rendering =========== */ 821 /* Better Font Rendering =========== */
800 -webkit-font-smoothing: antialiased; 822 -webkit-font-smoothing: antialiased;
801 -moz-osx-font-smoothing: grayscale; 823 -moz-osx-font-smoothing: grayscale;
@@ -838,7 +860,7 @@ a.add-to-wallabag-link-after::after {
838} 860}
839 861
840.icon-twitter::before { 862.icon-twitter::before {
841 content: "\ea91"; 863 content: "\ea96";
842} 864}
843 865
844.icon-down-open::before { 866.icon-down-open::before {
@@ -877,6 +899,22 @@ a.add-to-wallabag-link-after::after {
877 content: "\e936"; 899 content: "\e936";
878} 900}
879 901
902.icon-eye::before {
903 content: "\e9ce";
904}
905
906.icon-no-eye::before {
907 content: "\e9d1";
908}
909
910.icon-calendar::before {
911 content: "\e953";
912}
913
914.icon-time::before {
915 content: "\e952";
916}
917
880/* .icon-image class, for image-based icons 918/* .icon-image class, for image-based icons
881 ========================================================================== */ 919 ========================================================================== */
882 920
@@ -898,6 +936,11 @@ a.add-to-wallabag-link-after::after {
898 background-image: url("../../_global/img/icons/diaspora-icon--black.png"); 936 background-image: url("../../_global/img/icons/diaspora-icon--black.png");
899} 937}
900 938
939/* shaarli */
940.icon-image--shaarli {
941 background-image: url("../../_global/img/icons/shaarli.png");
942}
943
901/* ========================================================================== 944/* ==========================================================================
902 Icon selected 945 Icon selected
903 ========================================================================== */ 946 ========================================================================== */
@@ -991,6 +1034,7 @@ blockquote {
991 1034
992#article_toolbar li { 1035#article_toolbar li {
993 display: inline-block; 1036 display: inline-block;
1037 margin: 3px auto;
994} 1038}
995 1039
996#article_toolbar a { 1040#article_toolbar a {
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..b66c88f9 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;
@@ -393,6 +445,15 @@ main ul.row {
393 white-space: nowrap; 445 white-space: nowrap;
394} 446}
395 447
448.card-entry-tags a,
449.card-entry-labels a,
450.card-entry-labels-hidden a,
451#list .chip a {
452 text-decoration: none;
453 font-weight: normal;
454 color: #fff;
455}
456
396.card .card-content .estimatedTime { 457.card .card-content .estimatedTime {
397 margin-bottom: 10px; 458 margin-bottom: 10px;
398} 459}
@@ -416,8 +477,9 @@ main ul.row {
416 color: #fff; 477 color: #fff;
417} 478}
418 479
419.quickstart .card .card-action a, .quickstart .card .card-action a:hover { 480.quickstart .card .card-action a,
420 color: #fff !important; 481.quickstart .card .card-action a:hover {
482 color: #fff !important;
421} 483}
422 484
423.settings .div_tabs { 485.settings .div_tabs {
@@ -643,7 +705,7 @@ main ul.row {
643} 705}
644 706
645.icon-twitter::before { 707.icon-twitter::before {
646 content: "\ea91"; 708 content: "\ea96";
647} 709}
648 710
649.icon-apple::before { 711.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