Download as
Browse Code »

Commit 0b017e8e1782d00da87e4d5b090ee7b37dca3c65

Authored by Dmitriy Zaporozhets
1 parent 7399c8c9
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

twbs3 fixes for UI 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 6 changed files with 8 additions and 8 deletions   Show diff stats
app/assets/stylesheets/sections/profile.scss
  Diff comments   View file @0b017e8
1 1 .update-notifications {
2 2 .radio-inline {
3   - margin-right: 30px;
  3 + margin-right: 9%;
4 4 }
5 5 }
6 6  
... ...
app/views/profiles/notifications/_settings.html.haml
  Diff comments   View file @0b017e8
1 1 %li
2 2 .row
3   - .col-md-4
  3 + .col-sm-4
4 4 %span
5 5 = notification_icon(notification)
6 6  
... ... @@ -8,7 +8,7 @@
8 8 = link_to membership.group.name, membership.group
9 9 - else
10 10 = link_to_project(membership.project)
11   - .col-md-7
  11 + .col-sm-8
12 12 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
13 13 = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type')
14 14 = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id')
... ...
app/views/profiles/notifications/show.html.haml
  Diff comments   View file @0b017e8
... ... @@ -18,11 +18,11 @@
18 18 &ndash; You will receive all notifications from projects in which you participate
19 19  
20 20 .row
21   - .col-md-4
  21 + .col-sm-4
22 22 %h4
23 23 = notification_icon(@notification)
24 24 Global setting
25   - .col-md-7
  25 + .col-sm-8
26 26 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do
27 27 = hidden_field_tag :notification_type, 'global'
28 28  
... ...
app/views/projects/_settings_nav.html.haml
  Diff comments   View file @0b017e8
1   -%ul.nav.nav-pills.nav-stacked.nav-stacked-menu
  1 +%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20
2 2 = nav_link(path: 'projects#edit') do
3 3 = link_to edit_project_path(@project), class: "stat-tab tab " do
4 4 %i.icon-edit
... ...
app/views/projects/milestones/index.html.haml
  Diff comments   View file @0b017e8
... ... @@ -8,7 +8,7 @@
8 8 New Milestone
9 9  
10 10 .row
11   - .col-md-3
  11 + .col-md-3.hidden-sm
12 12 %ul.nav.nav-pills.nav-stacked
13 13 %li{class: ("active" if (params[:f] == "active" || !params[:f]))}
14 14 = link_to project_milestones_path(@project, f: "active") do
... ...
app/views/projects/milestones/show.html.haml
  Diff comments   View file @0b017e8
... ... @@ -49,7 +49,7 @@
49 49 = markdown @milestone.description
50 50  
51 51  
52   -%ul.nav.nav-tabs
  52 +%ul.nav.nav-tabs.append-bottom-10
53 53 %li.active
54 54 = link_to '#tab-issues', 'data-toggle' => 'tab' do
55 55 Issues
... ...