Resolve conflict

app/assets/stylesheets/application.scss

@@ -14,27 +14,24 @@
  *= require_self
  *= require_self
  */
  */
 
 
- $main-color: #1da173;
+$main-color: #1da173;
 
 
- .min-vh-80 {
-   min-height: 80vh;
- }
- .navbar {
-  background-color: $main-color;
- }
+.navbar {
+background-color: $main-color;
+}
 
 
- .footer {
+.footer {
   width: 100%;
   width: 100%;
   height: 50px;
   height: 50px;
   background-color: $main-color;
   background-color: $main-color;
- }
+}
 
 
- .divider {
+.divider {
   width: 100px;
   width: 100px;
   border-top: 2px solid $main-color
   border-top: 2px solid $main-color
- }
+}
 
 
- .vertical-divider {
+.vertical-divider {
   position: relative;
   position: relative;
   padding: 0px 4px;
   padding: 0px 4px;
 
 
@@ -55,16 +52,27 @@
       display: none;
       display: none;
     }
     }
   }
   }
- }
+}
 
 
- .card-img-rounded {
-   border-radius: 50%;
-   background-color: mediumseagreen;
-   height: 220px; width: 220px;
-   margin-top: 50px;
-   padding: 10px;
+.ribbon::before, .ribbon::after {
+  content: "";
+  position: absolute;
+  height: 49px;
+  top: 0;
+}
 
 
-   .card-img {
-     margin-top: 40px;
-   }
- }
+.ribbon::before {
+  left: 0;
+  border-top: 24px solid transparent;
+  border-bottom: 24px solid transparent;
+  border-right: 24px solid transparent;
+  border-left: 24px solid white;
+}
+
+.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 'jobs/:model/:slug', to: 'jobs#index', as: :jobs
   get 'my', to: 'users#my_page', as: :my_page
   get 'my', to: 'users#my_page', as: :my_page
   resources :users, only: :show
   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
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
 end