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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
cf673ba9
Commit
cf673ba9
authored
Jan 22, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix UI for pages with panels
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
1ef0ac50
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
31 deletions
+16
-31
app/assets/stylesheets/framework/panels.scss
app/assets/stylesheets/framework/panels.scss
+7
-5
app/assets/stylesheets/framework/tw_bootstrap.scss
app/assets/stylesheets/framework/tw_bootstrap.scss
+0
-13
app/views/admin/deploy_keys/index.html.haml
app/views/admin/deploy_keys/index.html.haml
+1
-1
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+2
-2
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+0
-1
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+1
-2
app/views/groups/projects.html.haml
app/views/groups/projects.html.haml
+2
-2
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+0
-1
app/views/projects/project_members/_group_members.html.haml
app/views/projects/project_members/_group_members.html.haml
+1
-1
app/views/projects/project_members/_team.html.haml
app/views/projects/project_members/_team.html.haml
+1
-1
app/views/projects/project_members/index.html.haml
app/views/projects/project_members/index.html.haml
+1
-2
No files found.
app/assets/stylesheets/framework/panels.scss
View file @
cf673ba9
...
...
@@ -2,7 +2,13 @@
margin-bottom
:
$gl-padding
;
.panel-heading
{
padding
:
7px
$gl-padding
;
padding
:
$gl-vert-padding
$gl-padding
;
line-height
:
36px
;
.controls
{
margin-top
:
-2px
;
float
:
right
;
}
}
.panel-body
{
...
...
@@ -14,7 +20,3 @@
}
}
}
.container-blank
.panel
.panel-heading
{
line-height
:
42px
!
important
;
}
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @
cf673ba9
...
...
@@ -114,22 +114,9 @@
*
*/
.container-blank
.panel
.panel-heading
{
font-size
:
17px
;
line-height
:
38px
;
}
.panel
{
box-shadow
:
none
;
.panel-heading
{
.panel-head-actions
{
position
:
relative
;
top
:
-5px
;
float
:
right
;
}
}
.panel-body
{
form
,
pre
{
margin
:
0
;
...
...
app/views/admin/deploy_keys/index.html.haml
View file @
cf673ba9
...
...
@@ -2,7 +2,7 @@
.panel.panel-default
.panel-heading
Public deploy keys (
#{
@deploy_keys
.
count
}
)
.
panel-head-action
s
.
control
s
=
link_to
'New Deploy Key'
,
new_admin_deploy_key_path
,
class:
"btn btn-new btn-sm"
-
if
@deploy_keys
.
any?
.table-holder
...
...
app/views/admin/projects/index.html.haml
View file @
cf673ba9
-
page_title
"Projects"
=
render
'shared/show_aside'
.row
.row
.prepend-top-default
%aside
.col-md-3
.admin-filter
=
form_tag
admin_namespaces_projects_path
,
method: :get
,
class:
''
do
...
...
@@ -47,7 +47,7 @@
.panel.panel-default
.panel-heading
Projects (
#{
@projects
.
total_count
}
)
.
panel-head-action
s
.
control
s
.dropdown.inline
%button
.dropdown-toggle.btn.btn-sm
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.light
sort:
...
...
app/views/groups/edit.html.haml
View file @
cf673ba9
-
header_title
group_title
(
@group
,
"Settings"
,
edit_group_path
(
@group
))
-
@blank_container
=
true
.panel.panel-default.prepend-top-default
.panel-heading
...
...
app/views/groups/group_members/index.html.haml
View file @
cf673ba9
-
page_title
"Members"
-
header_title
group_title
(
@group
,
"Members"
,
group_group_members_path
(
@group
))
-
@blank_container
=
true
.group-members-page.prepend-top-default
-
if
current_user
&&
current_user
.
can?
(
:admin_group_member
,
@group
)
...
...
@@ -20,7 +19,7 @@
group members
%small
(
#{
@members
.
total_count
}
)
.
pull-right
.
controls
=
form_tag
group_group_members_path
(
@group
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing member by name'
,
class:
'form-control'
,
spellcheck:
false
}
...
...
app/views/groups/projects.html.haml
View file @
cf673ba9
...
...
@@ -6,9 +6,9 @@
%strong
=
@group
.
name
projects:
-
if
can?
current_user
,
:admin_group
,
@group
.
panel-head-action
s
.
control
s
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-sm btn-success"
do
%i
.fa.fa-plus
=
icon
(
'plus'
)
New Project
%ul
.well-list
-
@projects
.
each
do
|
project
|
...
...
app/views/profiles/accounts/show.html.haml
View file @
cf673ba9
-
page_title
"Account"
-
header_title
page_title
,
profile_account_path
-
@blank_container
=
true
-
if
current_user
.
ldap_user?
.alert.alert-info
...
...
app/views/projects/project_members/_group_members.html.haml
View file @
cf673ba9
...
...
@@ -5,7 +5,7 @@
%small
(
#{
members
.
count
}
)
-
if
can?
(
current_user
,
:admin_group_member
,
@group
)
.
pull-right
.
controls
=
link_to
group_group_members_path
(
@group
),
class:
'btn'
do
=
icon
(
'pencil-square-o'
)
Manage group members
...
...
app/views/projects/project_members/_team.html.haml
View file @
cf673ba9
...
...
@@ -4,7 +4,7 @@
project members
%small
(
#{
members
.
count
}
)
.
pull-right
.
controls
=
form_tag
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
method: :get
,
class:
'form-inline member-search-form'
do
.form-group
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing member by name'
,
class:
'form-control'
,
spellcheck:
false
}
...
...
app/views/projects/project_members/index.html.haml
View file @
cf673ba9
-
page_title
"Members"
=
render
"header_title"
-
@blank_container
=
true
.project-members-page.prepend-top-default
-
if
can?
(
current_user
,
:admin_project_member
,
@project
)
.panel.panel-default
.panel-heading
Add new user to project
.
pull-right
.
controls
=
link_to
import_namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-grouped"
,
title:
"Import members from another project"
do
Import members
.panel-body
...
...
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