Resolve conflict

app/assets/stylesheets/application.scss

@@ -14,57 +14,65 @@
  *= require_self
  */
 
- $main-color: #1da173;
- 
- .min-vh-80 {
-   min-height: 80vh;
- }
- .navbar {
+$main-color: #1da173;
+
+.navbar {
+background-color: $main-color;
+}
+
+.footer {
+  width: 100%;
+  height: 50px;
   background-color: $main-color;
- }
+}
 
- .footer {
-   width: 100%;
-   height: 50px;
-   background-color: $main-color;
- }
+.divider {
+  width: 100px;
+  border-top: 2px solid $main-color
+}
 
- .divider {
-   width: 100px;
-   border-top: 2px solid $main-color
- }
+.vertical-divider {
+  position: relative;
+  padding: 0px 4px;
 
- .vertical-divider {
-   position: relative;
-   padding: 0px 4px;
+  &::after {
+    content: '';
+    width: 1px;
+    height: 18px;
+    margin-left: 3px;
+    position: absolute;
+    border-right: 1px solid black;
+    top: 50%;
+    right: -3px;
+    transform: translateY(-50%);
+  }
+  
+  &:last-child {
+    &::after {
+      display: none;
+    }
+  }
+}
 
-   &::after {
-     content: '';
-     width: 1px;
-     height: 18px;
-     margin-left: 3px;
-     position: absolute;
-     border-right: 1px solid black;
-     top: 50%;
-     right: -3px;
-     transform: translateY(-50%);
-   }
-   
-   &:last-child {
-     &::after {
-       display: none;
-     }
-   }
- }
+.ribbon::before, .ribbon::after {
+  content: "";
+  position: absolute;
+  height: 49px;
+  top: 0;
+}
 
- .card-img-rounded {
-   border-radius: 50%;
-   background-color: mediumseagreen;
-   height: 220px; width: 220px;
-   margin-top: 50px;
-   padding: 10px;
+.ribbon::before {
+  left: 0;
+  border-top: 24px solid transparent;
+  border-bottom: 24px solid transparent;
+  border-right: 24px solid transparent;
+  border-left: 24px solid white;
+}
 
-   .card-img {
-     margin-top: 40px;
-   }
- }
+.ribbon::after {
+  right: 0;
+  border-top: 24px solid white;
+  border-bottom: 24px solid white;
+  border-right: 24px solid white;
+  border-left: 24px solid transparent;
+}

config/routes.rb

@@ -7,5 +7,6 @@ Rails.application.routes.draw do
   get 'jobs/:model/:slug', to: 'jobs#index', as: :jobs
   get 'my', to: 'users#my_page', as: :my_page
   resources :users, only: :show
+  get 'apply', to: 'applied_jobs#new', as: :new_applied_job
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end