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
e97abfce
Commit
e97abfce
authored
Jul 13, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix edit page crash. Minot UI imporvements
parent
46277c39
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
10 deletions
+12
-10
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
+1
-1
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/nav.scss
+2
-2
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+4
-0
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+1
-1
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/index.html.haml
+1
-5
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+2
-0
app/views/projects/edit_tree/show.html.haml
app/views/projects/edit_tree/show.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
View file @
e97abfce
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
@mixin
md-typography
{
@mixin
md-typography
{
code
{
padding
:
0
4px
;
}
code
{
padding
:
0
4px
;
}
p
{
font-size
:
1
3
px
;
}
p
{
font-size
:
1
4
px
;
}
h1
{
margin-top
:
30px
;}
h1
{
margin-top
:
30px
;}
h2
{
margin-top
:
25px
;}
h2
{
margin-top
:
25px
;}
h3
{
margin-top
:
20px
;}
h3
{
margin-top
:
20px
;}
...
...
app/assets/stylesheets/sections/nav.scss
View file @
e97abfce
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
ul
{
ul
{
margin
:
auto
;
margin
:
auto
;
height
:
4
0
px
;
height
:
4
2
px
;
overflow
:
hidden
;
overflow
:
hidden
;
.count
{
.count
{
font-weight
:
normal
;
font-weight
:
normal
;
...
@@ -74,7 +74,7 @@
...
@@ -74,7 +74,7 @@
text-align
:
center
;
text-align
:
center
;
font-weight
:
normal
;
font-weight
:
normal
;
height
:
38px
;
height
:
38px
;
line-height
:
3
4
px
;
line-height
:
3
6
px
;
color
:
#777
;
color
:
#777
;
text-shadow
:
0
1px
1px
white
;
text-shadow
:
0
1px
1px
white
;
padding
:
0
10px
;
padding
:
0
10px
;
...
...
app/assets/stylesheets/themes/ui_mars.scss
View file @
e97abfce
...
@@ -31,4 +31,8 @@
...
@@ -31,4 +31,8 @@
border-left
:
1px
solid
#666
;
border-left
:
1px
solid
#666
;
}
}
}
}
.main-nav
{
box-shadow
:
0
-1px
0
white
inset
;
}
}
}
app/helpers/commits_helper.rb
View file @
e97abfce
...
@@ -134,7 +134,7 @@ module CommitsHelper
...
@@ -134,7 +134,7 @@ module CommitsHelper
parts
=
@path
.
split
(
'/'
)
parts
=
@path
.
split
(
'/'
)
parts
.
each_with_index
do
|
part
,
i
|
parts
.
each_with_index
do
|
part
,
i
|
crumbs
+=
content_tag
(
:span
,
'
/
'
,
class:
'divider'
)
crumbs
+=
content_tag
(
:span
,
'
/
'
,
class:
'divider'
)
crumbs
+=
content_tag
(
:li
)
do
crumbs
+=
content_tag
(
:li
)
do
# The text is just the individual part, but the link needs all the parts before it
# The text is just the individual part, but the link needs all the parts before it
link_to
part
,
project_commits_path
(
@project
,
tree_join
(
@ref
,
parts
[
0
..
i
].
join
(
'/'
)))
link_to
part
,
project_commits_path
(
@project
,
tree_join
(
@ref
,
parts
[
0
..
i
].
join
(
'/'
)))
...
...
app/views/profiles/keys/index.html.haml
View file @
e97abfce
%h3
.page-title
SSH Keys
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn pull-right btn-primary"
%br
%p
.light
%p
.light
SSH key allows you to establish a secure connection between your computer and GitLab
SSH key allows you to establish a secure connection between your computer and GitLab
%p
.light
%p
.light
...
@@ -15,6 +10,7 @@
...
@@ -15,6 +10,7 @@
%h5
.title
%h5
.title
SSH Keys (
#{
@keys
.
count
}
)
SSH Keys (
#{
@keys
.
count
}
)
.pull-right
.pull-right
=
link_to
"Add SSH Key"
,
new_profile_key_path
,
class:
"btn btn-small btn-primary"
%ul
.well-list
#keys-table
%ul
.well-list
#keys-table
=
render
@keys
=
render
@keys
-
if
@keys
.
blank?
-
if
@keys
.
blank?
...
...
app/views/projects/commits/show.html.haml
View file @
e97abfce
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
-
if
@path
.
present?
-
if
@path
.
present?
%ul
.breadcrumb
%ul
.breadcrumb
%li
.light
History for
=
commits_breadcrumbs
=
commits_breadcrumbs
%div
{
id:
dom_id
(
@project
)}
%div
{
id:
dom_id
(
@project
)}
...
...
app/views/projects/edit_tree/show.html.haml
View file @
e97abfce
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
=
text_area_tag
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
=
text_area_tag
'commit_message'
,
''
,
placeholder:
"Update
#{
@blob
.
name
}
"
,
required:
true
,
rows:
3
.form-actions
.form-actions
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'last_commit'
,
@last_commit
=
hidden_field_tag
'content'
,
''
,
id:
:file
-
content
=
hidden_field_tag
'content'
,
''
,
id:
"file-content"
.commit-button-annotation
.commit-button-annotation
=
button_tag
"Commit changes"
,
class:
'btn commit-btn js-commit-button btn-primary'
=
button_tag
"Commit changes"
,
class:
'btn commit-btn js-commit-button btn-primary'
.message
.message
...
...
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