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
2f68fb9c
Commit
2f68fb9c
authored
Oct 13, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small css cleanup
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
c28d4c37
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
12 additions
and
25 deletions
+12
-25
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+0
-4
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-5
app/views/dashboard/_activities.html.haml
app/views/dashboard/_activities.html.haml
+3
-4
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+3
-5
app/views/projects/_activity.html.haml
app/views/projects/_activity.html.haml
+3
-4
app/views/projects/buttons/_notifications.html.haml
app/views/projects/buttons/_notifications.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/common.scss
View file @
2f68fb9c
...
@@ -398,7 +398,3 @@ table {
...
@@ -398,7 +398,3 @@ table {
.space-right
{
.space-right
{
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.in-line
{
display
:
inline-block
;
}
app/assets/stylesheets/pages/projects.scss
View file @
2f68fb9c
...
@@ -511,8 +511,3 @@ pre.light-well {
...
@@ -511,8 +511,3 @@ pre.light-well {
margin-top
:
-1px
;
margin-top
:
-1px
;
}
}
}
}
.inline-form
{
display
:
inline-block
;
}
app/views/dashboard/_activities.html.haml
View file @
2f68fb9c
...
@@ -3,10 +3,9 @@
...
@@ -3,10 +3,9 @@
.gray-content-block
.gray-content-block
-
if
current_user
-
if
current_user
%ul
.nav.nav-pills.event_filter.pull-right
.pull-right
%li
.pull-right
=
link_to
dashboard_projects_path
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'btn rss-btn'
do
=
link_to
dashboard_projects_path
(
:atom
,
{
private_token:
current_user
.
private_token
}),
class:
'rss-btn'
do
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
.content_list
.content_list
...
...
app/views/groups/show.html.haml
View file @
2f68fb9c
...
@@ -25,11 +25,9 @@
...
@@ -25,11 +25,9 @@
.hidden-xs
.hidden-xs
-
if
current_user
-
if
current_user
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
.pull-right
%ul
.nav.nav-pills.event_filter.pull-right
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'btn rss-btn'
do
%li
%i
.fa.fa-rss
=
link_to
group_path
(
@group
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'rss-btn'
do
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
%hr
%hr
...
...
app/views/projects/_activity.html.haml
View file @
2f68fb9c
=
render
'projects/last_push'
=
render
'projects/last_push'
.gray-content-block.activity-filter-block
.gray-content-block.activity-filter-block
-
if
current_user
-
if
current_user
%ul
.nav.nav-pills.event_filter.pull-right
.pull-right
%li
=
link_to
namespace_project_path
(
@project
.
namespace
,
@project
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"Feed"
,
class:
'btn rss-btn'
do
=
link_to
namespace_project_path
(
@project
.
namespace
,
@project
,
format: :atom
,
private_token:
current_user
.
private_token
),
title:
"Feed"
,
class:
'rss-btn'
do
%i
.fa.fa-rss
%i
.fa.fa-rss
=
render
'shared/event_filter'
=
render
'shared/event_filter'
.content_list
{
:"data-href"
=>
activity_project_path
(
@project
)}
.content_list
{
:"data-href"
=>
activity_project_path
(
@project
)}
...
...
app/views/projects/buttons/_notifications.html.haml
View file @
2f68fb9c
-
return
unless
@membership
-
return
unless
@membership
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'inline
-form
'
,
id:
'notification-form'
do
=
form_tag
profile_notifications_path
,
method: :put
,
remote:
true
,
class:
'inline'
,
id:
'notification-form'
do
=
hidden_field_tag
:notification_type
,
'project'
=
hidden_field_tag
:notification_type
,
'project'
=
hidden_field_tag
:notification_id
,
@membership
.
id
=
hidden_field_tag
:notification_id
,
@membership
.
id
=
hidden_field_tag
:notification_level
=
hidden_field_tag
:notification_level
...
...
app/views/projects/new.html.haml
View file @
2f68fb9c
...
@@ -111,10 +111,10 @@
...
@@ -111,10 +111,10 @@
-
if
current_user
.
can_create_group?
-
if
current_user
.
can_create_group?
.pull-right
.pull-right
.light.in
-
line
.light.inline
.space-right
.space-right
Need a group for several dependent projects?
Need a group for several dependent projects?
=
link_to
new_group_path
,
class:
"btn
btn-xs
"
do
=
link_to
new_group_path
,
class:
"btn"
do
Create a group
Create a group
.save-project-loader.hide
.save-project-loader.hide
...
...
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