Commit 0b017e8e1782d00da87e4d5b090ee7b37dca3c65
1 parent
7399c8c9
Exists in
spb-stable
and in
3 other branches
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
app/views/profiles/notifications/_settings.html.haml
| 1 | %li | 1 | %li |
| 2 | .row | 2 | .row |
| 3 | - .col-md-4 | 3 | + .col-sm-4 |
| 4 | %span | 4 | %span |
| 5 | = notification_icon(notification) | 5 | = notification_icon(notification) |
| 6 | 6 | ||
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | = link_to membership.group.name, membership.group | 8 | = link_to membership.group.name, membership.group |
| 9 | - else | 9 | - else |
| 10 | = link_to_project(membership.project) | 10 | = link_to_project(membership.project) |
| 11 | - .col-md-7 | 11 | + .col-sm-8 |
| 12 | = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do | 12 | = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do |
| 13 | = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type') | 13 | = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type') |
| 14 | = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id') | 14 | = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id') |
app/views/profiles/notifications/show.html.haml
| @@ -18,11 +18,11 @@ | @@ -18,11 +18,11 @@ | ||
| 18 | – You will receive all notifications from projects in which you participate | 18 | – You will receive all notifications from projects in which you participate |
| 19 | 19 | ||
| 20 | .row | 20 | .row |
| 21 | - .col-md-4 | 21 | + .col-sm-4 |
| 22 | %h4 | 22 | %h4 |
| 23 | = notification_icon(@notification) | 23 | = notification_icon(@notification) |
| 24 | Global setting | 24 | Global setting |
| 25 | - .col-md-7 | 25 | + .col-sm-8 |
| 26 | = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do | 26 | = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do |
| 27 | = hidden_field_tag :notification_type, 'global' | 27 | = hidden_field_tag :notification_type, 'global' |
| 28 | 28 |
app/views/projects/_settings_nav.html.haml
| 1 | -%ul.nav.nav-pills.nav-stacked.nav-stacked-menu | 1 | +%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20 |
| 2 | = nav_link(path: 'projects#edit') do | 2 | = nav_link(path: 'projects#edit') do |
| 3 | = link_to edit_project_path(@project), class: "stat-tab tab " do | 3 | = link_to edit_project_path(@project), class: "stat-tab tab " do |
| 4 | %i.icon-edit | 4 | %i.icon-edit |
app/views/projects/milestones/index.html.haml
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | New Milestone | 8 | New Milestone |
| 9 | 9 | ||
| 10 | .row | 10 | .row |
| 11 | - .col-md-3 | 11 | + .col-md-3.hidden-sm |
| 12 | %ul.nav.nav-pills.nav-stacked | 12 | %ul.nav.nav-pills.nav-stacked |
| 13 | %li{class: ("active" if (params[:f] == "active" || !params[:f]))} | 13 | %li{class: ("active" if (params[:f] == "active" || !params[:f]))} |
| 14 | = link_to project_milestones_path(@project, f: "active") do | 14 | = link_to project_milestones_path(@project, f: "active") do |
app/views/projects/milestones/show.html.haml
| @@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
| 49 | = markdown @milestone.description | 49 | = markdown @milestone.description |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | -%ul.nav.nav-tabs | 52 | +%ul.nav.nav-tabs.append-bottom-10 |
| 53 | %li.active | 53 | %li.active |
| 54 | = link_to '#tab-issues', 'data-toggle' => 'tab' do | 54 | = link_to '#tab-issues', 'data-toggle' => 'tab' do |
| 55 | Issues | 55 | Issues |