From 0b017e8e1782d00da87e4d5b090ee7b37dca3c65 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 6 Jan 2014 14:19:25 +0200 Subject: [PATCH] twbs3 fixes for UI --- app/assets/stylesheets/sections/profile.scss | 2 +- app/views/profiles/notifications/_settings.html.haml | 4 ++-- app/views/profiles/notifications/show.html.haml | 4 ++-- app/views/projects/_settings_nav.html.haml | 2 +- app/views/projects/milestones/index.html.haml | 2 +- app/views/projects/milestones/show.html.haml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/sections/profile.scss b/app/assets/stylesheets/sections/profile.scss index 83dc80e..c5a90e2 100644 --- a/app/assets/stylesheets/sections/profile.scss +++ b/app/assets/stylesheets/sections/profile.scss @@ -1,6 +1,6 @@ .update-notifications { .radio-inline { - margin-right: 30px; + margin-right: 9%; } } diff --git a/app/views/profiles/notifications/_settings.html.haml b/app/views/profiles/notifications/_settings.html.haml index ab64d83..d123b8f 100644 --- a/app/views/profiles/notifications/_settings.html.haml +++ b/app/views/profiles/notifications/_settings.html.haml @@ -1,6 +1,6 @@ %li .row - .col-md-4 + .col-sm-4 %span = notification_icon(notification) @@ -8,7 +8,7 @@ = link_to membership.group.name, membership.group - else = link_to_project(membership.project) - .col-md-7 + .col-sm-8 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do = hidden_field_tag :notification_type, type, id: dom_id(membership, 'notification_type') = hidden_field_tag :notification_id, membership.id, id: dom_id(membership, 'notification_id') diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml index ecec8f7..878d7f7 100644 --- a/app/views/profiles/notifications/show.html.haml +++ b/app/views/profiles/notifications/show.html.haml @@ -18,11 +18,11 @@ – You will receive all notifications from projects in which you participate .row - .col-md-4 + .col-sm-4 %h4 = notification_icon(@notification) Global setting - .col-md-7 + .col-sm-8 = form_tag profile_notifications_path, method: :put, remote: true, class: 'update-notifications' do = hidden_field_tag :notification_type, 'global' diff --git a/app/views/projects/_settings_nav.html.haml b/app/views/projects/_settings_nav.html.haml index f59e287..48e7181 100644 --- a/app/views/projects/_settings_nav.html.haml +++ b/app/views/projects/_settings_nav.html.haml @@ -1,4 +1,4 @@ -%ul.nav.nav-pills.nav-stacked.nav-stacked-menu +%ul.nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20 = nav_link(path: 'projects#edit') do = link_to edit_project_path(@project), class: "stat-tab tab " do %i.icon-edit diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index cc71434..6cfe4d2 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -8,7 +8,7 @@ New Milestone .row - .col-md-3 + .col-md-3.hidden-sm %ul.nav.nav-pills.nav-stacked %li{class: ("active" if (params[:f] == "active" || !params[:f]))} = link_to project_milestones_path(@project, f: "active") do diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index df65298..e7c3785 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -49,7 +49,7 @@ = markdown @milestone.description -%ul.nav.nav-tabs +%ul.nav.nav-tabs.append-bottom-10 %li.active = link_to '#tab-issues', 'data-toggle' => 'tab' do Issues -- libgit2 0.21.2