Commit b937e03d authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '28661-ci-tables-buttons' into 'master'

Fix CI tables action buttons are hidden is smaller screens

Closes #28661

See merge request !9578
parents 4aa66428 4dce1ad6
...@@ -145,7 +145,7 @@ module.exports = Vue.component('environment-component', { ...@@ -145,7 +145,7 @@ module.exports = Vue.component('environment-component', {
</div> </div>
</div> </div>
<div class="environments-container"> <div class="content-list environments-container">
<div class="environments-list-loading text-center" v-if="isLoading"> <div class="environments-list-loading text-center" v-if="isLoading">
<i class="fa fa-spinner fa-spin"></i> <i class="fa fa-spinner fa-spin"></i>
</div> </div>
...@@ -181,6 +181,7 @@ module.exports = Vue.component('environment-component', { ...@@ -181,6 +181,7 @@ module.exports = Vue.component('environment-component', {
:terminal-icon-svg="terminalIconSvg" :terminal-icon-svg="terminalIconSvg"
:commit-icon-svg="commitIconSvg"> :commit-icon-svg="commitIconSvg">
</environment-table> </environment-table>
</div>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1" <table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
:change="changePage" :change="changePage"
...@@ -188,6 +189,5 @@ module.exports = Vue.component('environment-component', { ...@@ -188,6 +189,5 @@ module.exports = Vue.component('environment-component', {
</table-pagination> </table-pagination>
</div> </div>
</div> </div>
</div>
`, `,
}); });
...@@ -503,7 +503,7 @@ module.exports = Vue.component('environment-item', { ...@@ -503,7 +503,7 @@ module.exports = Vue.component('environment-item', {
</span> </span>
</td> </td>
<td class="hidden-xs environments-actions"> <td class="environments-actions">
<div v-if="!model.isFolder" class="btn-group pull-right" role="group"> <div v-if="!model.isFolder" class="btn-group pull-right" role="group">
<actions-component v-if="hasManualActions && canCreateDeployment" <actions-component v-if="hasManualActions && canCreateDeployment"
:play-icon-svg="playIconSvg" :play-icon-svg="playIconSvg"
......
...@@ -46,7 +46,7 @@ module.exports = Vue.component('environment-table-component', { ...@@ -46,7 +46,7 @@ module.exports = Vue.component('environment-table-component', {
}, },
template: ` template: `
<table class="table ci-table environments"> <table class="table ci-table">
<thead> <thead>
<tr> <tr>
<th class="environments-name">Environment</th> <th class="environments-name">Environment</th>
...@@ -54,7 +54,7 @@ module.exports = Vue.component('environment-table-component', { ...@@ -54,7 +54,7 @@ module.exports = Vue.component('environment-table-component', {
<th class="environments-build">Job</th> <th class="environments-build">Job</th>
<th class="environments-commit">Commit</th> <th class="environments-commit">Commit</th>
<th class="environments-date">Updated</th> <th class="environments-date">Updated</th>
<th class="hidden-xs environments-actions"></th> <th class="environments-actions"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
}, },
}, },
template: ` template: `
<td class="pipeline-actions hidden-xs"> <td class="pipeline-actions">
<div class="pull-right"> <div class="pull-right">
<div class="btn-group"> <div class="btn-group">
<div class="btn-group" v-if="actions"> <div class="btn-group" v-if="actions">
......
...@@ -44,7 +44,7 @@ require('./pipelines_table_row'); ...@@ -44,7 +44,7 @@ require('./pipelines_table_row');
<th class="js-pipeline-commit pipeline-commit">Commit</th> <th class="js-pipeline-commit pipeline-commit">Commit</th>
<th class="js-pipeline-stages pipeline-stages">Stages</th> <th class="js-pipeline-stages pipeline-stages">Stages</th>
<th class="js-pipeline-date pipeline-date"></th> <th class="js-pipeline-date pipeline-date"></th>
<th class="js-pipeline-actions pipeline-actions hidden-xs"></th> <th class="js-pipeline-actions pipeline-actions"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -15,24 +15,15 @@ ...@@ -15,24 +15,15 @@
padding-top: 20px; padding-top: 20px;
} }
@media (max-width: $screen-xs-max) { .environments-container {
.environments-container { .table-holder {
width: 100%; width: 100%;
overflow: auto; overflow: auto;
} }
}
.environments {
table-layout: fixed;
.environments-commit, .table.ci-table {
.environments-actions, .environments-actions {
.environments-deploy, min-width: 200px;
.environments-build,
.environments-date {
position: static;
float: none;
display: table-cell;
} }
.environments-commit, .environments-commit,
...@@ -50,13 +41,11 @@ ...@@ -50,13 +41,11 @@
width: 15%; width: 15%;
} }
.environment-name,
.environments-build-cell,
.deployment-column { .deployment-column {
> span {
word-break: break-all; word-break: break-all;
} }
.deployment-column {
.avatar { .avatar {
float: none; float: none;
} }
...@@ -77,7 +66,6 @@ ...@@ -77,7 +66,6 @@
} }
} }
.commit-title { .commit-title {
margin: 0; margin: 0;
} }
...@@ -97,7 +85,6 @@ ...@@ -97,7 +85,6 @@
} }
.dropdown-menu { .dropdown-menu {
.fa { .fa {
margin-right: 6px; margin-right: 6px;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
...@@ -118,9 +105,7 @@ ...@@ -118,9 +105,7 @@
} }
} }
.deployment { .deployment .build-column {
.build-column {
.build-link { .build-link {
color: $gl-text-color; color: $gl-text-color;
} }
...@@ -129,7 +114,6 @@ ...@@ -129,7 +114,6 @@
float: none; float: none;
} }
} }
}
.folder-icon { .folder-icon {
margin-right: 3px; margin-right: 3px;
...@@ -146,9 +130,7 @@ ...@@ -146,9 +130,7 @@
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
display: inline-block; display: inline-block;
} }
}
.table.ci-table.environments {
.icon-container { .icon-container {
width: 20px; width: 20px;
text-align: center; text-align: center;
...@@ -159,4 +141,5 @@ ...@@ -159,4 +141,5 @@
margin-right: 0; margin-right: 0;
} }
} }
}
} }
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
@media (max-width: $screen-md-max) { @media (max-width: $screen-md-max) {
.content-list { .content-list {
&.pipelines, &.pipelines,
&.environments-container,
&.builds-content-list { &.builds-content-list {
width: 100%; width: 100%;
overflow: auto; overflow: auto;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment