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
2b6e5b85
Commit
2b6e5b85
authored
Oct 01, 2020
by
Miguel Rincon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '241990-clean-up-labels-css' into 'master'
Clean up labels css See merge request gitlab-org/gitlab!43590
parents
b08e0e74
6787c38f
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
29 additions
and
100 deletions
+29
-100
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+0
-70
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+2
-2
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+2
-2
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+2
-2
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+1
-1
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+18
-19
app/views/shared/milestones/_milestone.html.haml
app/views/shared/milestones/_milestone.html.haml
+2
-2
ee/app/views/shared/_label_row_epics_link.html.haml
ee/app/views/shared/_label_row_epics_link.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
2b6e5b85
...
...
@@ -134,11 +134,6 @@
}
}
.label-description-wrapper
{
margin-right
:
8px
;
margin-left
:
8px
;
}
.prioritized-labels
{
margin-bottom
:
30px
;
...
...
@@ -201,10 +196,6 @@
}
}
.label-options-toggle
{
width
:
100%
;
}
.label-subscription
{
vertical-align
:
middle
;
...
...
@@ -276,35 +267,6 @@
font-size
:
$label-font-size
;
}
.label-badge-blue
{
background-color
:
$theme-blue-100
;
}
.label-badge-gray
{
background-color
:
$gray-50
;
}
.label-links
{
list-style
:
none
;
margin
:
0
;
padding
:
0
;
white-space
:
nowrap
;
}
.label-link-item
{
padding
:
0
;
}
.label-description
{
.description-text
{
margin-bottom
:
10px
;
.admin-labels
&
{
margin-bottom
:
0
;
}
}
}
.label-list-item
{
.
content-list
&
:
:
before
,
.
content-list
&::
after
{
...
...
@@ -313,21 +275,12 @@
.label-name
{
width
:
200px
;
flex-shrink
:
0
;
.gl-label
{
line-height
:
$gl-line-height
;
}
}
.label-description
{
flex-grow
:
1
;
a
{
color
:
$blue-600
;
}
}
.label
{
padding
:
4px
$grid-size
;
font-size
:
$label-font-size
;
...
...
@@ -382,31 +335,8 @@
text-align
:
left
;
}
.label-links
{
white-space
:
normal
;
}
.label-description
{
order
:
3
;
width
:
100%
;
>
.label-description-wrapper
{
margin-left
:
0
;
margin-right
:
0
;
}
}
}
}
@media
(
max-width
:
910px
)
{
.priority-badge
{
display
:
block
;
width
:
100%
;
margin-left
:
0
;
margin-top
:
$gl-padding
;
.label-badge
{
display
:
inline-block
;
}
}
}
...
...
app/helpers/labels_helper.rb
View file @
2b6e5b85
...
...
@@ -36,11 +36,11 @@ module LabelsHelper
# link_to_label(label) { "My Custom Label Text" }
#
# Returns a String
def
link_to_label
(
label
,
type: :issue
,
tooltip:
true
,
small:
false
,
&
block
)
def
link_to_label
(
label
,
type: :issue
,
tooltip:
true
,
small:
false
,
css_class:
nil
,
&
block
)
link
=
label
.
filter_path
(
type:
type
)
if
block_given?
link_to
link
,
&
block
link_to
link
,
class:
css_class
,
&
block
else
render_label
(
label
,
link:
link
,
tooltip:
tooltip
,
small:
small
)
end
...
...
app/views/groups/labels/index.html.haml
View file @
2b6e5b85
...
...
@@ -27,5 +27,5 @@
=
render
'shared/empty_states/labels'
%template
#js-badge-item-template
%li
.
label-link-item.
js-priority-badge.inline.gl-ml-3
.label-badge.
label-badge-blue
=
_
(
'Prioritized label'
)
%li
.js-priority-badge.inline.gl-ml-3
.label-badge.
gl-bg-blue-50
=
_
(
'Prioritized label'
)
app/views/projects/labels/index.html.haml
View file @
2b6e5b85
...
...
@@ -52,5 +52,5 @@
=
render
'shared/empty_states/labels'
%template
#js-badge-item-template
%li
.
label-link-item.
js-priority-badge.inline.gl-ml-3
.label-badge.
label-badge-blue
=
_
(
'Prioritized label'
)
%li
.js-priority-badge.inline.gl-ml-3
.label-badge.
gl-bg-blue-50
=
_
(
'Prioritized label'
)
app/views/shared/_label.html.haml
View file @
2b6e5b85
...
...
@@ -11,7 +11,7 @@
%ul
.label-actions-list
-
if
@project
%li
.inline
.label-badge.
label-badge-gray
=
label
.
model_name
.
human
.
capitalize
.label-badge.
gl-bg-gray-50
=
label
.
model_name
.
human
.
capitalize
-
if
can?
(
current_user
,
:admin_label
,
@project
)
%li
.inline.js-toggle-priority
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
dom_id:
dom_id
(
label
),
type:
label
.
type
}
}
...
...
app/views/shared/_label_row.html.haml
View file @
2b6e5b85
...
...
@@ -3,23 +3,22 @@
-
show_label_issues_link
=
subject_or_group_defined
&&
show_label_issuables_link?
(
label
,
:issues
)
-
show_label_merge_requests_link
=
subject_or_group_defined
&&
show_label_issuables_link?
(
label
,
:merge_requests
)
.label-name
.label-name
.gl-flex-shrink-0.gl-mr-3
=
render_label
(
label
,
tooltip:
false
)
.label-description
.label-description-wrapper
-
if
label
.
description
.
present?
.description-text
=
markdown_field
(
label
,
:description
)
%ul
.label-links
-
if
show_label_issues_link
%li
.label-link-item.inline
=
link_to_label
(
label
)
{
_
(
'Issues'
)
}
-
if
show_label_merge_requests_link
·
%li
.label-link-item.inline
=
link_to_label
(
label
,
type: :merge_request
)
{
_
(
'Merge requests'
)
}
-
if
force_priority
·
%li
.label-link-item.priority-badge.js-priority-badge.inline.gl-ml-3
.label-badge.label-badge-blue
=
_
(
'Prioritized label'
)
=
render_if_exists
'shared/label_row_epics_link'
,
label:
label
.label-description.gl-flex-grow-1.gl-mr-3.gl-w-full
-
if
label
.
description
.
present?
.description-text.gl-mb-3
=
markdown_field
(
label
,
:description
)
%ul
.label-links.gl-m-0.gl-p-0.gl-white-space-nowrap
-
if
show_label_issues_link
%li
.inline.gl-text-blue-600
=
link_to_label
(
label
,
css_class:
'gl-text-blue-600!'
)
{
_
(
'Issues'
)
}
-
if
show_label_merge_requests_link
·
%li
.inline.gl-text-blue-600
=
link_to_label
(
label
,
type: :merge_request
,
css_class:
'gl-text-blue-600!'
)
{
_
(
'Merge requests'
)
}
=
render_if_exists
'shared/label_row_epics_link'
,
label:
label
-
if
force_priority
·
%li
.js-priority-badge.inline.gl-ml-3
.label-badge.gl-bg-blue-50
=
_
(
'Prioritized label'
)
app/views/shared/milestones/_milestone.html.haml
View file @
2b6e5b85
...
...
@@ -29,10 +29,10 @@
%div
=
render
(
'shared/milestone_expired'
,
milestone:
milestone
)
-
if
milestone
.
group_milestone?
.label-badge.
label-badge-blue
.d-inline-block
.label-badge.
gl-bg-blue-50
.d-inline-block
=
milestone
.
group
.
full_name
-
if
milestone
.
project_milestone?
.label-badge.
label-badge-gray
.d-inline-block
.label-badge.
gl-bg-gray-50
.d-inline-block
=
milestone
.
project
.
full_name
.col-sm-4.milestone-progress
...
...
ee/app/views/shared/_label_row_epics_link.html.haml
View file @
2b6e5b85
...
...
@@ -2,5 +2,5 @@
-
if
show_label_epics_link
·
%li
.
label-link-item.
inline
=
link_to
'Epics'
,
group_epics_path
(
@group
,
label_name
:[
label
.
name
])
%li
.inline
=
link_to
'Epics'
,
group_epics_path
(
@group
,
label_name
:[
label
.
name
])
,
class:
'gl-text-blue-600!'
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