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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c1c28d3c
Commit
c1c28d3c
authored
Jul 17, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restyle last push widget
parent
d20f78f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
29 deletions
+11
-29
app/assets/stylesheets/sections/events.scss
app/assets/stylesheets/sections/events.scss
+6
-24
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+4
-4
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/events.scss
View file @
c1c28d3c
...
@@ -129,30 +129,6 @@
...
@@ -129,30 +129,6 @@
}
}
}
}
/**
* Push event widget
*
*/
.event_lp
{
color
:
#777
;
padding
:
10px
;
min-height
:
22px
;
border-left
:
5px
solid
$primary_color
;
margin-bottom
:
20px
;
background
:
#f9f9f9
;
.avatar
{
width
:
24px
;
}
.btn-new-mr
{
@extend
.btn-primary
;
@extend
.small
;
@extend
.pull-right
;
margin
:
-2px
;
}
}
/**
/**
* Event filter
* Event filter
*
*
...
@@ -182,3 +158,9 @@
...
@@ -182,3 +158,9 @@
}
}
}
}
}
}
.event-last-push
.btn-create
{
position
:
relative
;
top
:
-3px
;
right
:
-30px
;
}
app/views/events/_event_last_push.html.haml
View file @
c1c28d3c
-
if
show_last_push_widget?
(
event
)
-
if
show_last_push_widget?
(
event
)
.
event_lp
.
alert.alert-success.event-last-push
%span
You pushed to
%span
You pushed to
=
link_to
project_commits_path
(
event
.
project
,
event
.
ref_name
)
do
=
link_to
project_commits_path
(
event
.
project
,
event
.
ref_name
)
do
%strong
=
truncate
(
event
.
ref_name
,
length:
28
)
%strong
=
truncate
(
event
.
ref_name
,
length:
28
)
...
@@ -8,6 +8,6 @@
...
@@ -8,6 +8,6 @@
%span
%span
=
time_ago_in_words
(
event
.
created_at
)
=
time_ago_in_words
(
event
.
created_at
)
ago.
ago.
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-new-mr
"
do
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-create btn-small
"
do
Create Merge Request
Create Merge Request
app/views/projects/compare/_form.html.haml
View file @
c1c28d3c
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
=
text_field_tag
:to
,
params
[
:to
],
placeholder:
"aa8b4ef"
,
class:
"xlarge"
=
text_field_tag
:to
,
params
[
:to
],
placeholder:
"aa8b4ef"
,
class:
"xlarge"
.pull-left
.pull-left
=
submit_tag
"Compare"
,
class:
"btn btn-
primary wid
e commits-compare-btn"
=
submit_tag
"Compare"
,
class:
"btn btn-
creat
e commits-compare-btn"
-
if
@refs_are_same
-
if
@refs_are_same
.alert
.alert
%span
Refs are the same
%span
Refs are the same
...
...
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