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
2ed52071
Commit
2ed52071
authored
Jul 11, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename .group-controls to .controls
parent
42a1dc50
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+2
-2
app/views/admin/groups/_group.html.haml
app/views/admin/groups/_group.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/groups.scss
View file @
2ed52071
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
display
:
-
ms-flexbox
;
display
:
-
ms-flexbox
;
display
:
flex
;
display
:
flex
;
.group-avatar
,
.group-details
,
.
group-
controls
{
.group-avatar
,
.group-details
,
.controls
{
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
display
:
-
ms-flexbox
;
display
:
-
ms-flexbox
;
display
:
flex
;
display
:
flex
;
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
min-width
:
0
;
min-width
:
0
;
}
}
.
group-
controls
{
.controls
{
align-items
:
center
;
align-items
:
center
;
a
{
a
{
...
...
app/views/admin/groups/_group.html.haml
View file @
2ed52071
...
@@ -15,6 +15,6 @@
...
@@ -15,6 +15,6 @@
-
if
group
.
description
.
present?
-
if
group
.
description
.
present?
.description
.description
=
markdown
(
group
.
description
,
pipeline: :description
)
=
markdown
(
group
.
description
,
pipeline: :description
)
.
group-
controls.hidden-xs
.controls.hidden-xs
=
link_to
'Edit'
,
edit_admin_group_path
(
group
),
id:
"edit_
#{
dom_id
(
group
)
}
"
,
class:
'btn'
=
link_to
'Edit'
,
edit_admin_group_path
(
group
),
id:
"edit_
#{
dom_id
(
group
)
}
"
,
class:
'btn'
=
link_to
'Delete'
,
[
:admin
,
group
],
data:
{
confirm:
"Are you sure you want to remove
#{
group
.
name
}
?"
},
method: :delete
,
class:
'btn btn-remove'
=
link_to
'Delete'
,
[
:admin
,
group
],
data:
{
confirm:
"Are you sure you want to remove
#{
group
.
name
}
?"
},
method: :delete
,
class:
'btn btn-remove'
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