diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-04 21:52:44 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-04 21:52:44 +0000 |
| commit | 1de6420eaac0bbbc7b8c69e1e6333a71f7b6e675 (patch) | |
| tree | 38f39def3e52764687ef6dbe0044520a7a066784 | |
| parent | 9309bf310c31ca21307783cf396b82dd1562a8db (diff) | |
| parent | 840ce49d4b682e6f39cd22804be25d3c0311969b (diff) | |
| download | gitlab-ce-1de6420eaac0bbbc7b8c69e1e6333a71f7b6e675.tar.gz | |
Merge branch '47162-styling-of-acceptance-terms-page-is-broken' into 'master'
Resolve "Styling of acceptance terms page is broken"
Closes #47162
See merge request gitlab-org/gitlab-ce!19371
| -rw-r--r-- | app/assets/stylesheets/framework/terms.scss | 8 | ||||
| -rw-r--r-- | app/views/layouts/terms.html.haml | 6 | ||||
| -rw-r--r-- | app/views/users/terms/index.html.haml | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/terms.scss b/app/assets/stylesheets/framework/terms.scss index 744fd0ff796..7cda674e5c8 100644 --- a/app/assets/stylesheets/framework/terms.scss +++ b/app/assets/stylesheets/framework/terms.scss @@ -11,15 +11,15 @@ padding-top: $gl-padding; } - .panel { - .panel-heading { + .card { + .card-header { display: -webkit-flex; display: flex; align-items: center; justify-content: space-between; line-height: $line-height-base; - .title { + .card-title { display: flex; align-items: center; @@ -34,6 +34,8 @@ .navbar-collapse { padding-right: 0; + flex-grow: 0; + flex-basis: auto; .navbar-nav { margin: 0; diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml index a8964b19ba1..977eb350365 100644 --- a/app/views/layouts/terms.html.haml +++ b/app/views/layouts/terms.html.haml @@ -14,9 +14,9 @@ %div{ class: "#{container_class} limit-container-width" } .content{ id: "content-body" } - .panel.panel-default - .panel-heading - .title + .card + .card-header + .card-title = brand_header_logo - logo_text = brand_header_logo_type - if logo_text.present? diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index e0fe551cf36..b9f25a71170 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -1,8 +1,8 @@ - redirect_params = { redirect: @redirect } if @redirect -.panel-content.rendered-terms +.card-body.rendered-terms = markdown_field(@term, :terms) -.row-content-block.footer-block.clearfix +.card-footer.footer-block.clearfix - if can?(current_user, :accept_terms, @term) .float-right = button_to accept_term_path(@term, redirect_params), class: 'btn btn-success prepend-left-8' do |