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

[stable14] Fix small glitches in update notification page #14205

Merged
merged 2 commits into from
Feb 14, 2019
Merged

[stable14] Fix small glitches in update notification page #14205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82d0a52
Fix border in update notification section
MorrisJobke Feb 13, 2019
e31f449
Fix style of warning for EoL version
MorrisJobke Feb 13, 2019
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
4 changes: 0 additions & 4 deletions apps/updatenotification/css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
font-weight: normal;
}

#updatenotification .warning {
color: #ce3702;
}

#updatenotification .whatsNew {
display: inline-block;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/updatenotification/js/updatenotification.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/updatenotification/js/updatenotification.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/updatenotification/src/components/root.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<template v-if="isNewVersionAvailable">
<p v-if="versionIsEol">
<span class="warning">
<span class="icon icon-error"></span>
<span class="icon icon-error-white"></span>
{{ t('updatenotification', 'The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.') }}
</span>
</p>
Expand Down
4 changes: 4 additions & 0 deletions settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,10 @@ span.version {
}
}

#version.section {
border-bottom: none;
}

.section {
margin-bottom: 0;
/* use 2nd child since app-navigation-toggle is the first */
Expand Down