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
e7add858
Commit
e7add858
authored
Apr 11, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixes & bootstrap buttons
parent
b7558a20
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
5 deletions
+18
-5
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+13
-0
app/views/dashboard/index.html.haml
app/views/dashboard/index.html.haml
+2
-2
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+1
-1
app/views/merge_requests/show.html.haml
app/views/merge_requests/show.html.haml
+1
-1
app/views/repositories/tags.html.haml
app/views/repositories/tags.html.haml
+1
-1
No files found.
app/assets/stylesheets/gitlab_bootstrap.scss
View file @
e7add858
...
@@ -118,6 +118,19 @@ table {
...
@@ -118,6 +118,19 @@ table {
&
.primary
{
&
.primary
{
@extend
.btn-primary
;
@extend
.btn-primary
;
}
}
&
.danger
,
&
.btn-danger
{
color
:
#fff
;
background
:
#DA4E49
;
border-color
:
#BD362F
;
&
:hover
{
color
:
#fff
;
background
:
#EE4E49
;
}
}
&
.danger
{
&
.danger
{
@extend
.btn-danger
;
@extend
.btn-danger
;
}
}
...
...
app/views/dashboard/index.html.haml
View file @
e7add858
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
%hr
%hr
.dashboard_block
.dashboard_block
.row
.row
.span
4
.right
.span
3
.right
%div
.lborder.ipadded
%div
.lborder.ipadded
%h3
%h3
=
pluralize
current_user
.
projects
.
count
,
"project"
,
"projects"
=
pluralize
current_user
.
projects
.
count
,
"project"
,
"projects"
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
%br
%br
=
link_to
profile_path
,
:class
=>
"btn"
do
=
link_to
profile_path
,
:class
=>
"btn"
do
Your Profile »
Your Profile »
.span
8
.left
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
.span
9
.left
=
render
"dashboard/projects_feed"
,
:projects
=>
@active_projects
-
if
@last_push
&&
@last_push
.
valid_push?
-
if
@last_push
&&
@last_push
.
valid_push?
.padded.prepend-top-20
.padded.prepend-top-20
%h5
%h5
...
...
app/views/issues/show.html.haml
View file @
e7add858
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
.main_box
.main_box
.top_box_content
.top_box_content
%h
5
%h
4
-
if
@issue
.
closed
-
if
@issue
.
closed
.alert-message.error.status_info
Closed
.alert-message.error.status_info
Closed
-
else
-
else
...
...
app/views/merge_requests/show.html.haml
View file @
e7add858
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
.main_box
.main_box
.top_box_content
.top_box_content
%h
5
%h
4
-
if
@merge_request
.
closed
-
if
@merge_request
.
closed
.alert-message.error.status_info
Closed
.alert-message.error.status_info
Closed
-
else
-
else
...
...
app/views/repositories/tags.html.haml
View file @
e7add858
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%td
%td
%strong
=
link_to
tag
.
name
,
project_commits_path
(
@project
,
:ref
=>
tag
.
name
),
:class
=>
""
%strong
=
link_to
tag
.
name
,
project_commits_path
(
@project
,
:ref
=>
tag
.
name
),
:class
=>
""
%td
%td
=
link_to
project_commit
s
_path
(
@project
,
tag
.
commit
.
id
)
do
=
link_to
project_commit_path
(
@project
,
tag
.
commit
.
id
)
do
%code
=
tag
.
commit
.
id
.
to_s
[
0
..
10
]
%code
=
tag
.
commit
.
id
.
to_s
[
0
..
10
]
=
image_tag
gravatar_icon
(
Commit
.
new
(
tag
.
commit
).
author_email
),
:class
=>
""
,
:width
=>
16
=
image_tag
gravatar_icon
(
Commit
.
new
(
tag
.
commit
).
author_email
),
:class
=>
""
,
:width
=>
16
=
truncate
(
Commit
.
new
(
tag
.
commit
).
safe_message
,
:length
=>
40
)
=
truncate
(
Commit
.
new
(
tag
.
commit
).
safe_message
,
:length
=>
40
)
...
...
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