Skip to content

Remove svg shadows #7319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 5 commits into from
Dec 4, 2017
Merged

Remove svg shadows #7319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70953fa
Add new .icon-white and .icon-shadow classes, add toggle-background icon
pixelipo Nov 28, 2017
dd8bfe5
Remove deprecated white, shaded icons
pixelipo Nov 28, 2017
54878d7
Revert removing of deprecated icons
pixelipo Nov 28, 2017
314bfeb
Define icon-shadow only in context of icon-white
pixelipo Nov 30, 2017
a62cc27
Fix syntax error
MorrisJobke Dec 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 34 additions & 11 deletions core/css/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ img, object, video, button, textarea, input, select, div[contenteditable=true] {
background-size: 32px !important;
}

.icon-shadow {
filter: drop-shadow(0 1px 3px $color-box-shadow);
.icon-white {
filter: invert(100%);
&.icon-shadow {
filter: invert(100%) drop-shadow(1px 1px 4px $color-box-shadow);
}
}

/* ICONS -------------------------------------------------------------------- */
Expand All @@ -106,16 +109,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 {
Expand Down Expand Up @@ -171,6 +178,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;
}
}

Expand Down Expand Up @@ -222,8 +230,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 {
Expand Down Expand Up @@ -294,16 +304,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 {
Expand Down Expand Up @@ -373,6 +387,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');
}
Expand Down Expand Up @@ -405,16 +423,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 {
Expand All @@ -426,7 +448,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 {
Expand All @@ -438,13 +460,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');
}
Expand Down
2 changes: 1 addition & 1 deletion core/css/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
1 change: 1 addition & 0 deletions core/img/actions/toggle-background.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.