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
af6aaf39
Commit
af6aaf39
authored
Jan 22, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change delete notice; update mobile styles
parent
bb8490b0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
17 deletions
+31
-17
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+19
-5
app/controllers/groups/labels_controller.rb
app/controllers/groups/labels_controller.rb
+1
-1
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+11
-11
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
af6aaf39
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
width
:
200px
;
width
:
200px
;
margin-left
:
$gl-padding
*
2
;
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
...
@@ -78,7 +79,7 @@
...
@@ -78,7 +79,7 @@
width
:
100px
;
width
:
100px
;
margin-left
:
10px
;
margin-left
:
10px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
vertical-align
:
middle
;
vertical-align
:
top
;
}
}
}
}
...
@@ -86,6 +87,10 @@
...
@@ -86,6 +87,10 @@
display
:
block
;
display
:
block
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
.description-text
{
margin-bottom
:
$gl-padding
;
}
a
{
a
{
color
:
$blue-600
;
color
:
$blue-600
;
}
}
...
@@ -118,9 +123,11 @@
...
@@ -118,9 +123,11 @@
}
}
.manage-labels-list
{
.manage-labels-list
{
@media
(
min-width
:
$screen-md-min
)
{
&
.content-list
li
{
&
.content-list
li
{
padding
:
$gl-padding
0
;
padding
:
$gl-padding
0
;
}
}
}
>
li
:not
(
.empty-message
)
:not
(
.is-not-draggable
)
{
>
li
:not
(
.empty-message
)
:not
(
.is-not-draggable
)
{
background-color
:
$white-light
;
background-color
:
$white-light
;
...
@@ -160,7 +167,7 @@
...
@@ -160,7 +167,7 @@
}
}
}
}
@media
(
max-width
:
$screen-
sm
-max
)
{
@media
(
max-width
:
$screen-
xs
-max
)
{
.dropdown-menu
{
.dropdown-menu
{
min-width
:
100%
;
min-width
:
100%
;
}
}
...
@@ -169,6 +176,8 @@
...
@@ -169,6 +176,8 @@
.draggable-handler
{
.draggable-handler
{
display
:
inline-block
;
display
:
inline-block
;
vertical-align
:
top
;
margin
:
5px
0
;
opacity
:
0
;
opacity
:
0
;
transition
:
opacity
.3s
;
transition
:
opacity
.3s
;
color
:
$gray-darkest
;
color
:
$gray-darkest
;
...
@@ -198,7 +207,7 @@
...
@@ -198,7 +207,7 @@
.toggle-priority
{
.toggle-priority
{
display
:
inline-block
;
display
:
inline-block
;
vertical-align
:
middle
;
vertical-align
:
top
;
button
{
button
{
border-color
:
transparent
;
border-color
:
transparent
;
...
@@ -265,6 +274,11 @@
...
@@ -265,6 +274,11 @@
}
}
.label-subscribe-button
{
.label-subscribe-button
{
@media
(
min-width
:
$screen-md-min
)
{
min-width
:
105px
;
margin-left
:
$gl-padding
;
}
.label-subscribe-button-icon
{
.label-subscribe-button-icon
{
&
[
disabled
]
{
&
[
disabled
]
{
opacity
:
0
.5
;
opacity
:
0
.5
;
...
...
app/controllers/groups/labels_controller.rb
View file @
af6aaf39
...
@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController
...
@@ -54,7 +54,7 @@ class Groups::LabelsController < Groups::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
do
format
.
html
do
redirect_to
group_labels_path
(
@group
),
status:
302
,
notice:
'Label was removed'
redirect_to
group_labels_path
(
@group
),
status:
302
,
notice:
"
#{
@label
.
name
}
deleted permanently"
end
end
format
.
js
format
.
js
end
end
...
...
app/views/shared/_label_row.html.haml
View file @
af6aaf39
...
@@ -17,14 +17,14 @@
...
@@ -17,14 +17,14 @@
-
if
defined?
(
@project
)
&&
@project
.
group
.
present?
-
if
defined?
(
@project
)
&&
@project
.
group
.
present?
%span
.label-type
%span
.label-type
=
label
.
model_name
.
human
.
titleize
=
label
.
model_name
.
human
.
titleize
-
if
label
.
description
%span
.label-description
%span
.label-description
-
if
label
.
description
.
present?
.description-text
=
markdown_field
(
label
,
:description
)
=
markdown_field
(
label
,
:description
)
.hidden-xs.hidden-sm
.hidden-xs.hidden-sm
-
if
show_label_issues_link
-
if
show_label_issues_link
=
link_to_label
(
label
,
subject:
subject
)
do
=
link_to_label
(
label
,
subject:
subject
)
{
'Issues'
}
Issues
-
if
show_label_merge_requests_link
-
if
show_label_merge_requests_link
·
·
=
link_to_label
(
label
,
subject:
subject
,
type: :merge_request
)
do
=
link_to_label
(
label
,
subject:
subject
,
type: :merge_request
)
{
'Merge requests'
}
Merge requests
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