diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 19:45:53 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-04 19:45:53 +0000 |
commit | dd5f0762087c1c76394253d660875846d36551d7 (patch) | |
tree | e84e256edf897ca5ae91e14c225fc051dad65f4e /app/assets | |
parent | d0b28cd0616e84861bc6f3ed7e0b6becb371a3f5 (diff) | |
parent | 5d0f68f26b0b6597c99d1e21d6f6978d963ea0d3 (diff) | |
download | gitlab-ce-dd5f0762087c1c76394253d660875846d36551d7.tar.gz |
Merge branch 'stylistic-changes-to-commit-title-bar' into 'master'
Added various stylistic changes to commit title area
## What does this MR do?
After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6994 was merged, there were some things left over.
## Are there points in the code the reviewer needs to double check?
Yes, in general the code.
Apart from that I couldn't get the extended commit sha to lign up correctly on smaller screens
## Why was this MR needed?
Some things weren't done yet.
- Commit description and commit sha are now bold like in the original design, and are also both visible on smaller screens
- You can now extend the commit sha on bigger screens and keep it visible truncated on smaller screens.
- options dropdown button now correctly displays on smaller screens (similar to issue/mr view)
## Screenshots (if relevant)
Before:

After:


not aligned correctly:

## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
!6994
See merge request !7213
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index 8ecf7fcb96d..47d3e72679b 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -36,9 +36,42 @@ padding: 10px 0; margin-bottom: 0; - .commit-options-dropdown-caret { - @media (max-width: $screen-sm) { - margin-left: 0; + @media (min-width: $screen-sm-min) { + display: flex; + align-items: center; + + .commit-meta { + flex: 1; + } + } + + .commit-hash-full { + @media (max-width: $screen-sm-max) { + width: 80px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; + vertical-align: bottom; + } + } + + .commit-action-buttons { + i { + color: $gl-icon-color; + font-size: 13px; + margin-right: 3px; + } + + @media (max-width: $screen-xs-max) { + .dropdown { + width: 100%; + margin-top: 10px; + } + + .dropdown-toggle { + width: 100%; + } } } } @@ -188,17 +221,6 @@ } } -.commit-action-buttons { - position: relative; - top: -1px; - - i { - color: $gl-icon-color; - font-size: 13px; - margin-right: 3px; - } -} - /* * Commit message textarea for web editor and * custom merge request message |