From 70953fa7888165b8a6352b2eae6db0ecfd1d169e Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Tue, 28 Nov 2017 10:56:28 +0100 Subject: [PATCH 1/5] Add new .icon-white and .icon-shadow classes, add toggle-background icon Signed-off-by: Marin Treselj --- core/css/icons.scss | 47 ++++++++++++++++++++------ core/css/variables.scss | 2 +- core/img/actions/toggle-background.svg | 1 + 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 core/img/actions/toggle-background.svg diff --git a/core/css/icons.scss b/core/css/icons.scss index 87fb835f67771..5f1d8af78997c 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -90,7 +90,14 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { } .icon-shadow { - filter: drop-shadow(0 1px 3px $color-box-shadow); + filter: drop-shadow(1px 1px 4px $color-box-shadow); + &.icon-white { + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); + } +} + +.icon-white { + filter: invert(100%); } /* ICONS -------------------------------------------------------------------- */ @@ -106,16 +113,20 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/actions/audio.svg?v=1'); } +/* TODO: to be deprecated; use .icon-audio.icon-white.icon-shadow */ .icon-audio-white { - background-image: url('../img/actions/audio-white.svg?v=2'); + background-image: url('../img/actions/audio.svg?v=2'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-audio-off { background-image: url('../img/actions/audio-off.svg?v=1'); } +/* TODO: to be deprecated; use .icon-audio-off.icon-white.icon-shadow */ .icon-audio-off-white { - background-image: url('../img/actions/audio-off-white.svg?v=1'); + background-image: url('../img/actions/audio-off.svg?v=1'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-caret { @@ -171,6 +182,7 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { } &:hover, &:focus { background-image: url('../img/actions/delete-hover.svg?v=1'); + filter: initial; } } @@ -222,8 +234,10 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/actions/fullscreen.svg?v=1'); } +/* TODO: to be deprecated; use .icon-fullscreen.icon-white.icon-shadow */ .icon-fullscreen-white { - background-image: url('../img/actions/fullscreen-white.svg?v=2'); + background-image: url('../img/actions/fullscreen.svg?v=1'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-history { @@ -294,16 +308,20 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/actions/screen.svg?v=1'); } +/* TODO: to be deprecated; use .icon-screen.icon-white.icon-shadow */ .icon-screen-white { - background-image: url('../img/actions/screen-white.svg?v=1'); + background-image: url('../img/actions/screen.svg?v=1'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-screen-off { background-image: url('../img/actions/screen-off.svg?v=1'); } +/* TODO: to be deprecated; use .icon-screen-off.icon-white.icon-shadow */ .icon-screen-off-white { - background-image: url('../img/actions/screen-off-white.svg?v=1'); + background-image: url('../img/actions/screen-off.svg?v=1'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-search { @@ -373,6 +391,10 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/actions/toggle.svg?v=1'); } +.icon-toggle-background { + background-image: url('../img/actions/toggle-background.svg?v=1'); +} + .icon-toggle-pictures { background-image: url('../img/actions/toggle-pictures.svg?v=1'); } @@ -405,16 +427,20 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-image: url('../img/actions/video.svg?v=1'); } +/* TODO: to be deprecated; use .icon-video-off.icon-white.icon-shadow */ .icon-video-white { - background-image: url('../img/actions/video-white.svg?v=2'); + background-image: url('../img/actions/video.svg?v=2'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-video-off { background-image: url('../img/actions/video-off.svg?v=1'); } +/* TODO: to be deprecated; use .icon-video-off.icon-white.icon-shadow */ .icon-video-off-white { - background-image: url('../img/actions/video-off-white.svg?v=1'); + background-image: url('../img/actions/video-off.svg?v=1'); + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } .icon-view-close { @@ -426,7 +452,7 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { } .icon-view-next { - background-image: url('../img/actions/view-next.svg?v=1'); + background-image: url('../img/actions/arrow-right.svg?v=1'); } .icon-view-pause { @@ -438,13 +464,14 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { } .icon-view-previous { - background-image: url('../img/actions/view-previous.svg?v=1'); + background-image: url('../img/actions/arrow-left.svg?v=1'); } /* PLACES ------------------------------------------------------------------- */ .icon-calendar { background-image: url('../img/places/calendar.svg?v=1'); } + .icon-calendar-dark { background-image: url('../img/places/calendar-dark.svg?v=1'); } diff --git a/core/css/variables.scss b/core/css/variables.scss index 86a348c24f7aa..edeebd5403fc9 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -20,6 +20,6 @@ $image-login-background: '../img/background.png?v=2'; $color-loading: #969696; $color-loading-dark: #bbbbbb; -$color-box-shadow: rgba(nc-darken($color-main-background, 30%), 0.75); +$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75); $color-border: nc-darken($color-main-background, 8%); $border-radius: 3px; diff --git a/core/img/actions/toggle-background.svg b/core/img/actions/toggle-background.svg new file mode 100644 index 0000000000000..9b56627e3945c --- /dev/null +++ b/core/img/actions/toggle-background.svg @@ -0,0 +1 @@ + From dd8bfe5d365a2fd3a7f581cd1527e3f6985742da Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Tue, 28 Nov 2017 10:59:22 +0100 Subject: [PATCH 2/5] Remove deprecated white, shaded icons Signed-off-by: Marin Treselj --- core/img/actions/audio-off-white.svg | 1 - core/img/actions/audio-white.svg | 1 - core/img/actions/fullscreen-white.svg | 1 - core/img/actions/screen-off-white.svg | 1 - core/img/actions/screen-white.svg | 1 - core/img/actions/video-off-white.svg | 1 - core/img/actions/video-white.svg | 1 - core/img/actions/view-close.svg | 1 - core/img/actions/view-download.svg | 1 - core/img/actions/view-next.svg | 1 - core/img/actions/view-pause.svg | 1 - core/img/actions/view-play.svg | 1 - core/img/actions/view-previous.svg | 1 - 13 files changed, 13 deletions(-) delete mode 100644 core/img/actions/audio-off-white.svg delete mode 100644 core/img/actions/audio-white.svg delete mode 100644 core/img/actions/fullscreen-white.svg delete mode 100644 core/img/actions/screen-off-white.svg delete mode 100644 core/img/actions/screen-white.svg delete mode 100644 core/img/actions/video-off-white.svg delete mode 100644 core/img/actions/video-white.svg delete mode 100644 core/img/actions/view-close.svg delete mode 100644 core/img/actions/view-download.svg delete mode 100644 core/img/actions/view-next.svg delete mode 100644 core/img/actions/view-pause.svg delete mode 100644 core/img/actions/view-play.svg delete mode 100644 core/img/actions/view-previous.svg diff --git a/core/img/actions/audio-off-white.svg b/core/img/actions/audio-off-white.svg deleted file mode 100644 index d0699a959d0cb..0000000000000 --- a/core/img/actions/audio-off-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/audio-white.svg b/core/img/actions/audio-white.svg deleted file mode 100644 index 209177deb3f2c..0000000000000 --- a/core/img/actions/audio-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/fullscreen-white.svg b/core/img/actions/fullscreen-white.svg deleted file mode 100644 index c920885bf6be4..0000000000000 --- a/core/img/actions/fullscreen-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/screen-off-white.svg b/core/img/actions/screen-off-white.svg deleted file mode 100644 index a022b933808ca..0000000000000 --- a/core/img/actions/screen-off-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/screen-white.svg b/core/img/actions/screen-white.svg deleted file mode 100644 index e279dc48270ba..0000000000000 --- a/core/img/actions/screen-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/video-off-white.svg b/core/img/actions/video-off-white.svg deleted file mode 100644 index 95e39de06d458..0000000000000 --- a/core/img/actions/video-off-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/video-white.svg b/core/img/actions/video-white.svg deleted file mode 100644 index f24bb373add2c..0000000000000 --- a/core/img/actions/video-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/core/img/actions/view-close.svg b/core/img/actions/view-close.svg deleted file mode 100644 index 7b76c6d17980c..0000000000000 --- a/core/img/actions/view-close.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/actions/view-download.svg b/core/img/actions/view-download.svg deleted file mode 100644 index 89bba33f6aa8b..0000000000000 --- a/core/img/actions/view-download.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/actions/view-next.svg b/core/img/actions/view-next.svg deleted file mode 100644 index 662b2172daea4..0000000000000 --- a/core/img/actions/view-next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/actions/view-pause.svg b/core/img/actions/view-pause.svg deleted file mode 100644 index edc29cacca228..0000000000000 --- a/core/img/actions/view-pause.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/actions/view-play.svg b/core/img/actions/view-play.svg deleted file mode 100644 index 9d9fb12bdd37e..0000000000000 --- a/core/img/actions/view-play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/actions/view-previous.svg b/core/img/actions/view-previous.svg deleted file mode 100644 index 492f8f50d70b8..0000000000000 --- a/core/img/actions/view-previous.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 54878d753ab1f4abe38ac28dbb123a70abb390c7 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Tue, 28 Nov 2017 14:30:02 +0100 Subject: [PATCH 3/5] Revert removing of deprecated icons Signed-off-by: Marin Treselj --- core/img/actions/audio-off-white.svg | 1 + core/img/actions/audio-white.svg | 1 + core/img/actions/fullscreen-white.svg | 1 + core/img/actions/screen-off-white.svg | 1 + core/img/actions/screen-white.svg | 1 + core/img/actions/video-off-white.svg | 1 + core/img/actions/video-white.svg | 1 + core/img/actions/view-close.svg | 1 + core/img/actions/view-download.svg | 1 + core/img/actions/view-next.svg | 1 + core/img/actions/view-pause.svg | 1 + core/img/actions/view-play.svg | 1 + core/img/actions/view-previous.svg | 1 + 13 files changed, 13 insertions(+) create mode 100644 core/img/actions/audio-off-white.svg create mode 100644 core/img/actions/audio-white.svg create mode 100644 core/img/actions/fullscreen-white.svg create mode 100644 core/img/actions/screen-off-white.svg create mode 100644 core/img/actions/screen-white.svg create mode 100644 core/img/actions/video-off-white.svg create mode 100644 core/img/actions/video-white.svg create mode 100644 core/img/actions/view-close.svg create mode 100644 core/img/actions/view-download.svg create mode 100644 core/img/actions/view-next.svg create mode 100644 core/img/actions/view-pause.svg create mode 100644 core/img/actions/view-play.svg create mode 100644 core/img/actions/view-previous.svg diff --git a/core/img/actions/audio-off-white.svg b/core/img/actions/audio-off-white.svg new file mode 100644 index 0000000000000..d0699a959d0cb --- /dev/null +++ b/core/img/actions/audio-off-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/audio-white.svg b/core/img/actions/audio-white.svg new file mode 100644 index 0000000000000..209177deb3f2c --- /dev/null +++ b/core/img/actions/audio-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/fullscreen-white.svg b/core/img/actions/fullscreen-white.svg new file mode 100644 index 0000000000000..c920885bf6be4 --- /dev/null +++ b/core/img/actions/fullscreen-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/screen-off-white.svg b/core/img/actions/screen-off-white.svg new file mode 100644 index 0000000000000..a022b933808ca --- /dev/null +++ b/core/img/actions/screen-off-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/screen-white.svg b/core/img/actions/screen-white.svg new file mode 100644 index 0000000000000..e279dc48270ba --- /dev/null +++ b/core/img/actions/screen-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/video-off-white.svg b/core/img/actions/video-off-white.svg new file mode 100644 index 0000000000000..95e39de06d458 --- /dev/null +++ b/core/img/actions/video-off-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/video-white.svg b/core/img/actions/video-white.svg new file mode 100644 index 0000000000000..f24bb373add2c --- /dev/null +++ b/core/img/actions/video-white.svg @@ -0,0 +1 @@ + diff --git a/core/img/actions/view-close.svg b/core/img/actions/view-close.svg new file mode 100644 index 0000000000000..7b76c6d17980c --- /dev/null +++ b/core/img/actions/view-close.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/actions/view-download.svg b/core/img/actions/view-download.svg new file mode 100644 index 0000000000000..89bba33f6aa8b --- /dev/null +++ b/core/img/actions/view-download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/actions/view-next.svg b/core/img/actions/view-next.svg new file mode 100644 index 0000000000000..662b2172daea4 --- /dev/null +++ b/core/img/actions/view-next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/actions/view-pause.svg b/core/img/actions/view-pause.svg new file mode 100644 index 0000000000000..edc29cacca228 --- /dev/null +++ b/core/img/actions/view-pause.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/actions/view-play.svg b/core/img/actions/view-play.svg new file mode 100644 index 0000000000000..9d9fb12bdd37e --- /dev/null +++ b/core/img/actions/view-play.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/img/actions/view-previous.svg b/core/img/actions/view-previous.svg new file mode 100644 index 0000000000000..492f8f50d70b8 --- /dev/null +++ b/core/img/actions/view-previous.svg @@ -0,0 +1 @@ + \ No newline at end of file From 314bfeb6b825a52354e04b14c0fc73264a4bf043 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Thu, 30 Nov 2017 18:26:26 +0100 Subject: [PATCH 4/5] Define icon-shadow only in context of icon-white Signed-off-by: Marin Treselj --- core/css/icons.scss | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/css/icons.scss b/core/css/icons.scss index 5f1d8af78997c..625196c8eb37f 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -89,15 +89,10 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { background-size: 32px !important; } -.icon-shadow { - filter: drop-shadow(1px 1px 4px $color-box-shadow); - &.icon-white { - filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); - } -} - .icon-white { filter: invert(100%); + &.icon-shadow { + filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); } /* ICONS -------------------------------------------------------------------- */ From a62cc27058de20e67911b9c15aa1d3bb2fe46904 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 4 Dec 2017 22:39:06 +0100 Subject: [PATCH 5/5] Fix syntax error Signed-off-by: Morris Jobke --- core/css/icons.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/icons.scss b/core/css/icons.scss index 625196c8eb37f..fbf36e2fbbcf0 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -93,6 +93,7 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] { filter: invert(100%); &.icon-shadow { filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow); + } } /* ICONS -------------------------------------------------------------------- */