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
d4ad3623
Commit
d4ad3623
authored
Jan 27, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bootstrap: commits page + tree
parent
bef29f07
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
47 additions
and
47 deletions
+47
-47
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+4
-3
app/assets/stylesheets/highlight.black.css.scss
app/assets/stylesheets/highlight.black.css.scss
+1
-0
app/assets/stylesheets/highlight.css.scss
app/assets/stylesheets/highlight.css.scss
+6
-0
app/assets/stylesheets/tree.scss
app/assets/stylesheets/tree.scss
+1
-0
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+2
-1
app/views/commits/index.html.haml
app/views/commits/index.html.haml
+8
-6
app/views/commits/show.html.haml
app/views/commits/show.html.haml
+0
-1
app/views/profile/show.html.haml
app/views/profile/show.html.haml
+24
-35
app/views/refs/_tree.html.haml
app/views/refs/_tree.html.haml
+1
-1
No files found.
app/assets/stylesheets/common.scss
View file @
d4ad3623
...
...
@@ -101,6 +101,7 @@ $blue_link: "#2fa0bb";
width
:
140px
;
border-right
:
1px
solid
$border_color
;
height
:
100%
;
min-height
:
450px
;
}
.container-fluid
>
.content
{
...
...
@@ -111,6 +112,7 @@ $blue_link: "#2fa0bb";
@import
"top_panel.scss"
;
@import
"projects.css.scss"
;
@import
"commits.css.scss"
;
@import
"tree.scss"
;
//@import "style.scss";
//@import "notes.css.scss";
...
...
@@ -120,11 +122,10 @@ $blue_link: "#2fa0bb";
//@import "commits.css.scss";
//@import "dashboard.scss";
//@import "tree.scss";
//@import "tags.scss";
//@import "buttons.scss";
/** CODE HIGHTLIGHT **/
//
@import "highlight.css.scss";
//
@import "highlight.black.css.scss";
@import
"highlight.css.scss"
;
@import
"highlight.black.css.scss"
;
app/assets/stylesheets/highlight.black.css.scss
View file @
d4ad3623
.black
.highlighttable
{
background
:
#333
;
td
.linenos
{
border
:none
;
}
pre
{
color
:
#eee
}
.highlight
{
background
:
#333
;
border-left
:
1px
solid
#555
;
}
...
...
app/assets/stylesheets/highlight.css.scss
View file @
d4ad3623
...
...
@@ -25,7 +25,13 @@ td.linenos{
padding
:
10px
0px
0px
10px
;
margin-left
:
0px
;
}
.linenodiv
pre
,
.highlight
pre
{
margin
:
0
;
padding
:
0
;
background
:none
;
border
:none
;
}
.linenodiv
pre
{
...
...
app/assets/stylesheets/tree.scss
View file @
d4ad3623
...
...
@@ -117,5 +117,6 @@ table.highlighttable .linenodiv pre {
.tree-item
{
&
:hover
{
background
:
#FFFFCF
;
cursor
:pointer
;
}
}
app/views/commits/_commits.html.haml
View file @
d4ad3623
-
@commits
.
group_by
{
|
c
|
c
.
committed_date
.
to_date
}.
each
do
|
day
,
commits
|
%div
{
:class
=>
"commits-date ui-box ui-box-small ui-box-big"
}
.day-commits-table
%h3
=
day
.
stamp
(
"28 Aug, 2010"
)
%div
.alert-message.info
%p
=
day
.
stamp
(
"28 Aug, 2010"
)
.data
-
commits
.
each
do
|
commit
|
%a
{
:class
=>
"commit"
,
:href
=>
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
}
...
...
app/views/commits/index.html.haml
View file @
d4ad3623
-
content_for
(
:body_class
,
"project-page commits-page"
)
-
if
current_user
.
private_token
=
content_for
:rss_icon
do
.rss-icon
...
...
@@ -6,11 +5,14 @@
=
image_tag
"Rss-UI.PNG"
,
:width
=>
22
,
:title
=>
"feed"
-
if
params
[
:path
]
%h2
=
link_to
project_commits_path
(
@project
)
do
=
@project
.
code
\/
%a
{
:href
=>
"#"
}=
params
[
:path
].
split
(
"/"
).
join
(
" / "
)
%ul
.breadcrumb
%li
=
link_to
project_commits_path
(
@project
)
do
=
@project
.
code
%span
.divider
\/
%li
%a
{
:href
=>
"#"
}=
params
[
:path
].
split
(
"/"
).
join
(
" / "
)
%div
{
:id
=>
dom_id
(
@project
)}
#commits_list
=
render
"commits"
...
...
app/views/commits/show.html.haml
View file @
d4ad3623
-
content_for
(
:body_class
,
"project-page commits-page"
)
.commit
%span
.commit-info
=
link_to
tree_project_ref_path
(
@project
,
@commit
.
id
)
do
...
...
app/views/profile/show.html.haml
View file @
d4ad3623
.ui-box.width-100p
%h3
=
@user
.
name
=
form_for
@user
,
:url
=>
profile_update_path
,
:method
=>
:put
do
|
f
|
.data
.left
-
if
@user
.
errors
.
any?
#error_explanation
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
%h3
=
@user
.
name
.form-row
=
f
.
label
:name
%br
=
f
.
text_field
:name
.form-row
=
f
.
label
:email
%br
=
f
.
text_field
:email
.form-row
=
f
.
label
:skype
%br
=
f
.
text_field
:skype
.form-row
=
f
.
label
:linkedin
%br
=
f
.
text_field
:linkedin
.form-row
=
f
.
label
:twitter
%br
=
f
.
text_field
:twitter
=
form_for
@user
,
:url
=>
profile_update_path
,
:method
=>
:put
do
|
f
|
-
if
@user
.
errors
.
any?
%div
.alert-message.block-message.error
%ul
-
@user
.
errors
.
full_messages
.
each
do
|
msg
|
%li
=
msg
.right
=
image_tag
gravatar_icon
(
current_user
.
email
,
64
),
:width
=>
64
,
:style
=>
"margin:5px; border:5px solid #eee;"
.clear
.buttons
=
f
.
submit
'Save'
,
:class
=>
"grey-button"
.clearfix
=
f
.
label
:name
.input
=
f
.
text_field
:name
.clearfix
=
f
.
label
:email
.input
=
f
.
text_field
:email
.clearfix
=
f
.
label
:skype
.input
=
f
.
text_field
:skype
.clearfix
=
f
.
label
:linkedin
.input
=
f
.
text_field
:linkedin
.clearfix
=
f
.
label
:twitter
.input
=
f
.
text_field
:twitter
=
f
.
submit
'Save'
,
:class
=>
"primary btn"
app/views/refs/_tree.html.haml
View file @
d4ad3623
...
...
@@ -12,7 +12,7 @@
=
render
:partial
=>
"refs/tree_file"
,
:locals
=>
{
:name
=>
tree
.
name
,
:content
=>
tree
.
data
,
:file
=>
tree
}
-
else
-
contents
=
tree
.
contents
%table
#tree-slider
.no-borders
%table
#tree-slider
%thead
%th
Name
%th
Last Update
...
...
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