Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed careerlist header #47

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fixed careerlist header #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this file

"liveServer.settings.port": 5501
}
30 changes: 14 additions & 16 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,12 +516,11 @@ body {
justify-content: space-between;
overflow: hidden;
align-items: baseline;
margin-top: 2rem;
padding-top: 2rem; }
padding-top: 1rem; }
.navbar .header-b-back {
display: flex;
margin-left: 1rem;
margin-top: 5%; }
margin-top: 3%; }
.navbar .header-b-back .header-back-img {
border: thin solid white;
padding: 0.3rem; }
Expand Down Expand Up @@ -1993,38 +1992,37 @@ u {
margin: 0;
font-family: "Raleway" "sans-serif"; }

#career-header {
.career-header {
width: 86%;
margin-left: auto;
margin-right: auto;
padding: 0px; }

#header-text {
.header-text {
margin: 0px auto;
width: 80%;
margin-top: 50px;
line-height: 25px; }
margin-top: 20px;
line-height: 25px;
font-size: 30px; }

#header-text {
font-size: 35px; }

#first-career-container {
background-color: #fafafa;
padding-top: 150px;
padding-bottom: 150px; }
padding-bottom: 150px;
position: relative; }
#first-career-container img#careerlist-2-image {
position: absolute;
right: 250px;
top: 653px; }
top: 82px; }
@media screen and (max-width: 767px) {
#first-career-container img#careerlist-2-image {
display: none; } }
@media screen and (max-width: 940px) {
#first-career-container img#careerlist-2-image {
right: 150px; } }
@media screen and (max-width: 1120px) {
#first-career-container img#careerlist-2-image {
top: 642px; } }
@media screen and (max-width: 800px) {
#first-career-container img#careerlist-2-image {
top: 659px; } }
right: 140px; } }
#first-career-container .first-career-item {
display: flex;
margin-left: auto;
Expand Down
4 changes: 2 additions & 2 deletions pages/careerlist-2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<body>

<header class="header1">
<div data-include="header-b" class="header-b" id="career-header"></div>
<section class="header-txt" id="header-text">
<div data-include="header-b" class="header-b career-header"></div>
<section class="header-txt header-text" id="header-text">
<p class="txt">We're looking for curious </p>
<p class="txt"> problem solver sounds familiar?</p>
</section>
Expand Down
5 changes: 2 additions & 3 deletions pages/careerlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<link rel="stylesheet" href="../css/main.css">
<title>Career</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>

</head>
<body>
<header class="header1">
<div data-include="header-b" class="header-b"></div>
<section class="header-txt">
<div data-include="header-b" class="header-b career-header"></div>
<section class="header-txt header-text">
<p class="txt">We're looking for curious </p>
<p class="txt"> problem solver sounds familiar?</p>
</section>
Expand Down
5 changes: 2 additions & 3 deletions scss/layouts/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@
justify-content: space-between;
overflow: hidden;
align-items: baseline;
margin-top: 2rem;
padding-top: 2rem;
padding-top: 1rem;
.header-b-back {
display: flex;
margin-left: 1rem;
margin-top: 5%;
margin-top: 3%;
.header-back-img{
border:thin solid white;
padding:0.3rem;
Expand Down
21 changes: 13 additions & 8 deletions scss/pages/_careerlist-2.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,40 +35,45 @@ $titleColor: #505050;
}


#career-header{
.career-header{
width: 86%;
margin-left: auto;
margin-right: auto;
padding: 0px;
}

#header-text{
.header-text{
margin: 0px auto;
width: 80%;
margin-top: 50px;
margin-top: 20px;
line-height: 25px;
font-size: 30px;
}
#header-text{
font-size: 35px;
}

#first-career-container{
background-color: #fafafa;
padding-top: 150px;
padding-bottom: 150px;
position: relative;

img#careerlist-2-image{
position: absolute;
right: 250px;
top: 653px;
top: 82px;
@include media-query(767px){
display: none;
}
@include media-query(940px){
right: 150px;
@include media-query(1120px){
right: 140px;
}
@include media-query(1120px){
top: 642px;
// top: 642px;
}
@include media-query(800px){
top: 659px;
// top: 659px;
}
}

Expand Down