summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-29 14:42:09 +0000
committerFatih Acet <acetfatih@gmail.com>2016-09-29 14:42:09 +0000
commita8691bda3bb8b2db12f7aabe740a0e064c42fd62 (patch)
tree99f0b9180bdebe77c55fe77b490cfadadc91c70a
parentc8e2d67483ed360791990e2d1626ab26fe8950b0 (diff)
parentcf5a55429df3405b606584b39e4fd97342a37e14 (diff)
downloadgitlab-ce-a8691bda3bb8b2db12f7aabe740a0e064c42fd62.tar.gz
Merge branch '22544-long-commit-message' into 'master'
Fixes long commit messages overflow viewport in file tree ## What does this MR do? Fixes long commit messages breaking the table. It adds back a max-width in `pixels` instead of `%`. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To fix the overflow of the commit message ## Screenshots (if relevant) ![max_width](/uploads/73af2ffbab29bf6e9bbd9287e9e142a0/max_width.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #22544 See merge request !6573
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/tree.scss7
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 11464db5980..b70d81cdd55 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.13.0 (unreleased)
- Use a ConnectionPool for Rails.cache on Sidekiq servers
- Only update issuable labels if they have been changed
- Revoke button in Applications Settings underlines on hover.
+ - Fix Long commit messages overflow viewport in file tree
- Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
- Add organization field to user profile
- Fix resolved discussion display in side-by-side diff view !6575
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 7b6577c513e..41ad10f07bd 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -27,7 +27,12 @@
}
.last-commit {
- @include str-truncated(60%);
+ @include str-truncated(506px);
+
+ @media (min-width: $screen-sm-max) and (max-width: $screen-md-max) {
+ @include str-truncated(450px);
+ }
+
}
.commit-history-link-spacer {