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
c9f23ffe
Commit
c9f23ffe
authored
Apr 19, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unneeded inlines and remove hand where needed
parent
d0d521f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+7
-3
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+3
-2
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
c9f23ffe
...
@@ -79,10 +79,9 @@
...
@@ -79,10 +79,9 @@
.label-description
{
.label-description
{
display
:
block
;
display
:
block
;
margin-bottom
:
10px
;
.description-text
{
.description-text
{
margin
-bottom
:
$gl-padding
;
margin
:
0
$gl-padding
10px
0
;
}
}
a
{
a
{
...
@@ -135,6 +134,10 @@
...
@@ -135,6 +134,10 @@
.prioritized-labels
&
{
.prioritized-labels
&
{
box-shadow
:
0
1px
2px
$issue-boards-card-shadow
;
box-shadow
:
0
1px
2px
$issue-boards-card-shadow
;
}
}
&
.no-hand
{
cursor
:
auto
;
}
}
}
.btn-action
{
.btn-action
{
...
@@ -286,6 +289,7 @@
...
@@ -286,6 +289,7 @@
.label-actions-list
{
.label-actions-list
{
list-style
:
none
;
list-style
:
none
;
flex-shrink
:
0
;
flex-shrink
:
0
;
padding
:
0
;
}
}
.label-badge
{
.label-badge
{
...
@@ -305,7 +309,7 @@
...
@@ -305,7 +309,7 @@
.label-links
{
.label-links
{
list-style
:
none
;
list-style
:
none
;
padding
:
0
;
padding
:
0
$gl-padding
0
0
;
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
...
...
app/views/shared/_label.html.haml
View file @
c9f23ffe
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
-
show_label_merge_requests_link
=
show_label_issuables_link?
(
label
,
:merge_requests
,
project:
@project
)
-
show_label_merge_requests_link
=
show_label_issuables_link?
(
label
,
:merge_requests
,
project:
@project
)
-
show_label_issues_link
=
show_label_issuables_link?
(
label
,
:issues
,
project:
@project
)
-
show_label_issues_link
=
show_label_issuables_link?
(
label
,
:issues
,
project:
@project
)
%li
.label-list-item
{
id:
label_css_id
,
data:
{
id:
label
.
id
}
}
%li
.label-list-item
{
class:
label
.
priorities
.
present?
?
''
:
'no-hand'
,
id:
label_css_id
,
data:
{
id:
label
.
id
}
}
=
render
"shared/label_row"
,
label:
label
=
render
"shared/label_row"
,
label:
label
%ul
.label-actions-list
.inline
%ul
.label-actions-list
%li
.inline
%li
.inline
.label-badge.label-badge-gray
=
label
.
model_name
.
human
.
titleize
.label-badge.label-badge-gray
=
label
.
model_name
.
human
.
titleize
-
if
can?
(
current_user
,
:admin_label
,
@project
)
-
if
can?
(
current_user
,
:admin_label
,
@project
)
...
@@ -53,5 +53,6 @@
...
@@ -53,5 +53,6 @@
%span
Subscribe at group level
%span
Subscribe at group level
-
else
-
else
%button
.js-subscribe-button.label-subscribe-button.btn.btn-default
{
data:
{
status:
status
,
url:
toggle_subscription_path
}
}
%button
.js-subscribe-button.label-subscribe-button.btn.btn-default
{
data:
{
status:
status
,
url:
toggle_subscription_path
}
}
%span
=
label_subscription_toggle_button_text
(
label
,
@project
)
=
render
'shared/delete_label_modal'
,
label:
label
=
render
'shared/delete_label_modal'
,
label:
label
app/views/shared/_label_row.html.haml
View file @
c9f23ffe
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
show_label_issues_link
=
show_label_issuables_link?
(
label
,
:issues
,
project:
@project
)
-
show_label_issues_link
=
show_label_issuables_link?
(
label
,
:issues
,
project:
@project
)
-
show_label_merge_requests_link
=
show_label_issuables_link?
(
label
,
:merge_requests
,
project:
@project
)
-
show_label_merge_requests_link
=
show_label_issuables_link?
(
label
,
:merge_requests
,
project:
@project
)
.label-row
.inline
.label-row
.label-name
.label-name
=
link_to_label
(
label
,
subject:
@project
,
tooltip:
false
)
=
link_to_label
(
label
,
subject:
@project
,
tooltip:
false
)
.label-description
.label-description
...
...
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