Skip to content
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

Jump to bottom

Adapts the icon paths to the new icon api #10593

Closed
wants to merge 3 commits into from
Closed

Adapts the icon paths to the new icon api #10593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9da9fe9
Adapts the icon paths to the new icon api
weeman1337 Aug 8, 2018
0dc2826
Restores the guest icons
weeman1337 Aug 8, 2018
7f6cf7c
Merge remote-tracking branch 'origin/fix/10583/guest-icon-paths' into…
weeman1337 Aug 8, 2018
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
14 changes: 6 additions & 8 deletions core/css/guest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,28 +637,26 @@ p.info {
background-size: 32px;
}


/* Icons */
.icon-info-white {
background-image: url('../img/actions/info-white.svg?v=2');
background-image: url('../../svg/core/actions/info/fff?v=1');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs index.php to work everywhere... @juliushaertl

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

guests.css is used on error/install pages as well, where we don't have the new svg endpoint available. I'd prefer to just restore the white icon files for those special cases for now, as we already did partly in #10459 and #10485

}
.icon-error-white {
background-image: url('../img/actions/error-white.svg?v=1');
background-image: url('../../svg/core/actions/error/fff?v=1');
}
.icon-caret-white {
background-image: url('../img/actions/caret-white.svg?v=1');
background-image: url('../../svg/core/actions/caret/fff?v=1');
}
.icon-confirm {
background-image: url('../img/actions/confirm.svg?v=2');
background-image: url('../../svg/core/actions/confirm/000?v=1');
}
.icon-confirm-white {
background-image: url('../img/actions/confirm-white.svg?v=2');
background-image: url('../../svg/core/actions/confirm/fff?v=1');
}
.icon-checkmark-white {
background-image: url('../img/actions/checkmark-white.svg?v=1');
background-image: url('../../svg/core/actions/checkmark/fff?v=1');
}


/* Loading */
.float-spinner {
margin-top: -32px;
Expand Down
1 change: 1 addition & 0 deletions core/img/actions/checkmark-white.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.
1 change: 1 addition & 0 deletions core/img/actions/confirm-white.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.
1 change: 1 addition & 0 deletions core/img/actions/info-white.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.