Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
9b4493cc
Commit
9b4493cc
authored
Jan 23, 2020
by
Jeremy Elder
Committed by
Phil Hughes
Jan 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce whitespace in group list to keep more items in view
parent
fe3981bf
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
19 deletions
+15
-19
app/assets/javascripts/groups/components/group_folder.vue
app/assets/javascripts/groups/components/group_folder.vue
+1
-1
app/assets/javascripts/groups/components/group_item.vue
app/assets/javascripts/groups/components/group_item.vue
+2
-2
app/assets/javascripts/serverless/components/environment_row.vue
...ets/javascripts/serverless/components/environment_row.vue
+1
-1
app/assets/javascripts/serverless/components/function_row.vue
...assets/javascripts/serverless/components/function_row.vue
+1
-1
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+1
-10
app/views/admin/application_settings/_account_and_limit.html.haml
...s/admin/application_settings/_account_and_limit.html.haml
+1
-1
changelogs/unreleased/29987-revert-groups-overview-font-spacing-to-the-old-more-space-efficient.yml
...overview-font-spacing-to-the-old-more-space-efficient.yml
+5
-0
ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml
...ttings/_personal_access_token_expiration_policy.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+2
-2
No files found.
app/assets/javascripts/groups/components/group_folder.vue
View file @
9b4493cc
...
@@ -44,7 +44,7 @@ export default {
...
@@ -44,7 +44,7 @@ export default {
:action=
"action"
:action=
"action"
/>
/>
<li
v-if=
"hasMoreChildren"
class=
"group-row"
>
<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
}}
<i
class=
"fa fa-external-link"
aria-hidden=
"true"
>
</i>
{{
moreChildrenStats
}}
</a>
</a>
</li>
</li>
...
...
app/assets/javascripts/groups/components/group_item.vue
View file @
9b4493cc
...
@@ -91,7 +91,7 @@ export default {
...
@@ -91,7 +91,7 @@ export default {
<li
:id=
"groupDomId"
:class=
"rowClass"
class=
"group-row"
@
click.stop=
"onClickRowGroup"
>
<li
:id=
"groupDomId"
:class=
"rowClass"
class=
"group-row"
@
click.stop=
"onClickRowGroup"
>
<div
<div
:class=
"
{ 'project-row-contents': !isGroup }"
: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"
>
<div
class=
"folder-toggle-wrap append-right-4 d-flex align-items-center"
>
<item-caret
:is-group-open=
"group.isOpen"
/>
<item-caret
:is-group-open=
"group.isOpen"
/>
...
@@ -104,7 +104,7 @@ export default {
...
@@ -104,7 +104,7 @@ export default {
/>
/>
<div
<div
:class=
"
{ 'd-sm-flex': !group.isChildrenLoading }"
:class=
"
{ 'd-sm-flex': !group.isChildrenLoading }"
class="avatar-container rect-avatar s
40
d-none flex-grow-0 flex-shrink-0 "
class="avatar-container rect-avatar s
32
d-none flex-grow-0 flex-shrink-0 "
>
>
<a
:href=
"group.relativePath"
class=
"no-expand"
>
<a
:href=
"group.relativePath"
class=
"no-expand"
>
<img
v-if=
"hasAvatar"
:src=
"group.avatarUrl"
class=
"avatar s40"
/>
<img
v-if=
"hasAvatar"
:src=
"group.avatarUrl"
class=
"avatar s40"
/>
...
...
app/assets/javascripts/serverless/components/environment_row.vue
View file @
9b4493cc
...
@@ -47,7 +47,7 @@ export default {
...
@@ -47,7 +47,7 @@ export default {
<
template
>
<
template
>
<li
:id=
"envId"
:class=
"isOpenClass"
class=
"group-row has-children"
>
<li
:id=
"envId"
:class=
"isOpenClass"
class=
"group-row has-children"
>
<div
<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"
role=
"button"
@
click.stop=
"toggleOpen"
@
click.stop=
"toggleOpen"
>
>
...
...
app/assets/javascripts/serverless/components/function_row.vue
View file @
9b4493cc
...
@@ -63,7 +63,7 @@ export default {
...
@@ -63,7 +63,7 @@ export default {
<
template
>
<
template
>
<li
:id=
"name"
class=
"group-row"
>
<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"
>
<p
class=
"float-right text-right"
>
<span>
{{
image
}}
</span
<span>
{{
image
}}
</span
><br
/>
><br
/>
...
...
app/assets/stylesheets/pages/groups.scss
View file @
9b4493cc
...
@@ -382,8 +382,6 @@ table.pipeline-project-metrics tr td {
...
@@ -382,8 +382,6 @@ table.pipeline-project-metrics tr td {
}
}
.group-row-contents
{
.group-row-contents
{
padding
:
$gl-padding
;
&
:hover
{
&
:hover
{
border-color
:
$blue-200
;
border-color
:
$blue-200
;
background-color
:
$blue-50
;
background-color
:
$blue-50
;
...
@@ -410,13 +408,7 @@ table.pipeline-project-metrics tr td {
...
@@ -410,13 +408,7 @@ table.pipeline-project-metrics tr td {
.title
{
.title
{
margin-top
:
-
$gl-padding-8
;
// negative margin required for flex-wrap
margin-top
:
-
$gl-padding-8
;
// negative margin required for flex-wrap
font-size
:
$gl-font-size-large
;
font-size
:
$gl-font-size
;
}
@include
media-breakpoint-down
(
md
)
{
.title
{
font-size
:
$gl-font-size
;
}
}
}
&
.has-more-items
{
&
.has-more-items
{
...
@@ -483,7 +475,6 @@ table.pipeline-project-metrics tr td {
...
@@ -483,7 +475,6 @@ table.pipeline-project-metrics tr td {
.last-updated
{
.last-updated
{
position
:
relative
;
position
:
relative
;
right
:
12px
;
min-width
:
250px
;
min-width
:
250px
;
text-align
:
right
;
text-align
:
right
;
color
:
$gl-text-color-secondary
;
color
:
$gl-text-color-secondary
;
...
...
app/views/admin/application_settings/_account_and_limit.html.haml
View file @
9b4493cc
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
.form-group
.form-group
=
f
.
label
:session_expire_delay
,
_
(
'Session duration (minutes)'
),
class:
'label-light'
=
f
.
label
:session_expire_delay
,
_
(
'Session duration (minutes)'
),
class:
'label-light'
=
f
.
number_field
:session_expire_delay
,
class:
'form-control'
=
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
=
render_if_exists
'admin/application_settings/personal_access_token_expiration_policy'
,
form:
f
...
...
changelogs/unreleased/29987-revert-groups-overview-font-spacing-to-the-old-more-space-efficient.yml
0 → 100644
View file @
9b4493cc
---
title
:
Reducing whitespace in group list to show more on screen and reduce vertical scrolling
merge_request
:
21584
author
:
type
:
other
ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml
View file @
9b4493cc
...
@@ -4,4 +4,4 @@
...
@@ -4,4 +4,4 @@
.form-group
.form-group
=
form
.
label
:max_personal_access_token_lifetime
,
_
(
'Maximum allowable lifetime for personal access token (days)'
),
class:
'label-light'
=
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'
=
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
.
'
)
locale/gitlab.pot
View file @
9b4493cc
...
@@ -8951,7 +8951,7 @@ msgstr ""
...
@@ -8951,7 +8951,7 @@ msgstr ""
msgid "GitLab project export"
msgid "GitLab project export"
msgstr ""
msgstr ""
msgid "GitLab restart is required to apply changes"
msgid "GitLab restart is required to apply changes
.
"
msgstr ""
msgstr ""
msgid "GitLab single sign on URL"
msgid "GitLab single sign on URL"
...
@@ -10922,7 +10922,7 @@ msgstr ""
...
@@ -10922,7 +10922,7 @@ msgstr ""
msgid "Leave Admin Mode"
msgid "Leave Admin Mode"
msgstr ""
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 ""
msgstr ""
msgid "Leave edit mode? All unsaved changes will be lost."
msgid "Leave edit mode? All unsaved changes will be lost."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment