diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 10:02:42 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 10:02:42 +0000 |
commit | 08a484e2b179a0f4a75df3cda4d713dee6f82725 (patch) | |
tree | 27349365b76336fe6c78083e5545198866127343 /app/assets | |
parent | 5be8be7d1965476ced2841dd4c3592ba8db84423 (diff) | |
parent | edf9620bfb1ceca4d90303028012b7fa6672fe9f (diff) | |
download | gitlab-ci-08a484e2b179a0f4a75df3cda4d713dee6f82725.tar.gz |
Merge branch 'project-runners-page' into 'master'
Improved runner page for project
Tasks:
- [x] Ability to add runner to several projects
- [x] Render runner status (online, offline, disabled)
- [x] Two column style of page: specific and shared runners
- [x] Toggle shared runners for project
- [x] Fix tests
- [x] Write tests for new functionality
- [x] Remove runner instead disabling if it is last project for this runner
- [x] Cleanup and refactor code
- [x] Improve query for authorised runners (reject duplicates)
- [x] Improve UI based on https://dev.gitlab.org/gitlab/gitlab-ci/issues/185#note_41582
See merge request !61
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/generic/common.scss | 32 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/runners.scss | 22 |
2 files changed, 54 insertions, 0 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 1b6a90f..0c3d058 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -74,3 +74,35 @@ line-height: 1.6; } } + +/** light list with border-bottom between li **/ +ul.bordered-list { + margin: 5px 0px; + padding: 0px; + li { + padding: 5px 0; + border-bottom: 1px solid #EEE; + overflow: hidden; + display: block; + margin: 0px; + &:last-child { border:none } + &.active { + background: #f9f9f9; + a { font-weight: bold; } + } + } + + &.top-list { + li:first-child { + padding-top: 0; + h4, h5 { + margin-top: 0; + } + } + } +} + +.underlined-title { + border-bottom: 1px solid #ccc; + padding: 0 0 3px 3px; +} diff --git a/app/assets/stylesheets/sections/runners.scss b/app/assets/stylesheets/sections/runners.scss index ae098fe..a9111a7 100644 --- a/app/assets/stylesheets/sections/runners.scss +++ b/app/assets/stylesheets/sections/runners.scss @@ -10,3 +10,25 @@ background: #3498db; } } + +.runner-status-online { + color: green; +} + +.runner-status-offline { + color: gray; +} + +.runner-status-paused { + color: red; +} + +.runner { + .btn { + padding: 1px 6px; + } + + h4 { + font-weight: normal; + } +} |