diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-12-16 19:54:27 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-16 19:54:27 +0000 |
commit | b3d5ed62de3519b42dbcef2973c189467588fc36 (patch) | |
tree | 003316befd89ac222cd78d421923354e27cb660b /app | |
parent | b1120fc3e702daac001d000263eac79f4629b595 (diff) | |
parent | df6c1b84a842d6dc54b27e396b60ffd4d7723c4a (diff) | |
download | gitlab-ce-b3d5ed62de3519b42dbcef2973c189467588fc36.tar.gz |
Merge branch '25207-text-overflow-env-table' into 'master'
Prevent enviroment table to overflow when name has underscores
## What does this MR do?
Improves columns width
Prevents columns content to overflow to other columns
## Screenshots
![Screen_Shot_2016-12-16_at_12.27.14](/uploads/69332e43087bf2bf3a546934700a6b31/Screen_Shot_2016-12-16_at_12.27.14.png)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 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?
Closes #25207
See merge request !8142
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/environments/components/environment_item.js.es6 | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6 index 2e046a60146..4674d5202e6 100644 --- a/app/assets/javascripts/environments/components/environment_item.js.es6 +++ b/app/assets/javascripts/environments/components/environment_item.js.es6 @@ -449,7 +449,7 @@ </span> </td> - <td> + <td class="environments-build-cell"> <a v-if="shouldRenderBuildName" class="build-link" :href="model.last_deployment.deployable.build_path"> diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 92dd9885ab8..3d60426de01 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -30,19 +30,25 @@ display: table-cell; } + .environments-name, .environments-commit, .environments-actions { width: 20%; } - .environments-deploy, - .environments-build, .environments-date { width: 10%; } - .environments-name { - width: 30%; + .environments-deploy, + .environments-build { + width: 15%; + } + + .environment-name, + .environments-build-cell, + .deployment-column { + word-break: break-all; } .deployment-column { |