diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-27 19:59:01 +0100 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-27 19:59:01 +0100 |
| commit | df53c035c98c6d5cd3fbbfe0582df4ebcaf535f7 (patch) | |
| tree | 1e26281427bf01766be8bd689d7befb359e29a9e | |
| parent | ec3b95d7b178e2e726d2b9fd906467b072d4af79 (diff) | |
| download | gitlab-ce-51476-private-profile-help-url-should-not-toggle-checkbox.tar.gz | |
Adds inline wrapper class to common stylesheet51476-private-profile-help-url-should-not-toggle-checkbox
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 10 | ||||
| -rw-r--r-- | app/views/profiles/show.html.haml | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 28dda65091d..3c9505a21d6 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -324,6 +324,16 @@ img.emoji { word-wrap: break-word; } +.checkbox-icon-inline-wrapper { + .checkbox { + display: inline; + + label { + display: inline; + } + } +} + /** COMMON CLASSES **/ .prepend-top-0 { margin-top: 0; } .prepend-top-2 { margin-top: 2px; } diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 2a7c740063c..17f34319050 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -437,14 +437,4 @@ table.u2f-registrations { } } } - - .inline-wrapper { - .checkbox { - display: inline; - - label { - display: inline; - } - } - } } diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index ac02abca80c..ea215e3e718 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -109,7 +109,7 @@ = f.text_area :bio, rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters.") %hr %h5= ("Private profile") - .inline-wrapper + .checkbox-icon-inline-wrapper - private_profile_label = capture do = s_("Profiles|Don't display activity-related personal information on your profiles") = f.check_box :private_profile, label: private_profile_label |