From b045272951b37fdb9cb3c5afd3f2911c8d647730 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 2 May 2018 14:57:57 +0200 Subject: [PATCH 1/3] Add support for a highlighted navigation counter Signed-off-by: Joas Schilling --- core/css/apps.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/css/apps.scss b/core/css/apps.scss index e323195f70..997c6f856f 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -435,6 +435,13 @@ kbd { font-size: 9pt; line-height: 44px; padding: 0 12px; /* Same padding as all li > a in the app-navigation */ + + span.highlighted { + padding: 2px 5px; + border-radius: 10px; + background-color: $color-primary; + color: $color-primary-text; + } } } From fbe9166076485bfe5d6e7e2f4b25554c4b23688f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 3 May 2018 11:00:04 +0200 Subject: [PATCH 2/3] Highlight element change and alignement fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 997c6f856f..06bb71dee3 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -436,11 +436,15 @@ kbd { line-height: 44px; padding: 0 12px; /* Same padding as all li > a in the app-navigation */ - span.highlighted { - padding: 2px 5px; - border-radius: 10px; - background-color: $color-primary; - color: $color-primary-text; + &.highlighted { + padding-right: 0; + text-align: center; + span { + padding: 2px 5px; + border-radius: 10px; + background-color: $color-primary; + color: $color-primary-text; + } } } } From e5b61781ec330a4faec2644152d3beafca53f0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Thu, 3 May 2018 17:38:03 +0200 Subject: [PATCH 3/3] Fixed padding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 06bb71dee3..918dc83841 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -437,7 +437,7 @@ kbd { padding: 0 12px; /* Same padding as all li > a in the app-navigation */ &.highlighted { - padding-right: 0; + padding: 0; text-align: center; span { padding: 2px 5px;