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
Tatuya Kamada
gitlab-ce
Commits
0a364762
Commit
0a364762
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
twbs3 style for admin, tree, network, commits
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
09c2f8c7
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
46 additions
and
40 deletions
+46
-40
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+12
-2
app/views/admin/dashboard/index.html.haml
app/views/admin/dashboard/index.html.haml
+3
-3
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+2
-1
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+5
-3
app/views/projects/commits/_head.html.haml
app/views/projects/commits/_head.html.haml
+1
-1
app/views/projects/network/_head.html.haml
app/views/projects/network/_head.html.haml
+13
-21
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
app/views/projects/tree/_tree.html.haml
app/views/projects/tree/_tree.html.haml
+9
-8
No files found.
app/assets/stylesheets/generic/forms.scss
View file @
0a364762
...
...
@@ -30,10 +30,20 @@ fieldset legend {
padding-left
:
17%
;
}
label
.control-label
{
@extend
.col-sm-2
;
label
{
&
.control-label
{
@extend
.col-sm-2
;
}
&
.inline-label
{
margin
:
0
;
}
}
.inline-input-group
{
width
:
250px
;
}
.input-mx-250
{
max-width
:
250px
;
}
This diff is collapsed.
Click to expand it.
app/views/admin/dashboard/index.html.haml
View file @
0a364762
...
...
@@ -4,7 +4,7 @@
You can manage projects, users and other GitLab data from here.
%hr
.admin_dash.row
.col-
md
-4
.col-
sm
-4
.light-well
%h4
Projects
.data
...
...
@@ -12,7 +12,7 @@
%h1
=
Project
.
count
%hr
=
link_to
'New Project'
,
new_project_path
,
class:
"btn btn-new"
.col-
md
-4
.col-
sm
-4
.light-well
%h4
Users
.data
...
...
@@ -20,7 +20,7 @@
%h1
=
User
.
count
%hr
=
link_to
'New User'
,
new_admin_user_path
,
class:
"btn btn-new"
.col-
md
-4
.col-
sm
-4
.light-well
%h4
Groups
.data
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/groups/index.html.haml
View file @
0a364762
...
...
@@ -7,7 +7,8 @@
=
link_to
'New Group'
,
new_admin_group_path
,
class:
"btn btn-new pull-right"
%br
=
form_tag
admin_groups_path
,
method: :get
,
class:
'form-inline'
do
=
text_field_tag
:name
,
params
[
:name
],
class:
"span6 input-xpadding"
.form-group
=
text_field_tag
:name
,
params
[
:name
],
class:
"form-control input-xpadding"
=
submit_tag
"Search"
,
class:
"btn submit btn-primary"
%hr
...
...
This diff is collapsed.
Click to expand it.
app/views/admin/users/index.html.haml
View file @
0a364762
...
...
@@ -2,9 +2,11 @@
.col-md-3
.admin-filter
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'input-xpadding span2'
=
button_tag
type:
'submit'
,
class:
'btn btn-primary'
do
%i
.icon-search
.append-bottom-10
.form-group
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'form-control'
=
button_tag
type:
'submit'
,
class:
'btn btn-primary'
do
%i
.icon-search
%ul
.nav.nav-pills.nav-stacked
%li
{
class:
"#{'active' unless params[:filter]}"
}
=
link_to
admin_users_path
do
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/commits/_head.html.haml
View file @
0a364762
...
...
@@ -22,6 +22,6 @@
-
if
current_user
&&
current_controller?
(
:commits
)
&&
current_user
.
private_token
%li
.pull-right
%li
.pull-right
.hidden-sm
=
link_to
project_commits_path
(
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
do
%i
.icon-rss
This diff is collapsed.
Click to expand it.
app/views/projects/network/_head.html.haml
View file @
0a364762
.
clearfix
.
pull-left
.
row.append-bottom-20
.
col-sm-2
=
render
partial:
'shared/ref_switcher'
,
locals:
{
destination:
'graph'
}
.pull-left
=
form_tag
project_network_path
(
@project
,
@id
),
method: :get
do
|
f
|
.form-group
=
label_tag
:filter_ref
,
"Begin with the selected commit"
,
class:
'control-label light'
.col-sm-10
=
check_box_tag
:filter_ref
,
1
,
@options
[
:filter_ref
]
-
@options
.
each
do
|
key
,
value
|
=
hidden_field_tag
(
key
,
value
,
id:
nil
)
unless
key
==
"filter_ref"
.search.pull-right
=
form_tag
project_network_path
(
@project
,
@id
),
method: :get
do
|
f
|
.form-group
=
label_tag
:search
,
"Looking for commit:"
,
class:
'control-label light'
.col-sm-10
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
"search-input form-control"
=
button_tag
type:
'submit'
,
class:
'btn vtop'
do
%i
.icon-search
-
@options
.
each
do
|
key
,
value
|
=
hidden_field_tag
(
key
,
value
,
id:
nil
)
unless
key
==
"extended_sha1"
.col-sm-10
=
form_tag
project_network_path
(
@project
,
@id
),
method: :get
,
class:
'form-inline'
do
|
f
|
=
label_tag
:search
,
"Looking for"
,
class:
'light inline-label'
=
text_field_tag
:extended_sha1
,
@options
[
:extended_sha1
],
placeholder:
"Input an extended SHA1 syntax"
,
class:
"search-input form-control input-mx-250"
=
button_tag
type:
'submit'
,
class:
'btn btn-success'
do
%i
.icon-search
.inline.prepend-left-20
.checkbox.light
=
label_tag
:filter_ref
do
=
check_box_tag
:filter_ref
,
1
,
@options
[
:filter_ref
]
%span
Begin with the selected commit
This diff is collapsed.
Click to expand it.
app/views/projects/show.html.haml
View file @
0a364762
=
render
"home_panel"
.row
.col-md-9
.col-md-9
.hidden-sm
=
render
"events/event_last_push"
,
event:
@last_push
=
render
'shared/event_filter'
.content_list
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/tree/_tree.html.haml
View file @
0a364762
...
...
@@ -21,15 +21,16 @@
%tr
%th
Name
%th
Last Update
%th
%th
.hidden-sm
Last Commit
%i
.icon-angle-right
%small
.light
=
link_to
@commit
.
short_id
,
project_commit_path
(
@project
,
@commit
)
–
=
truncate
(
@commit
.
title
,
length:
50
)
%span
.last-commit
%i
.icon-angle-right
%small
.light
=
link_to
@commit
.
short_id
,
project_commit_path
(
@project
,
@commit
)
–
=
truncate
(
@commit
.
title
,
length:
50
)
%th
=
link_to
"history"
,
project_commits_path
(
@project
,
@id
),
class:
"pull-right"
-
if
@path
.
present?
...
...
This diff is collapsed.
Click to expand it.
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