summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-06-02 09:40:09 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-10-19 22:50:34 +0900
commit55826e7783adb5ec7037ffab8ec43c89dfcc4eb5 (patch)
tree7adb8b3a0d17594ea288632f863dee1df3d42f5e /app/views/layouts
parentce6a21f742051271ae5e55795fead023f1a73068 (diff)
downloadgitlab-ce-55826e7783adb5ec7037ffab8ec43c89dfcc4eb5.tar.gz
Remove .card-title from .card-header for BS4 migration
Replaces .card-header > hX.card-title with hX.card-header to remove .card-title. At a occurrence where bold styling is not necessary, div.card-header is used instead. By full removal of .card-title at the moment, all workarounds for BS4's card-title are removed as well. More information: https://getbootstrap.com/docs/4.0/migration/#panels Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/terms.html.haml29
1 files changed, 14 insertions, 15 deletions
diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml
index 977eb350365..cdad617f006 100644
--- a/app/views/layouts/terms.html.haml
+++ b/app/views/layouts/terms.html.haml
@@ -16,19 +16,18 @@
.content{ id: "content-body" }
.card
.card-header
- .card-title
- = brand_header_logo
- - logo_text = brand_header_logo_type
- - if logo_text.present?
- %span.logo-text.prepend-left-8
- = logo_text
- - if header_link?(:user_dropdown)
- .navbar-collapse
- %ul.nav.navbar-nav
- %li.header-user.dropdown
- = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
- = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
- = sprite_icon('angle-down', css_class: 'caret-down')
- .dropdown-menu.dropdown-menu-right
- = render 'layouts/header/current_user_dropdown'
+ = brand_header_logo
+ - logo_text = brand_header_logo_type
+ - if logo_text.present?
+ %span.logo-text.prepend-left-8
+ = logo_text
+ - if header_link?(:user_dropdown)
+ .navbar-collapse
+ %ul.nav.navbar-nav
+ %li.header-user.dropdown
+ = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
+ = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar"
+ = sprite_icon('angle-down', css_class: 'caret-down')
+ .dropdown-menu.dropdown-menu-right
+ = render 'layouts/header/current_user_dropdown'
= yield