diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-08 03:39:59 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-08 03:39:59 +0000 |
| commit | 915ad255cdc7afa9a44ba24eed62f28184e81836 (patch) | |
| tree | a1134abc8ddcd828871c4fa709cf837d420fb048 | |
| parent | 402767e0f5c32fa602125b8b09de12faac036d15 (diff) | |
| parent | 30856b1eeaf2990297e4eb2323e5bdf9ee975a5c (diff) | |
| download | gitlab-ce-915ad255cdc7afa9a44ba24eed62f28184e81836.tar.gz | |
Merge branch '18080-project-header-alignment' into 'master'
Add flexbox to project header
## What does this MR do?
Adds flexbox to project header to keep components vertically centered regardless of description presence/length
## What are the relevant issue numbers?
Closes #18080
## Screenshots (if relevant)
See merge request !4417
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 10 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index ad78eb65769..bb250904255 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -32,6 +32,15 @@ .container-fluid { position: relative; + + @media (min-width: $screen-md-max) { + .row { + display: flex; + -ms-flex-align: center; + -webkit-align-items: center; + -webkit-box-align: center; + } + } } .cover-controls { @@ -57,7 +66,6 @@ max-width: 86px; min-width: 86px; padding-right: 0; - margin: 11px 0; @media (max-width: $screen-md-max) { padding-left: 0; diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 57c3d1b0a65..f0e04a0235d 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -29,10 +29,10 @@ .project-clone-holder = render "shared/clone_panel" - .project-repo-buttons.btn-group.project-right-buttons - = render "projects/buttons/download" - = render 'projects/buttons/dropdown' - = render 'projects/buttons/notifications' + .project-repo-buttons.btn-group.project-right-buttons + = render "projects/buttons/download" + = render 'projects/buttons/dropdown' + = render 'projects/buttons/notifications' :javascript new Star(); |