Commit 50aa5143 authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '29987-revert-groups-overview-font-spacing-to-the-old-more-space-efficient-layout-2' into 'master'

Reduce whitespace in group list to keep more items in view

Closes #29987

See merge request gitlab-org/gitlab!21584
parents fe3981bf 9b4493cc
......@@ -44,7 +44,7 @@ export default {
:action="action"
/>
<li v-if="hasMoreChildren" class="group-row">
<a :href="parentGroup.relativePath" class="group-row-contents has-more-items">
<a :href="parentGroup.relativePath" class="group-row-contents has-more-items py-2">
<i class="fa fa-external-link" aria-hidden="true"> </i> {{ moreChildrenStats }}
</a>
</li>
......
......@@ -91,7 +91,7 @@ export default {
<li :id="groupDomId" :class="rowClass" class="group-row" @click.stop="onClickRowGroup">
<div
:class="{ 'project-row-contents': !isGroup }"
class="group-row-contents d-flex align-items-center"
class="group-row-contents d-flex align-items-center py-2"
>
<div class="folder-toggle-wrap append-right-4 d-flex align-items-center">
<item-caret :is-group-open="group.isOpen" />
......@@ -104,7 +104,7 @@ export default {
/>
<div
:class="{ 'd-sm-flex': !group.isChildrenLoading }"
class="avatar-container rect-avatar s40 d-none flex-grow-0 flex-shrink-0 "
class="avatar-container rect-avatar s32 d-none flex-grow-0 flex-shrink-0 "
>
<a :href="group.relativePath" class="no-expand">
<img v-if="hasAvatar" :src="group.avatarUrl" class="avatar s40" />
......
......@@ -47,7 +47,7 @@ export default {
<template>
<li :id="envId" :class="isOpenClass" class="group-row has-children">
<div
class="group-row-contents d-flex justify-content-end align-items-center"
class="group-row-contents d-flex justify-content-end align-items-center py-2"
role="button"
@click.stop="toggleOpen"
>
......
......@@ -63,7 +63,7 @@ export default {
<template>
<li :id="name" class="group-row">
<div class="group-row-contents" role="button" @click="openDetails">
<div class="group-row-contents py-2" role="button" @click="openDetails">
<p class="float-right text-right">
<span>{{ image }}</span
><br />
......
......@@ -382,8 +382,6 @@ table.pipeline-project-metrics tr td {
}
.group-row-contents {
padding: $gl-padding;
&:hover {
border-color: $blue-200;
background-color: $blue-50;
......@@ -410,13 +408,7 @@ table.pipeline-project-metrics tr td {
.title {
margin-top: -$gl-padding-8; // negative margin required for flex-wrap
font-size: $gl-font-size-large;
}
@include media-breakpoint-down(md) {
.title {
font-size: $gl-font-size;
}
font-size: $gl-font-size;
}
&.has-more-items {
......@@ -483,7 +475,6 @@ table.pipeline-project-metrics tr td {
.last-updated {
position: relative;
right: 12px;
min-width: 250px;
text-align: right;
color: $gl-text-color-secondary;
......
......@@ -22,7 +22,7 @@
.form-group
= f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-light'
= f.number_field :session_expire_delay, class: 'form-control'
%span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes')
%span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes.')
= render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
......
---
title: Reducing whitespace in group list to show more on screen and reduce vertical scrolling
merge_request: 21584
author:
type: other
......@@ -4,4 +4,4 @@
.form-group
= form.label :max_personal_access_token_lifetime, _('Maximum allowable lifetime for personal access token (days)'), class: 'label-light'
= form.number_field :max_personal_access_token_lifetime, class: 'form-control input-xs'
%span.form-text.text-muted#max_personal_access_token_lifetime= _('Leave blank for no limit. Once set, existing personal access tokens may be revoked')
%span.form-text.text-muted#max_personal_access_token_lifetime= _('Leave blank for no limit. Once set, existing personal access tokens may be revoked.')
......@@ -8951,7 +8951,7 @@ msgstr ""
msgid "GitLab project export"
msgstr ""
msgid "GitLab restart is required to apply changes"
msgid "GitLab restart is required to apply changes."
msgstr ""
msgid "GitLab single sign on URL"
......@@ -10922,7 +10922,7 @@ msgstr ""
msgid "Leave Admin Mode"
msgstr ""
msgid "Leave blank for no limit. Once set, existing personal access tokens may be revoked"
msgid "Leave blank for no limit. Once set, existing personal access tokens may be revoked."
msgstr ""
msgid "Leave edit mode? All unsaved changes will be lost."
......
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