From a494c33ef7e574e68ab5bb83d0bdbd67348af0ef Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 3 Oct 2016 23:08:26 +0200 Subject: Basically, fix everything * Remove install.sh * Assets are now provided * Icons font issues are fixed --- .../static/themes/_global/img/icons/shaarli.png | Bin 0 -> 2143 bytes app/Resources/static/themes/baggy/css/main.css | 35 +++++++++++-- app/Resources/static/themes/material/css/main.css | 54 +++++++++++++++++++-- app/Resources/views/.gitkeep | 0 4 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 app/Resources/static/themes/_global/img/icons/shaarli.png delete mode 100644 app/Resources/views/.gitkeep (limited to 'app/Resources') 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 Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/shaarli.png differ diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index eeedd277..52186818 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,13 +886,28 @@ 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 ========================================================================== */ .icon-image { background-size: 16px 16px; - background-repeat: no-repeat; - background-position: center; + background: no-repeat center; padding-right: 1em !important; padding-left: 1em !important; } @@ -898,6 +922,11 @@ a.add-to-wallabag-link-after::after { background-image: url("../../_global/img/icons/diaspora-icon--black.png"); } +/* Diaspora */ +.icon-image--shaarli { + background-image: url("../../_global/img/icons/shaarli.png"); +} + /* ========================================================================== Icon selected ========================================================================== */ diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 397622bd..20d1dded 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -62,8 +62,8 @@ font-feature-settings: 'liga'; } -[class^="icon-"], -[class*=" icon-"] { +[class^="icon-"]::before, +[class*=" icon-"]::before { font-family: icomoon; speak: none; font-style: normal; @@ -72,11 +72,59 @@ text-transform: none; line-height: 1; + /* Enable Ligatures ================ */ + letter-spacing: 0; + -webkit-font-feature-settings: "liga"; + -moz-font-feature-settings: "liga=1"; + -moz-font-feature-settings: "liga"; + -ms-font-feature-settings: "liga" 1; + -o-font-feature-settings: "liga"; + font-feature-settings: "liga"; + /* Better Font Rendering =========== */ -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } +.icon-image { + background-size: 16px 16px; + background: no-repeat center; + padding-right: 1em !important; + padding-left: 1em !important; +} + +.icon-eye::before { + content: "\e9ce"; +} + +.icon-no-eye::before { + content: "\e9d1"; +} + +.icon-calendar::before { + content: "\e953"; +} + +.icon-time::before { + content: "\e952"; +} + +/* Carrot (http://carrot.org) */ +.icon-image--carrot { + background-image: url("../../_global/img/icons/carrot-icon--black.png"); +} + +/* Diaspora */ +.icon-image--diaspora { + background-image: url("../../_global/img/icons/diaspora-icon--black.png"); +} + +/* Shaarli */ +.icon-image--shaarli { + background-image: url("../../_global/img/icons/shaarli.png"); +} + + body { display: flex; min-height: 100vh; @@ -643,7 +691,7 @@ main ul.row { } .icon-twitter::before { - content: "\ea91"; + content: "\ea96"; } .icon-apple::before { diff --git a/app/Resources/views/.gitkeep b/app/Resources/views/.gitkeep deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3 From 9f3a1cd20c13ad3384d079641c7bd079b4c1d6ae Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 07:26:18 +0200 Subject: shaarli instead of Diaspora --- app/Resources/static/themes/baggy/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 52186818..522c4833 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -922,7 +922,7 @@ a.add-to-wallabag-link-after::after { background-image: url("../../_global/img/icons/diaspora-icon--black.png"); } -/* Diaspora */ +/* shaarli */ .icon-image--shaarli { background-image: url("../../_global/img/icons/shaarli.png"); } -- cgit v1.2.3 From 9f7d154e3451f1ccc1d69f0013e98acf4639c63b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 12:14:28 +0200 Subject: Add eslint & stylelint tests (fix a few things) and move dependencies to dev --- app/Resources/static/themes/baggy/css/main.css | 3 ++- app/Resources/static/themes/baggy/js/init.js | 1 - app/Resources/static/themes/material/css/main.css | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'app/Resources') diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 522c4833..99ea6c6b 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -907,7 +907,8 @@ a.add-to-wallabag-link-after::after { .icon-image { background-size: 16px 16px; - background: no-repeat center; + background-repeat: no-repeat; + background-position: center; padding-right: 1em !important; padding-left: 1em !important; } diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index 8da9a859..07afd311 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js @@ -3,7 +3,6 @@ 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'; diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 20d1dded..5a46ec09 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -87,8 +87,9 @@ } .icon-image { - background-size: 16px 16px; - background: no-repeat center; + background-size: 16px; + background-repeat: no-repeat; + background-position: center; padding-right: 1em !important; padding-left: 1em !important; } @@ -124,7 +125,6 @@ background-image: url("../../_global/img/icons/shaarli.png"); } - body { display: flex; min-height: 100vh; @@ -464,8 +464,9 @@ main ul.row { color: #fff; } -.quickstart .card .card-action a, .quickstart .card .card-action a:hover { - color: #fff !important; +.quickstart .card .card-action a, +.quickstart .card .card-action a:hover { + color: #fff !important; } .settings .div_tabs { -- cgit v1.2.3 From 46d78f87d934bbc7679b85d0c78178444ff1b28e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 14:48:22 +0200 Subject: fix icons --- app/Resources/static/themes/material/css/main.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Resources') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 5a46ec09..4751c645 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -71,6 +71,7 @@ font-variant: normal; text-transform: none; line-height: 1; + background-size: 24px; /* Enable Ligatures ================ */ letter-spacing: 0; @@ -87,7 +88,7 @@ } .icon-image { - background-size: 16px; + background-size: 24px; background-repeat: no-repeat; background-position: center; padding-right: 1em !important; -- cgit v1.2.3 From 0c7f1ba79615be00d07a3fd4e9671f3c2356d38b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 4 Oct 2016 14:58:06 +0200 Subject: Fixed icon position in share menu --- app/Resources/static/themes/material/css/main.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/Resources') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 4751c645..f3d09973 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -88,9 +88,8 @@ } .icon-image { - background-size: 24px; + background-size: 16px; background-repeat: no-repeat; - background-position: center; padding-right: 1em !important; padding-left: 1em !important; } @@ -107,6 +106,10 @@ content: "\e953"; } +.icon-mail::before { + content: "\ea86"; +} + .icon-time::before { content: "\e952"; } -- cgit v1.2.3 From 6cb364a2c123b96d245b1ca3c330fd0042c74cd1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 15:30:05 +0200 Subject: use airbnb base rules and update eslint --- app/Resources/static/themes/baggy/js/init.js | 5 +++-- app/Resources/static/themes/material/js/init.js | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'app/Resources') diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index 07afd311..dc11043a 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js @@ -1,9 +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 { toggleSaveLinkForm } from './uiTools.js'; $.fn.ready(() => { diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js index 18f7b40a..a68269e0 100755 --- a/app/Resources/static/themes/material/js/init.js +++ b/app/Resources/static/themes/material/js/init.js @@ -1,8 +1,10 @@ +import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools'; + const $ = require('jquery'); + global.jQuery = $; require('materialize'); // eslint-disable-line const annotator = require('annotator'); -import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools.js'; $(document).ready(() => { // sideNav -- cgit v1.2.3 From c10adc1f762d004350a7921250c6821baa866e2d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 15:59:56 +0200 Subject: typo and build on test --- app/Resources/static/themes/material/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources') diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index f3d09973..9c501de5 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -107,7 +107,7 @@ } .icon-mail::before { - content: "\ea86"; + content: "\ea86"; } .icon-time::before { -- cgit v1.2.3