diff options
| author | Connor Smallman <connor.smallman@bedegaming.com> | 2017-01-03 22:13:47 +0300 |
|---|---|---|
| committer | Connor Smallman <connor.smallman@bedegaming.com> | 2017-01-11 10:12:38 +0300 |
| commit | f68a715366e3ecbdd479e363576842e1a9dfc559 (patch) | |
| tree | 157c63566dd87c02b7d0dc8d33761fe8a37c36f8 /app | |
| parent | 8dc2163ce580f1d71be1cf45e5dfcb2b4763d7bb (diff) | |
Removed `hidden-xs` class from alerts
Centered alert text and prevented alert actions links from floating
right for viewports below medium width (992px)
Centered alert text stopped alert actions from floating right for viewports below medium width (992px)
Update styles to use correct screen width variable for max-width media query
Added unreleased changelog
Added class to alert links wrapper
Updated styles for new class, float alert links on larger screens
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/layout.scss | 15 | ||||
| -rw-r--r-- | app/views/shared/_no_password.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/_no_ssh.html.haml | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss index 5365b62e456..29d55c44699 100644 --- a/app/assets/stylesheets/framework/layout.scss +++ b/app/assets/stylesheets/framework/layout.scss @@ -41,6 +41,21 @@ body { } } + .alert-link-group { + float: right; + } + + /* Center alert text and alert action links on smaller screens */ + @media (max-width: $screen-sm-max) { + .alert { + text-align: center; + } + + .alert-link-group { + float: none; + } + } + /* Stripe the background colors so that adjacent alert-warnings are distinct from one another */ .alert-warning { transition: background-color 0.15s, border-color 0.15s; diff --git a/app/views/shared/_no_password.html.haml b/app/views/shared/_no_password.html.haml index a43bf33751a..ed6fc76c61e 100644 --- a/app/views/shared/_no_password.html.haml +++ b/app/views/shared/_no_password.html.haml @@ -1,8 +1,8 @@ - if cookies[:hide_no_password_message].blank? && !current_user.hide_no_password && current_user.require_password? - .no-password-message.alert.alert-warning.hidden-xs + .no-password-message.alert.alert-warning You won't be able to pull or push project code via #{gitlab_config.protocol.upcase} until you #{link_to 'set a password', edit_profile_password_path} on your account - .pull-right + .alert-link-group = link_to "Don't show again", profile_path(user: {hide_no_password: true}), method: :put | = link_to 'Remind later', '#', class: 'hide-no-password-message' diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml index bb5fff2d3bb..d663fa13d10 100644 --- a/app/views/shared/_no_ssh.html.haml +++ b/app/views/shared/_no_ssh.html.haml @@ -1,8 +1,8 @@ - if cookies[:hide_no_ssh_message].blank? && !current_user.hide_no_ssh_key && current_user.require_ssh_key? - .no-ssh-key-message.alert.alert-warning.hidden-xs + .no-ssh-key-message.alert.alert-warning You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', profile_keys_path, class: 'alert-link'} to your profile - .pull-right + .alert-link-group = link_to "Don't show again", profile_path(user: {hide_no_ssh_key: true}), method: :put, class: 'alert-link' | = link_to 'Remind later', '#', class: 'hide-no-ssh-message alert-link' |