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 --- app/Resources/static/themes/material/css/main.css | 54 +++++++++++++++++++++-- 1 file changed, 51 insertions(+), 3 deletions(-) (limited to 'app/Resources/static/themes/material/css/main.css') 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 { -- 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/material/css/main.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'app/Resources/static/themes/material/css/main.css') 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/static/themes/material/css/main.css') 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/static/themes/material/css/main.css') 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 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/static/themes/material/css/main.css') 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