Skip to content

V
VeNJob
Commit a4ec7e87 by Tô Ngọc Ánh
Options

Resolve conflict

parent 803abcc4
Showing with 56 additions and 47 deletions
app/assets/stylesheets/application.scss
...@@ -14,57 +14,65 @@ ...@@ -14,57 +14,65 @@
*= require_self *= require_self
*/ */
$main-color: #1da173; $main-color: #1da173;
.min-vh-80 { .navbar {
min-height: 80vh; background-color: $main-color;
} }
.navbar {
.footer {
width: 100%;
height: 50px;
background-color: $main-color; background-color: $main-color;
} }
.footer { .divider {
width: 100%; width: 100px;
height: 50px; border-top: 2px solid $main-color
background-color: $main-color; }
}
.divider { .vertical-divider {
width: 100px; position: relative;
border-top: 2px solid $main-color padding: 0px 4px;
}
.vertical-divider { &::after {
position: relative; content: '';
padding: 0px 4px; 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 { .ribbon::before, .ribbon::after {
content: ''; content: "";
width: 1px; position: absolute;
height: 18px; height: 49px;
margin-left: 3px; top: 0;
position: absolute; }
border-right: 1px solid black;
top: 50%;
right: -3px;
transform: translateY(-50%);
}
&:last-child {
&::after {
display: none;
}
}
}
.card-img-rounded { .ribbon::before {
border-radius: 50%; left: 0;
background-color: mediumseagreen; border-top: 24px solid transparent;
height: 220px; width: 220px; border-bottom: 24px solid transparent;
margin-top: 50px; border-right: 24px solid transparent;
padding: 10px; border-left: 24px solid white;
}
.card-img { .ribbon::after {
margin-top: 40px; 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 ...@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment