kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '29558-pipelines-scroll' into 'master'

Browse source 
Remove overflow hidden from table

Closes #29257

See merge request !10058
This commit is contained in:
Annabel Dunstone Gray 2017-03-23 19:15:11 +00:00
commit 435468af38
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/commit/pipelines/pipelines_table.js
View file

@ -87,7 +87,7 @@ export default Vue.component('pipelines-table', {
}, },
template: ` template: `
<div class="pipelines"> <div class="content-list pipelines">
<div class="realtime-loading" v-if="isLoading"> <div class="realtime-loading" v-if="isLoading">
<i class="fa fa-spinner fa-spin"></i> <i class="fa fa-spinner fa-spin"></i>
</div> </div>
@ -99,7 +99,7 @@ export default Vue.component('pipelines-table', {
</h2> </h2>
</div> </div>
<div class="table-holder pipelines" <div class="table-holder"
v-if="!isLoading && state.pipelines.length > 0"> v-if="!isLoading && state.pipelines.length > 0">
<pipelines-table-component <pipelines-table-component
:pipelines="state.pipelines" :pipelines="state.pipelines"

3
app/assets/stylesheets/pages/environments.scss
View file

@ -18,8 +18,11 @@
.environments-container { .environments-container {
.table-holder { .table-holder {
width: 100%; width: 100%;
@media (max-width: $screen-sm-max) {
overflow: auto; overflow: auto;
} }
}
.table.ci-table { .table.ci-table {
.environments-actions { .environments-actions {

5
app/assets/stylesheets/pages/pipelines.scss
View file

@ -15,8 +15,11 @@
.table-holder { .table-holder {
width: 100%; width: 100%;
@media (max-width: $screen-sm-max) {
overflow: auto; overflow: auto;
} }
}
.commit-title { .commit-title {
margin: 0; margin: 0;
@ -99,8 +102,6 @@
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
.content-list { .content-list {
&.pipelines,
&.environments-container,
&.builds-content-list { &.builds-content-list {
width: 100%; width: 100%;
overflow: auto; overflow: auto;