Merge 44e375c into 58ff880

codebar · Jul 1, 2022 · 56bc702 · 56bc702
2 parents 58ff880 + 44e375c
commit 56bc702
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 109 deletions.
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -24,7 +24,6 @@
 @import "partials/events";
 @import "partials/social_media";
 @import "partials/attendances";
-@import "partials/jobs";
 @import "partials/star-rating";
 @import "partials/event";
 

diff --git a/app/assets/stylesheets/partials/_jobs.scss b/app/assets/stylesheets/partials/_jobs.scss
diff --git a/app/views/jobs/_show.html.haml b/app/views/jobs/_show.html.haml
@@ -1,4 +1,4 @@
-.container-fluid.stripe.reverse
+.container.py-4.py-lg-5
   - if @job.expired?
     .row
       .col-12

diff --git a/app/views/jobs/index.html.haml b/app/views/jobs/index.html.haml
@@ -1,6 +1,6 @@
 - title t('jobs.title')
 
-.container-fluid.stripe.reverse
+.container.py-4.py-lg-5
   .row
     .col
       %h1= t('jobs.title')
@@ -11,6 +11,7 @@
           = t('jobs.index.none')
         %br
         %small #{link_to('Click here', new_member_job_path)} if you would like to post a new job.
+
   - if @jobs.any?
     .row
       .col.col-md-8

diff --git a/app/views/jobs/show.html.haml b/app/views/jobs/show.html.haml
@@ -1,6 +1,6 @@
 - title "#{@job.title} | #{t('jobs.title')}"
 
-= render partial: 'jobs/show', locals: { admin: false, preview: true }
+= render partial: 'jobs/show', locals: { admin: false, preview: false }
 
 %script.jobref{type: 'application/ld+json'}
   = raw(render partial: 'job.json.jbuilder', locals: { job: @job })
diff --git a/app/views/member/jobs/edit.html.haml b/app/views/member/jobs/edit.html.haml
@@ -1,14 +1,13 @@
-.job
-  .row.pt-4
+.container.pt-4
+  .row
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ml-0.mb-0
           %li.breadcrumb-item= link_to t('member.jobs.title'), member_jobs_path
           %li.breadcrumb-item= link_to @job.title, member_job_path(@job.id)
           %li.breadcrumb-item.active Edit
 
-  .stripe.reverse
-    .row
-      .col
-        = simple_form_for @job, url: member_job_path, method: :put do |f|
-          = render partial: 'form', locals: { f: f }
+  .row.py-4.py-lg-5
+    .col
+      = simple_form_for @job, url: member_job_path, method: :put do |f|
+        = render partial: 'form', locals: { f: f }
diff --git a/app/views/member/jobs/index.html.haml b/app/views/member/jobs/index.html.haml
@@ -1,13 +1,14 @@
-.job
-  .row.pt-4
+.container.pt-4
+  .row
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ml-0.mb-0
           %li.breadcrumb-item.active= link_to t('member.jobs.title'), '#'
 
-  - if @jobs.any?
-    .stripe.reverse
-      .row
+- if @jobs.any?
+  .container.py-4.py-lg-5
+    .row
+      .col
         %table.table.table-striped
           %thead
             %tr
@@ -22,38 +23,41 @@
             - @jobs.each do |job|
               = render partial: 'member/jobs/job', locals: { job: job }
 
-      .row.mb-4
-        .col-12.col-md-6.text-left
-          = page_entries_info(@jobs, model: 'job')
-        .col-12.col-md-6.text-right
-          = will_paginate(@jobs)
+    .row.mb-4
+      .col-12.col-md-6.text-left
+        = page_entries_info(@jobs, model: 'job')
+      .col-12.col-md-6.text-right
+        = will_paginate(@jobs)
 
-      .row
-        .col.text-right
-          = link_to('Post a job', new_member_job_path, class: 'btn btn-primary')
-  - else
-    .stripe.reverse
-      .row.justify-content-center
-        .col.col-md-10.col-lg-8
-          %h1.h2= t('member.jobs.index.title', students_count: @students_count)
-          %p= t('member.jobs.index.description')
-          .card.mb-4.border-primary
-            .card-body
-              %p.mb-0
-                = raw t('member.jobs.index.offer.title')
-                %br
-                %span= t('member.jobs.index.offer.job_board')
-                %br
-                %span= t('member.jobs.index.offer.slack')
-                %br
-                %span= t('member.jobs.index.offer.twitter')
-          = link_to('Post a job', new_member_job_path, class: 'btn btn-primary')
+    .row
+      .col.text-right
+        = link_to('Post a job', new_member_job_path, class: 'btn btn-primary')
+
+- else
+  .container.py-4.py-lg-5
+    .row.justify-content-center
+      .col.col-md-10.col-lg-8
+        %h1.h2= t('member.jobs.index.title', students_count: @students_count)
+        %p= t('member.jobs.index.description')
+        .card.mb-4.border-primary
+          .card-body
+            %p.mb-0
+              = raw t('member.jobs.index.offer.title')
+              %br
+              %span= t('member.jobs.index.offer.job_board')
+              %br
+              %span= t('member.jobs.index.offer.slack')
+              %br
+              %span= t('member.jobs.index.offer.twitter')
+        = link_to('Post a job', new_member_job_path, class: 'btn btn-primary')
 
