diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 15:10:03 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 15:11:42 +0000 |
| commit | 5c70003df9898fea8a9225d64470f3337a8cf591 (patch) | |
| tree | 5c6e2e545a625cb49069f1ef77699b34e407ebbc | |
| parent | b616a389efdc65019218b1a5bb8a063369ee9dc8 (diff) | |
| download | gitlab-ce-20450-fix-ujs-actions-part-2.tar.gz | |
Reuse CSS in dropdown20450-fix-ujs-actions-part-2
| -rw-r--r-- | app/assets/javascripts/pipelines/components/pipelines_actions.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 28 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 5 |
3 files changed, 21 insertions, 14 deletions
diff --git a/app/assets/javascripts/pipelines/components/pipelines_actions.js b/app/assets/javascripts/pipelines/components/pipelines_actions.js index 5556265820c..184de347e15 100644 --- a/app/assets/javascripts/pipelines/components/pipelines_actions.js +++ b/app/assets/javascripts/pipelines/components/pipelines_actions.js @@ -44,7 +44,7 @@ export default { <div class="btn-group" v-if="actions"> <button type="button" - class="dropdown-toggle btn btn-default has-tooltip js-pipeline-dropdown-manual-actions" + class="dropdown btn btn-default has-tooltip js-pipeline-dropdown-manual-actions" title="Manual job" data-toggle="dropdown" data-placement="top" diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 73a5da715f2..03dfba82d8d 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -15,6 +15,26 @@ padding-top: 20px; } +.ci-table .no-btn { + border: none; + background: none; + outline: none; + width: 100%; + text-align: left; + + .icon-play { + height: 13px; + width: 12px; + margin-right: 5px; + position: relative; + top: 2px; + } + + span { + color: $gl-text-color-secondary; + } +} + .environments-container { .table-holder { width: 100%; @@ -141,14 +161,6 @@ margin-right: 0; } } - - .no-btn { - border: none; - background: none; - outline: none; - width: 100%; - text-align: left; - } } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 20eabc83142..959fc5d838b 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -72,11 +72,6 @@ color: $gl-text-color-secondary; font-size: 14px; } - - svg, - .fa { - margin-right: 0; - } } .btn-group { |