diff --git a/app/views/member/details/edit.html.haml b/app/views/member/details/edit.html.haml index 8262f76fb..60bc0fbec 100644 --- a/app/views/member/details/edit.html.haml +++ b/app/views/member/details/edit.html.haml @@ -1,12 +1,12 @@ -.container-fluid.pt-3 +.container.py-4.py-lg-5 .row.justify-content-md-center - .col.col-md-8 + .col-md-10.col-lg-8 %h1= t('member.details.edit.title') %p= t('member.details.edit.summary') = simple_form_for @member, url: member_details_path, method: :put do |f| .row.justify-content-md-center - .col.col-md-8 + .col-md-10.col-lg-8 = f.input :name, required: true = f.input :surname, required: true = f.input :pronouns @@ -16,6 +16,6 @@ - else = f.input :about_you, as: :text, label: t('member.details.edit.student.about_you'), input_html: { rows: 3 }, required: true = f.input :newsletter, as: :boolean, checked_value: true, unchecked_value: false - .text-right + .text-right.mb-4 = hidden_field_tag :next_page, step2_member_path(member_type: @type) = f.button :button, t('member.details.edit.submit'), class: 'btn btn-primary' diff --git a/app/views/members/_coach_invite_subscriptions.html.haml b/app/views/members/_coach_invite_subscriptions.html.haml index d22775de4..7f9519d6e 100644 --- a/app/views/members/_coach_invite_subscriptions.html.haml +++ b/app/views/members/_coach_invite_subscriptions.html.haml @@ -1,5 +1,5 @@ .row.justify-content-md-center.subscriptions - .col.col-md-8 + .col-md-10.col-lg-8 %h2.h4.toggle As a Coach - if collapsed @@ -13,10 +13,10 @@ = simple_form_for :subscription, url: :destroy_subscriptions, method: :delete do |f| = f.hidden_field :subscription_id, value: nil = f.hidden_field :group_id, value: group.id - = button_tag type: :submit, class: 'btn btn-success w-100' do + = button_tag type: :submit, class: 'btn btn-success w-100 mb-4' do %i.fas.fa-check = group.chapter.name - else = simple_form_for :subscription, url: :subscriptions do |f| = f.hidden_field :group_id, value: group.id - = f.button :button, group.chapter.name, class: 'btn btn-secondary w-100' + = f.button :button, group.chapter.name, class: 'btn btn-secondary w-100 mb-4' diff --git a/app/views/members/_student_invite_subscriptions.html.haml b/app/views/members/_student_invite_subscriptions.html.haml index e3fa8ca9e..9d1338dc5 100644 --- a/app/views/members/_student_invite_subscriptions.html.haml +++ b/app/views/members/_student_invite_subscriptions.html.haml @@ -1,5 +1,5 @@ .row.justify-content-md-center.subscriptions - .col.col-md-8 + .col-md-10.col-lg-8 %h2.h4.toggle As a Student - if collapsed @@ -13,10 +13,10 @@ = simple_form_for :subscription, url: :destroy_subscriptions, method: :delete do |f| = f.hidden_field :subscription_id, value: nil = f.hidden_field :group_id, value: group.id - = button_tag type: :submit, class: 'btn btn-success w-100' do + = button_tag type: :submit, class: 'btn btn-success w-100 mb-4' do %i.fas.fa-check = group.chapter.name - else = simple_form_for :subscription, url: :subscriptions do |f| = f.hidden_field :group_id, value: group.id - = f.button :button, group.chapter.name, class: 'btn btn-secondary w-100' + = f.button :button, group.chapter.name, class: 'btn btn-secondary w-100 mb-4' diff --git a/app/views/members/new.html.haml b/app/views/members/new.html.haml index 01c0b5811..b6ff6b39e 100644 --- a/app/views/members/new.html.haml +++ b/app/views/members/new.html.haml @@ -1,25 +1,26 @@ -.container-fluid.stripe.reverse +.container.py-4.py-lg-5 .row.justify-content-md-center - .col.col-md-8 + .col-md-10.col-lg-8 %h1= @page_title -.container-fluid.stripe.reverse - .row.justify-content-md-center - .col.col-md-8 - %p.lead - = t('members.new.intro') - = link_to t('members.code_of_conduct'), code_of_conduct_path - \. - %p.lead - = t('members.new.students.intro') - = link_to t('members.new.students.criteria_link'), 'http://codebar.io/student-guide#eligibility' - = t('members.new.students.criteria_brief') - %p.lead - = t('members.new.students.github') - .d-flex.flex-column.align-items-start - = link_to registration_path(member_type: 'student'), class: 'btn-lg btn-primary mb-4' do - = t('members.sign_up_as_student') - %i.fab.fa-github - = link_to registration_path(member_type: 'coach'), class: 'btn-lg btn-primary' do - = t('members.sign_up_as_coach') - %i.fab.fa-github +.py-4.py-lg-5.bg-light + .container + .row.justify-content-md-center + .col-md-10.col-lg-8 + %p.lead + = t('members.new.intro') + = link_to t('members.code_of_conduct'), code_of_conduct_path + \. + %p.lead + = t('members.new.students.intro') + = link_to t('members.new.students.criteria_link'), 'http://codebar.io/student-guide#eligibility' + = t('members.new.students.criteria_brief') + %p.lead + = t('members.new.students.github') + .d-flex.flex-column.align-items-start + = link_to registration_path(member_type: 'student'), class: 'btn-lg btn-primary mb-4 text-decoration-none' do + = t('members.sign_up_as_student') + %i.fab.fa-github + = link_to registration_path(member_type: 'coach'), class: 'btn-lg btn-primary text-decoration-none' do + = t('members.sign_up_as_coach') + %i.fab.fa-github diff --git a/app/views/members/step2.html.haml b/app/views/members/step2.html.haml index 3a4710726..b99f4dd3d 100644 --- a/app/views/members/step2.html.haml +++ b/app/views/members/step2.html.haml @@ -1,6 +1,6 @@ -.container-fluid.pt-3 +.container.py-4.py-lg-5 .row.justify-content-md-center - .col.col-md-8 + .col-md-10.col-lg-8 %h1 Subscribe %p To receive invitations to our events you must subscribe to the appropriate chapters. Alternatively, you can always RSVP directly from the website. Just be aware that spots to some of our busier chapters fill up fast. @@ -13,5 +13,5 @@ = render partial: 'coach_invite_subscriptions', locals: {groups: @coach_groups, collapsed: false} .row.justify-content-md-center.mb-4 - .col.col-md-8.text-right + .col-md-10.col-lg-8.text-right = link_to 'Done', profile_path, class: 'btn btn-primary', role: 'button' diff --git a/app/views/terms_and_conditions/show.html.haml b/app/views/terms_and_conditions/show.html.haml index daf0b2768..3809d97d2 100644 --- a/app/views/terms_and_conditions/show.html.haml +++ b/app/views/terms_and_conditions/show.html.haml @@ -1,6 +1,6 @@ -.container-fluid.stripe.reverse +.container.py-4.py-lg-5 .row.justify-content-md-center - .col.col-md-8 + .col-md-10.col-lg-8 %h1= t('terms_and_conditions.title') %p = t('terms_and_conditions.body') @@ -9,6 +9,6 @@ = simple_form_for @terms_and_conditions_form, url: terms_and_conditions_path, method: :patch do |f| .row.justify-content-md-center - .col.col-md-8 + .col-md-10.col-lg-8 = f.input :terms, as: :boolean = f.button :button, t('terms_and_conditions.accept'), class: 'btn btn-primary mb-0'