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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
c07df632
Commit
c07df632
authored
Oct 24, 2017
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make label delete option red
parent
72954bc7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
app/assets/stylesheets/pages/members.scss
app/assets/stylesheets/pages/members.scss
+0
-2
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+6
-1
doc/development/fe_guide/dropdowns.md
doc/development/fe_guide/dropdowns.md
+3
-9
No files found.
app/assets/stylesheets/pages/members.scss
View file @
c07df632
...
...
@@ -58,8 +58,6 @@
}
.member-form-control
{
@include
new-style-dropdown
;
@media
(
max-width
:
$screen-xs-max
)
{
padding-bottom
:
5px
;
margin-left
:
0
;
...
...
app/views/shared/_label.html.haml
View file @
c07df632
...
...
@@ -35,7 +35,12 @@
%li
=
link_to
'Edit'
,
edit_label_path
(
label
)
%li
=
link_to
'Delete'
,
destroy_label_path
(
label
),
title:
'Delete'
,
method: :delete
,
data:
{
confirm:
'Remove this label? Are you sure?'
}
=
link_to
'Delete'
,
destroy_label_path
(
label
),
title:
'Delete'
,
method: :delete
,
data:
{
confirm:
'Remove this label? Are you sure?'
},
class:
'text-danger'
.pull-right.hidden-xs.hidden-sm.hidden-md
=
link_to_label
(
label
,
subject:
subject
,
type: :merge_request
,
css_class:
'btn btn-transparent btn-action btn-link'
)
do
...
...
doc/development/fe_guide/dropdowns.md
View file @
c07df632
...
...
@@ -4,15 +4,15 @@
## How to style a bootstrap dropdown
1.
Use the HTML structure provided by the
[
docs
][
bootstrap-dropdowns
]
1.
Add a specific class to the top level
`.dropdown`
element
```Haml
.dropdown.my-dropdown
%button{ type: 'button', data: { toggle: 'dropdown' }, 'aria-haspopup': true, 'aria-expanded': false }
%span.dropdown-toggle-text
Toggle Dropdown
= icon('chevron-down')
%ul.dropdown-menu
%li
%a
...
...
@@ -29,10 +29,4 @@
item!
```
1.
Include the mixin in CSS
```SCSS
@include new-style-dropdown('.my-dropdown ');
```
[
bootstrap-dropdowns
]:
https://getbootstrap.com/docs/3.3/javascript/#dropdowns
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