Commit 5313c388 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'css-cleanup' into 'master'

Small css cleanup
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @skyruler 

See merge request !1582
parents c28d4c37 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;
}
...@@ -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;
}
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
.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'
......
...@@ -25,10 +25,8 @@ ...@@ -25,10 +25,8 @@
.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
= link_to group_path(@group, { 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'
......
= 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'
......
- 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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment