diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-23 19:15:11 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-23 19:15:11 +0000 |
| commit | 435468af380d0200c5b133f1c0263daf2c8a7783 (patch) | |
| tree | 41d83e0f576b4c8ec73c245fd7ddeb761b01e635 | |
| parent | ca3759a5ebbf5c29757ae5089f1b3031d6420ab3 (diff) | |
| parent | 1e7cc6f2cb3990f7dea924aaef637ed0b7574c1f (diff) | |
| download | gitlab-ce-435468af380d0200c5b133f1c0263daf2c8a7783.tar.gz | |
Merge branch '29558-pipelines-scroll' into 'master'
Remove overflow hidden from table
Closes #29257
See merge request !10058
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.js | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js b/app/assets/javascripts/commit/pipelines/pipelines_table.js index 832c4b1bd2a..360fb39dc9c 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js @@ -87,7 +87,7 @@ export default Vue.component('pipelines-table', { }, template: ` - <div class="pipelines"> + <div class="content-list pipelines"> <div class="realtime-loading" v-if="isLoading"> <i class="fa fa-spinner fa-spin"></i> </div> @@ -99,7 +99,7 @@ export default Vue.component('pipelines-table', { </h2> </div> - <div class="table-holder pipelines" + <div class="table-holder" v-if="!isLoading && state.pipelines.length > 0"> <pipelines-table-component :pipelines="state.pipelines" diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 73a5da715f2..25be7f408d0 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -18,7 +18,10 @@ .environments-container { .table-holder { width: 100%; - overflow: auto; + + @media (max-width: $screen-sm-max) { + overflow: auto; + } } .table.ci-table { diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 33b38ca6923..772f05feb12 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -15,7 +15,10 @@ .table-holder { width: 100%; - overflow: auto; + + @media (max-width: $screen-sm-max) { + overflow: auto; + } } .commit-title { @@ -99,8 +102,6 @@ @media (max-width: $screen-md-max) { .content-list { - &.pipelines, - &.environments-container, &.builds-content-list { width: 100%; overflow: auto; |