diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-22 13:20:49 +0000 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-11-22 15:31:36 +0000 |
commit | f028fa6fd6b853ded7a8ea3d9f4f1c321e934ee1 (patch) | |
tree | 1ec71d872394474586b2985cde0a89ff4d3ebc32 | |
parent | ed266d4835558b60fbd131579013aaeda5091680 (diff) | |
download | gitlab-ce-f028fa6fd6b853ded7a8ea3d9f4f1c321e934ee1.tar.gz |
Merge branch 'fix-folders-css' into 'master'
Improve readability of environments table
## What does this MR do?
Fix the environments table columns width
## Before
![Screen_Shot_2016-11-21_at_18.13.00](/uploads/1771b0546eb3cb15f4894b719fd44286/Screen_Shot_2016-11-21_at_18.13.00.png)
## After
![Screen_Shot_2016-11-21_at_18.11.18](/uploads/a20194a055b6ec0f7989f0c1499883d3/Screen_Shot_2016-11-21_at_18.11.18.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
- [x] 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?
See merge request !7628
-rw-r--r-- | app/assets/javascripts/environments/components/environment.js.es6 | 12 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 25 |
2 files changed, 31 insertions, 6 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js.es6 b/app/assets/javascripts/environments/components/environment.js.es6 index 1043e516483..c6b38d8447d 100644 --- a/app/assets/javascripts/environments/components/environment.js.es6 +++ b/app/assets/javascripts/environments/components/environment.js.es6 @@ -209,12 +209,12 @@ <table class="table ci-table environments"> <thead> <tr> - <th>Environment</th> - <th>Last deployment</th> - <th>Build</th> - <th>Commit</th> - <th></th> - <th class="hidden-xs"></th> + <th class="environments-name">Environment</th> + <th class="environments-deploy">Last deployment</th> + <th class="environments-build">Build</th> + <th class="environments-commit">Commit</th> + <th class="environments-date"></th> + <th class="hidden-xs environments-actions"></th> </tr> </thead> <tbody> diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index e9ff43a8adb..4b382e8adaf 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -18,6 +18,31 @@ .environments { table-layout: fixed; + .environments-commit, + .environments-actions, + .environments-deploy, + .environments-build, + .environments-date { + position: static; + float: none; + display: table-cell; + } + + .environments-commit, + .environments-actions { + width: 20%; + } + + .environments-deploy, + .environments-build, + .environments-date { + width: 10%; + } + + .environments-name { + width: 30%; + } + .deployment-column { .avatar { float: none; |