From 8c5badf0b8adda7172a6daa5dc471c5665fc45fc Mon Sep 17 00:00:00 2001 From: pixeldesu Date: Fri, 28 Aug 2015 16:29:02 +0200 Subject: [PATCH] fix Retrospring/bugs#95 --- app/views/group/index.html.haml | 4 ++-- app/views/inbox/show.html.haml | 6 +++--- app/views/moderation/_moderation_tabs.html.haml | 2 +- app/views/moderation/index.html.haml | 2 +- app/views/notifications/_notification_tabs.html.haml | 2 +- app/views/notifications/index.html.haml | 2 +- app/views/public/index.html.haml | 4 ++-- app/views/services/index.html.haml | 2 +- app/views/static/index.html.haml | 4 ++-- app/views/user/_account.html.haml | 2 +- app/views/user/_settings_tabs.html.haml | 2 +- app/views/user/data.html.haml | 2 +- app/views/user/edit_privacy.html.haml | 2 +- app/views/user/edit_theme.html.haml | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/views/group/index.html.haml b/app/views/group/index.html.haml index 0d8493a8..8c17ebca 100644 --- a/app/views/group/index.html.haml +++ b/app/views/group/index.html.haml @@ -1,9 +1,9 @@ - provide(:title, group_title(@group)) = render 'static/mobile_nav' .container.j2-page - .col-md-3.col-sm-3 + .col-md-3.col-sm-4 = render 'shared/sidebar' - .col-md-9.col-xs-12.col-sm-9.j2-col-reset + .col-md-9.col-xs-12.col-sm-8.j2-col-reset = render 'layouts/messages' #timeline diff --git a/app/views/inbox/show.html.haml b/app/views/inbox/show.html.haml index b93fd016..a8b2648a 100644 --- a/app/views/inbox/show.html.haml +++ b/app/views/inbox/show.html.haml @@ -1,9 +1,9 @@ - provide(:title, generate_title("Inbox")) .container.j2-page .row - .col-md-3.col-xs-12.col-sm-3.hidden-xs + .col-md-3.col-xs-12.col-sm-4.hidden-xs = render 'inbox/sidebar' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' #entries - @inbox.each do |i| @@ -18,7 +18,7 @@ %button#load-more-btn.btn.btn-default{type: :button, data: { current_page: @inbox.current_page }} = t 'views.actions.load' - .col-md-9.col-xs-12.col-sm-9.visible-xs + .col-md-9.col-xs-12.col-sm-8.visible-xs = render 'inbox/sidebar' = render "shared/links" diff --git a/app/views/moderation/_moderation_tabs.html.haml b/app/views/moderation/_moderation_tabs.html.haml index e38c3134..7cf4a3cc 100644 --- a/app/views/moderation/_moderation_tabs.html.haml +++ b/app/views/moderation/_moderation_tabs.html.haml @@ -1,4 +1,4 @@ -.col-md-3.col-sm-3.col-xs-12 +.col-md-3.col-sm-4.col-xs-12 .panel.panel-default.hidden-xs .list-group = list_group_item t('views.moderation.tabs.all'), moderation_path diff --git a/app/views/moderation/index.html.haml b/app/views/moderation/index.html.haml index e1ad35b3..6d381d42 100644 --- a/app/views/moderation/index.html.haml +++ b/app/views/moderation/index.html.haml @@ -3,6 +3,6 @@ .container.j2-page .row = render 'moderation/moderation_tabs' - .col-md-9.col-sm-9.col-xs-12 + .col-md-9.col-sm-8.col-xs-12 - @reports.each do |r| = render 'moderation/moderationbox', report: r diff --git a/app/views/notifications/_notification_tabs.html.haml b/app/views/notifications/_notification_tabs.html.haml index e03b699b..36ab9621 100644 --- a/app/views/notifications/_notification_tabs.html.haml +++ b/app/views/notifications/_notification_tabs.html.haml @@ -1,4 +1,4 @@ -.col-md-3.col-xs-12.col-sm-3 +.col-md-3.col-xs-12.col-sm-4 .panel.panel-default.hidden-xs .list-group = list_group_item t('views.notifications.tabs.all'), notifications_path, badge: Notification.for(current_user).where(new: true).count diff --git a/app/views/notifications/index.html.haml b/app/views/notifications/index.html.haml index c22e28cf..ca6c6f68 100644 --- a/app/views/notifications/index.html.haml +++ b/app/views/notifications/index.html.haml @@ -2,7 +2,7 @@ = render 'notifications/notification_nav' .container.j2-page = render 'notification_tabs' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 .panel.panel-default %ul#notifications.list-group - @notifications.each do |notification| diff --git a/app/views/public/index.html.haml b/app/views/public/index.html.haml index b0f425e5..6b8187f7 100644 --- a/app/views/public/index.html.haml +++ b/app/views/public/index.html.haml @@ -1,9 +1,9 @@ - provide(:title, generate_title("Public Timeline")) = render 'static/mobile_nav' .container.j2-page - .col-md-3.col-sm-3 + .col-md-3.col-sm-4 = render 'shared/sidebar' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' #timeline diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 803ed7ac..a6c54df9 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -1,7 +1,7 @@ - provide(:title, generate_title("Service Settings")) .container.j2-page = render 'user/settings_tabs' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' .panel.panel-default .panel-body diff --git a/app/views/static/index.html.haml b/app/views/static/index.html.haml index f5276849..b3615bae 100644 --- a/app/views/static/index.html.haml +++ b/app/views/static/index.html.haml @@ -2,9 +2,9 @@ - if user_signed_in? = render 'static/mobile_nav' .container.j2-page - .col-md-3.col-sm-3 + .col-md-3.col-sm-4 = render 'shared/sidebar' - .col-md-9.col-xs-12.col-sm-9.j2-col-reset + .col-md-9.col-xs-12.col-sm-8.j2-col-reset = render 'layouts/messages' #timeline - @timeline.each do |answer| diff --git a/app/views/user/_account.html.haml b/app/views/user/_account.html.haml index 70c0eeca..82f933e1 100644 --- a/app/views/user/_account.html.haml +++ b/app/views/user/_account.html.haml @@ -1,7 +1,7 @@ - provide(:title, generate_title("Account Settings")) .container.j2-page = render 'user/settings_tabs' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' .panel.panel-default .panel-body diff --git a/app/views/user/_settings_tabs.html.haml b/app/views/user/_settings_tabs.html.haml index 676dfa81..b1097fd3 100644 --- a/app/views/user/_settings_tabs.html.haml +++ b/app/views/user/_settings_tabs.html.haml @@ -1,4 +1,4 @@ -.col-md-3.col-xs-12.col-sm-3 +.col-md-3.col-xs-12.col-sm-4 .panel.panel-default .list-group = list_group_item t('views.settings.tabs.account'), edit_user_registration_path diff --git a/app/views/user/data.html.haml b/app/views/user/data.html.haml index 119a569b..4db3efbe 100644 --- a/app/views/user/data.html.haml +++ b/app/views/user/data.html.haml @@ -1,7 +1,7 @@ - provide(:title, generate_title("Your Data")) .container.j2-page = render 'settings_tabs' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 .panel.panel-default .panel-body %h2 Your Profile Data diff --git a/app/views/user/edit_privacy.html.haml b/app/views/user/edit_privacy.html.haml index 5ac2c7ea..526b6798 100644 --- a/app/views/user/edit_privacy.html.haml +++ b/app/views/user/edit_privacy.html.haml @@ -1,7 +1,7 @@ - provide(:title, generate_title("Privacy Settings")) .container.j2-page = render 'settings_tabs' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' .panel.panel-default .panel-body diff --git a/app/views/user/edit_theme.html.haml b/app/views/user/edit_theme.html.haml index 58d5b4d3..ecfc0ad1 100644 --- a/app/views/user/edit_theme.html.haml +++ b/app/views/user/edit_theme.html.haml @@ -1,7 +1,7 @@ - provide(:title, generate_title("Theme Settings")) .container.j2-page = render 'settings_tabs' - .col-md-9.col-xs-12.col-sm-9 + .col-md-9.col-xs-12.col-sm-8 = render 'layouts/messages' .panel.panel-default .panel-body