-    .stripe.reverse
+  .py-4.py-lg-5.bg-light
+    .container
       .row.justify-content-center
         .col.col-md-10.col-lg-8
-          %blockquote
-            %p= t('member.jobs.index.testimonial')
-            %footer.clearfix
-              = image_tag('ok.png', size: '30', class: 'th radius left', alt: 'Bruno Girin')
-              %cite.left Bruno Girin, CTO, Imby
+          %figure
+            %blockquote.blockquote
+              %p= t('member.jobs.index.testimonial')
+            %figcaption.blockquote-footer.mt-0
+              = image_tag('ok.png', size: '30', class: 'rounded-circle', alt: 'Bruno Girin')
+              %cite Bruno Girin, CTO, Imby
diff --git a/app/views/member/jobs/new.html.haml b/app/views/member/jobs/new.html.haml
@@ -1,42 +1,41 @@
-.job
-  .row.pt-4
+.container.pt-4
+  .row
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ml-0.mb-0
           %li.breadcrumb-item=link_to t('member.jobs.title'), member_jobs_path
           %li.breadcrumb-item.active=t('member.jobs.new.title')
 
-  .stripe.reverse
-    .row
-      .col-12.col-lg-5.order-lg-2
-        .card
-          .card-header
-            %h6.mb-0=t('member.jobs.new.rules_intro')
-          .card-body
-            %ul.list-unstyled.ml-0
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#roles{type: 'checkbox'}
-                %label.form-check-label{for: 'roles'}= t('member.jobs.new.suitability')
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#degree{type: 'checkbox'}
-                %label.form-check-label{for: 'degree'}= t('member.jobs.new.degree')
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#experience{type: 'checkbox'}
-                %label.form-check-label{for: 'experience'}= t('member.jobs.new.experience')
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#work-details{type: 'checkbox'}
-                %label.form-check-label{for: 'work-details'}= t('member.jobs.new.details')
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#short{type: 'checkbox'}
-                %label.form-check-label{for: 'short'}= t('member.jobs.new.short')
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#pay{type: 'checkbox'}
-                %label.form-check-label{for: 'pay'}= t('member.jobs.new.salary')
-              %li.form-check.mb-3
-                %input.form-check-input.mt-1#payment{type: 'checkbox'}
-                %label.form-check-label{for: 'payment'}= t('member.jobs.new.pay.html', link: new_payment_path)
-            %p.mb-0= raw t('member.jobs.new.newsletter')
-        %br
-      .col-12.col-lg-7.order-lg-1
-        = simple_form_for @job, url: member_jobs_path, method: :post do |f|
-          = render partial: 'form', locals: { f: f }
+  .row.py-4.py-lg-5
+    .col-12.col-lg-5.order-lg-2
+      .card
+        .card-header
+          %h6.mb-0=t('member.jobs.new.rules_intro')
+        .card-body
+          %ul.list-unstyled.ml-0
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#roles{type: 'checkbox'}
+              %label.form-check-label{for: 'roles'}= t('member.jobs.new.suitability')
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#degree{type: 'checkbox'}
+              %label.form-check-label{for: 'degree'}= t('member.jobs.new.degree')
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#experience{type: 'checkbox'}
+              %label.form-check-label{for: 'experience'}= t('member.jobs.new.experience')
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#work-details{type: 'checkbox'}
+              %label.form-check-label{for: 'work-details'}= t('member.jobs.new.details')
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#short{type: 'checkbox'}
+              %label.form-check-label{for: 'short'}= t('member.jobs.new.short')
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#pay{type: 'checkbox'}
+              %label.form-check-label{for: 'pay'}= t('member.jobs.new.salary')
+            %li.form-check.mb-3
+              %input.form-check-input.mt-1#payment{type: 'checkbox'}
+              %label.form-check-label{for: 'payment'}= t('member.jobs.new.pay.html', link: new_payment_path)
+          %p.mb-0= raw t('member.jobs.new.newsletter')
+      %br
+    .col-12.col-lg-7.order-lg-1
+      = simple_form_for @job, url: member_jobs_path, method: :post do |f|
+        = render partial: 'form', locals: { f: f }
diff --git a/app/views/member/jobs/show.html.haml b/app/views/member/jobs/show.html.haml
@@ -1,12 +1,12 @@
-.job
+.container.pt-4
   .row.pt-4.mb-4
     .col
       %nav{'aria-label': 'breadcrumb'}
-        %ol.breadcrumb.ml-0
+        %ol.breadcrumb.ml-0.mb-0
           %li.breadcrumb-item= link_to t('member.jobs.title'), member_jobs_path
           %li.breadcrumb-item.active= @job.title
 
-  .row.mb-5
+  .row.mb-4
     .col-12
       .alert.alert-info
         = t("job.messages.#{@job.status}_html")
@@ -23,6 +23,7 @@
         %br
         %small= t('member.jobs.new.approval_info')
   .row
-    %h1 Preview
+    %h1.mb-4 Preview
 
+.bg-light
   = render partial: 'jobs/show', locals: { admin: false, preview: true }