diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 15:08:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-12 15:08:30 +0300 |
commit | cb3b9f9243555b0c26145e2992a9f01f7fa47bf5 (patch) | |
tree | 5fea3438f0c21330e2fba8c958cbc505810ab990 /app/assets | |
parent | 71d34aac9a0fae0507c265929767422391816b01 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
7 files changed, 16 insertions, 24 deletions
diff --git a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue index d70ade36fe9..1283db5c8eb 100644 --- a/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue +++ b/app/assets/javascripts/ci_secure_files/components/secure_files_list.vue @@ -41,10 +41,6 @@ export default { label: __('Filename'), }, { - key: 'permissions', - label: __('Permissions'), - }, - { key: 'created_at', label: __('Uploaded'), }, @@ -112,10 +108,6 @@ export default { {{ item.name }} </template> - <template #cell(permissions)="{ item }"> - {{ item.permissions }} - </template> - <template #cell(created_at)="{ item }"> <timeago-tooltip :time="item.created_at" /> </template> diff --git a/app/assets/javascripts/clusters_list/components/agent_table.vue b/app/assets/javascripts/clusters_list/components/agent_table.vue index 2decdb5307b..b878a6835b2 100644 --- a/app/assets/javascripts/clusters_list/components/agent_table.vue +++ b/app/assets/javascripts/clusters_list/components/agent_table.vue @@ -165,8 +165,6 @@ export default { :items="agentsList" :fields="fields" stacked="md" - head-variant="white" - thead-class="gl-border-b-solid gl-border-b-2 gl-border-b-gray-100" class="gl-mb-4!" data-testid="cluster-agent-list-table" > diff --git a/app/assets/javascripts/clusters_list/components/clusters.vue b/app/assets/javascripts/clusters_list/components/clusters.vue index 02eac5a6268..fb3c8ff66b0 100644 --- a/app/assets/javascripts/clusters_list/components/clusters.vue +++ b/app/assets/javascripts/clusters_list/components/clusters.vue @@ -235,8 +235,6 @@ export default { :fields="fields" fixed stacked="md" - head-variant="white" - thead-class="gl-border-b-solid gl-border-b-2 gl-border-b-gray-100" class="qa-clusters-table gl-mb-4!" data-testid="cluster_list_table" > diff --git a/app/assets/javascripts/cycle_analytics/components/stage_table.vue b/app/assets/javascripts/cycle_analytics/components/stage_table.vue index 6a45969fd1a..e4236968efc 100644 --- a/app/assets/javascripts/cycle_analytics/components/stage_table.vue +++ b/app/assets/javascripts/cycle_analytics/components/stage_table.vue @@ -191,9 +191,7 @@ export default { /> <gl-table v-else - head-variant="white" stacked="lg" - thead-class="border-bottom" show-empty :sort-by.sync="sort" :sort-direction.sync="direction" diff --git a/app/assets/javascripts/diffs/components/compare_dropdown_layout.vue b/app/assets/javascripts/diffs/components/compare_dropdown_layout.vue index 6c5973b7c28..fd219a7d00f 100644 --- a/app/assets/javascripts/diffs/components/compare_dropdown_layout.vue +++ b/app/assets/javascripts/diffs/components/compare_dropdown_layout.vue @@ -24,7 +24,12 @@ export default { </script> <template> - <gl-dropdown :text="selectedVersionName" data-qa-selector="dropdown_content"> + <gl-dropdown + :text="selectedVersionName" + data-qa-selector="dropdown_content" + size="small" + category="tertiary" + > <template v-for="version in versions"> <gl-dropdown-divider v-if="version.addDivider" :key="version.id" /> <gl-dropdown-item diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index 0b97ce7e33e..14d628e455c 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -232,12 +232,10 @@ export default { v-bind="tableAttrs.table" class="members-table" data-testid="members-table" - head-variant="white" stacked="lg" :fields="filteredAndModifiedFields" :items="members" primary-key="id" - thead-class="border-bottom" :empty-text="__('No members found')" show-empty :tbody-tr-attr="tbodyTrAttr" diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss index bef7ecc8a7e..269ce4042fc 100644 --- a/app/assets/stylesheets/page_bundles/merge_requests.scss +++ b/app/assets/stylesheets/page_bundles/merge_requests.scss @@ -702,18 +702,21 @@ $tabs-holder-z-index: 250; .mr-version-dropdown, .mr-version-compare-dropdown { - margin: 0 0.5rem; + margin: 0 $gl-spacing-scale-1; + + .dropdown-toggle.gl-button { + padding: $gl-spacing-scale-2 2px $gl-spacing-scale-2 $gl-spacing-scale-2; + font-weight: $gl-font-weight-bold; + + .gl-button-icon { + margin-left: $gl-spacing-scale-1; + } + } } .dropdown-title { color: var(--gl-text-color, $gl-text-color); } - - // Shortening button height by 1px to make compare-versions - // header 56px and fit into our 8px design grid - .btn { - height: 34px; - } } .mr-section-container .resize-observer > object { |