Skip to content

V
Venjob_HungNT
Commit 92724316 by Ngo Trung Hung
Options

fix bug

parent 4f3e97eb
Showing with 59 additions and 28 deletions
app/assets/javascripts/custom.js
$(document).ready(function () { $(document).on("turbolinks:load", function(){
$('.btn_favorite_outline').click(function (e) { $('.btn_favorite_outline').click(function (e) {
$(this).toggleClass('active'); $(this).toggleClass('active');
}); });
......
app/assets/stylesheets/custom.scss
...@@ -7,7 +7,7 @@ body { ...@@ -7,7 +7,7 @@ body {
overflow: hidden; overflow: hidden;
} }
$breakpoint-tablet: 922px; $breakpoint-tablet: 992px;
$main-color: #221f20; $main-color: #221f20;
// Header // Header
.cus_header { .cus_header {
...@@ -173,7 +173,7 @@ $main-color: #221f20; ...@@ -173,7 +173,7 @@ $main-color: #221f20;
position: fixed; position: fixed;
width: 100%; width: 100%;
height: 100%; height: 100%;
cursor: pointer;
display: none; display: none;
transition: 0.1s; transition: 0.1s;
} }
...@@ -230,14 +230,14 @@ $main-color: #221f20; ...@@ -230,14 +230,14 @@ $main-color: #221f20;
} }
.slogan { .slogan {
position: absolute; position: absolute;
top: 35%; top: 32%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
.slogan_text { .slogan_text {
text-align: center; text-align: center;
font-family: sans-serif; font-family: sans-serif;
font-size: 30px; font-size: 35px;
color: #eaeaea; color: #eaeaea;
transform: scale(1.35); transform: scale(1.35);
font-weight: 600; font-weight: 600;
...@@ -303,7 +303,7 @@ $main-color: #221f20; ...@@ -303,7 +303,7 @@ $main-color: #221f20;
border: none; border: none;
padding-left: 16px; padding-left: 16px;
color: #666; color: #666;
font-size: 14px; font-size: 15px;
} }
} }
...@@ -318,8 +318,7 @@ $main-color: #221f20; ...@@ -318,8 +318,7 @@ $main-color: #221f20;
outline: none; outline: none;
background-color: #fff; background-color: #fff;
color: #666; color: #666;
font-size: 14px; font-size: 15px;
// font-weight: bold;
height: 100%; height: 100%;
width: 100%; width: 100%;
flex-basis: 90%; flex-basis: 90%;
...@@ -329,7 +328,7 @@ $main-color: #221f20; ...@@ -329,7 +328,7 @@ $main-color: #221f20;
flex-basis: 10%; flex-basis: 10%;
color: #999; color: #999;
font-weight: 100; font-weight: 100;
transform: scale(1.2) translateY(13px); transform: scale(1.2) translateY(16px);
} }
&::before { &::before {
position: absolute; position: absolute;
...@@ -343,7 +342,7 @@ $main-color: #221f20; ...@@ -343,7 +342,7 @@ $main-color: #221f20;
} }
} }
.search_industries select{ .search_industries select{
padding: 12px 10px 12px 10px; padding: 12px 10px 12px 5px;
width: 100%; width: 100%;
border-radius: 4px !important; border-radius: 4px !important;
...@@ -369,8 +368,7 @@ $main-color: #221f20; ...@@ -369,8 +368,7 @@ $main-color: #221f20;
outline: none; outline: none;
background-color: #fff; background-color: #fff;
color: #666; color: #666;
font-size: 14px; font-size: 15px;
// font-weight: bold;
height: 100%; height: 100%;
width: 100%; width: 100%;
flex-basis: 90%; flex-basis: 90%;
...@@ -380,7 +378,7 @@ $main-color: #221f20; ...@@ -380,7 +378,7 @@ $main-color: #221f20;
flex-basis: 10%; flex-basis: 10%;
color: #999; color: #999;
font-weight: 100; font-weight: 100;
transform: scale(1.2) translateY(13px); transform: scale(1.2) translateY(16px);
} }
} }
...@@ -563,6 +561,7 @@ $main-color: #221f20; ...@@ -563,6 +561,7 @@ $main-color: #221f20;
} }
.slogan_text_h5 { .slogan_text_h5 {
display: block; display: block;
font-size: 25px;
} }
.box-search-mobile { .box-search-mobile {
display: block; display: block;
...@@ -590,7 +589,7 @@ $main-color: #221f20; ...@@ -590,7 +589,7 @@ $main-color: #221f20;
height: 160px; height: 160px;
} }
.slogan_text_h5 { .slogan_text_h5 {
font-size: 16px; font-size: 24px;
font-weight: 600; font-weight: 600;
} }
} }
...@@ -615,7 +614,7 @@ $main-color: #221f20; ...@@ -615,7 +614,7 @@ $main-color: #221f20;
.box_jobs { .box_jobs {
position: relative; position: relative;
width: 100%; width: 100%;
height: 130px; height: 134px;
margin: auto; margin: auto;
margin-top: 10px; margin-top: 10px;
margin-bottom: 5px; margin-bottom: 5px;
...@@ -639,7 +638,7 @@ $main-color: #221f20; ...@@ -639,7 +638,7 @@ $main-color: #221f20;
transform: translateY(-1px); transform: translateY(-1px);
} }
.job_name { .job_name {
font-size: 14px; font-size: 16px;
line-height: 14px; line-height: 14px;
font-weight: 600; font-weight: 600;
color: #d41323; color: #d41323;
...@@ -650,9 +649,13 @@ $main-color: #221f20; ...@@ -650,9 +649,13 @@ $main-color: #221f20;
text-decoration: none; text-decoration: none;
} }
} }
.box_info_copany_name { .cop {
font-size: 12.5px; background-color: white;
line-height: 12.5px; margin-top: -5px;
}
.box_info_copany_name {
font-size: 14px;
line-height: 20px;
color: #666; color: #666;
margin-top: 5px; margin-top: 5px;
...@@ -667,12 +670,12 @@ $main-color: #221f20; ...@@ -667,12 +670,12 @@ $main-color: #221f20;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.box_info_location { .box_info_location {
font-size: 11px; font-size: 13px;
color: #666; color: #666;
margin-top: 5px; margin-top: 5px;
} }
.box_info_salary { .box_info_salary {
font-size: 11px; font-size: 13px;
color: #008563; color: #008563;
font-weight: 600; font-weight: 600;
transform: translateY(-2px); transform: translateY(-2px);
...@@ -684,7 +687,7 @@ $main-color: #221f20; ...@@ -684,7 +687,7 @@ $main-color: #221f20;
// background-color: #d41323; // background-color: #d41323;
} }
.coc { .coc {
height: 12px; height: 12.5px;
width:100%; width:100%;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -695,8 +698,8 @@ $main-color: #221f20; ...@@ -695,8 +698,8 @@ $main-color: #221f20;
} }
.box_info_des { .box_info_des {
width: 100%; width: 100%;
font-size: 11px; font-size: 12.5px;
line-height: 12px; line-height: 12.5px;
color: #888; color: #888;
margin: 0; margin: 0;
} }
...@@ -735,7 +738,11 @@ $main-color: #221f20; ...@@ -735,7 +738,11 @@ $main-color: #221f20;
.btn_favorite_outline.xs { .btn_favorite_outline.xs {
display: none; display: none;
} }
@media only screen and (min-width: $breakpoint-tablet) {
.btn_search_submit {
width: 101%;
}
}
@media only screen and (max-width: $breakpoint-tablet) { @media only screen and (max-width: $breakpoint-tablet) {
// index // index
.padding_index { .padding_index {
...@@ -784,6 +791,7 @@ $main-color: #221f20; ...@@ -784,6 +791,7 @@ $main-color: #221f20;
font-size: 17px; font-size: 17px;
} }
} }
} }
@media only screen and (max-width: 660px) { @media only screen and (max-width: 660px) {
...@@ -798,11 +806,32 @@ $main-color: #221f20; ...@@ -798,11 +806,32 @@ $main-color: #221f20;
display: block; display: block;
z-index: 200; z-index: 200;
} }
.cop {
width: 85%;
height: 24px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
background-color: white;
}
.btn_search_submit {
height: 30px;
}
.search_industries_mobile {
padding-right: 4px;
}
.search_location_mobile {
padding-right: 4px;
}
} }
@media only screen and (max-width: 576px) { @media only screen and (max-width: 576px) {
.lol { .lol {
width: 80%; width: 80%;
} }
} }
app/models/company.rb
...@@ -3,9 +3,9 @@ class Company < ApplicationRecord ...@@ -3,9 +3,9 @@ class Company < ApplicationRecord
def self.get_5_last_jobs def self.get_5_last_jobs
data = Company.joins(:jobs).select('companies.*, jobs.name as job_title, data = Company.joins(:jobs).select('companies.*, jobs.name as job_title,
jobs.create_date as job_created, jobs.created_at as job_created,
jobs.salary, jobs.salary,
jobs.description').where('companies.id = jobs.company_id') jobs.description').where('companies.id = jobs.company_id')
@data_five_jobs = data.order(job_created: :desc).limit(5) @data_five_jobs = data.order(job_created: :asc).limit(5)
end end
end end
app/views/home/_banner_and_search.html.erb
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</div> </div>
<div class="container"> <div class="container">
<div class="row no-gutters"> <div class="row no-gutters">
<div class="offset-6 col-sm-6"> <div class="col-sm-12">
<button type="submit" class="btn_search_submit"> <button type="submit" class="btn_search_submit">
<i class="fas fa-search"></i> <i class="fas fa-search"></i>
Tìm việc Tìm việc
......
app/views/shared/_box_five_job.html.erb
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
<%= link_to "#{val.job_title}", "#", class: "job_name" %> <%= link_to "#{val.job_title}", "#", class: "job_name" %>
<%= image_tag 'trophy',class: "img_job_name" %> <%= image_tag 'trophy',class: "img_job_name" %>
</div> </div>
<div class = "cop">
<h5 class="box_info_copany_name"><i class="far fa-building"></i> <%= val.name %></h5> <h5 class="box_info_copany_name"><i class="far fa-building"></i> <%= val.name %></h5>
</div>
<h5 class="box_info_location"><i class="fas fa-map-marker-alt"></i> <%= val.address %></h5> <h5 class="box_info_location"><i class="fas fa-map-marker-alt"></i> <%= val.address %></h5>
<h5 class="box_info_salary"><i class="fas fa-dollar-sign"></i> Lương: <%= val.salary %></h5> <h5 class="box_info_salary"><i class="fas fa-dollar-sign"></i> Lương: <%= val.salary %></h5>
<div class="coc" > <div class="coc" >
......
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