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,12 +181,12 @@ module.exports = Vue.component('environment-component', { ...@@ -181,12 +181,12 @@ 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>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
:change="changePage"
:pageInfo="state.paginationInformation">
</table-pagination>
</div> </div>
<table-pagination v-if="state.paginationInformation && state.paginationInformation.totalPages > 1"
:change="changePage"
:pageInfo="state.paginationInformation">
</table-pagination>
</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,112 +15,97 @@ ...@@ -15,112 +15,97 @@
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,
.environments-actions,
.environments-deploy,
.environments-build,
.environments-date {
position: static;
float: none;
display: table-cell;
}
.environments-commit,
.environments-actions {
width: 20%;
}
.environments-date {
width: 10%;
}
.environments-name, .table.ci-table {
.environments-deploy, .environments-actions {
.environments-build { min-width: 200px;
width: 15%;
}
.environment-name,
.environments-build-cell,
.deployment-column {
word-break: break-all;
}
.deployment-column {
.avatar {
float: none;
} }
}
.btn-group { .environments-commit,
.environments-actions {
width: 20%;
}
> a { .environments-date {
color: $gl-text-color-secondary; width: 10%;
} }
svg path { .environments-name,
fill: $gl-text-color-secondary; .environments-deploy,
.environments-build {
width: 15%;
} }
.dropdown { .deployment-column {
outline: none; > span {
word-break: break-all;
}
.avatar {
float: none;
}
} }
}
.btn-group {
.commit-title { > a {
margin: 0; color: $gl-text-color-secondary;
} }
.avatar-image-container { svg path {
text-decoration: none; fill: $gl-text-color-secondary;
} }
.icon-play { .dropdown {
height: 13px; outline: none;
width: 12px; }
} }
.external-url, .commit-title {
.dropdown-new { margin: 0;
color: $gl-text-color-secondary; }
}
.dropdown-menu { .avatar-image-container {
text-decoration: none;
}
.fa { .icon-play {
margin-right: 6px; height: 13px;
color: $gl-text-color-secondary; width: 12px;
} }
}
.build-link, .external-url,
.branch-name { .dropdown-new {
color: $gl-text-color; color: $gl-text-color-secondary;
} }
.stop-env-link, .dropdown-menu {
.external-url { .fa {
color: $gl-text-color-secondary; margin-right: 6px;
color: $gl-text-color-secondary;
}
}
.stop-env-icon { .build-link,
font-size: 14px; .branch-name {
color: $gl-text-color;
} }
}
.deployment { .stop-env-link,
.build-column { .external-url {
color: $gl-text-color-secondary;
.stop-env-icon {
font-size: 14px;
}
}
.deployment .build-column {
.build-link { .build-link {
color: $gl-text-color; color: $gl-text-color;
} }
...@@ -129,34 +114,32 @@ ...@@ -129,34 +114,32 @@
float: none; float: none;
} }
} }
}
.folder-icon {
margin-right: 3px;
color: $gl-text-color-secondary;
display: inline-block;
.fa:nth-child(1) { .folder-icon {
margin-right: 3px; margin-right: 3px;
color: $gl-text-color-secondary;
display: inline-block;
.fa:nth-child(1) {
margin-right: 3px;
}
} }
}
.folder-name { .folder-name {
cursor: pointer; cursor: pointer;
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; }
}
.branch-commit { .branch-commit {
.commit-id { .commit-id {
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