Skip to content

Homepage headers fix #163

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

Open
jennetturkkan wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Homepage headers fix #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16abffe
homepage headers fix
jennetturkkan Nov 22, 2020
e218827
add header mixin, add it to all headers
jennetturkkan Nov 22, 2020
bc96ee0
resolve merge conflict
jennetturkkan Nov 22, 2020
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
14 changes: 3 additions & 11 deletions src/components/BlogsCarouselHome/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,18 @@
@import "../../style/bootstrapImports";
@import "../../style/buttons";
@import "../../style/bootstrapImports";
@import "../../style/headings";

.homeCarousel {
text-align: center;
font-family: $mainFontFamily;

.title {
color: $primaryColor;
font-weight: bold;
margin-top: 3rem;
font-family: $mainFontFamily;
text-align: center;
font-size: 2rem;
padding-top: 0.5rem;
@include mainHeader;
}

h6 {
color: $darkColor;
text-align: center;
font-family: $mainFontFamily;
margin-bottom: 3rem;
@include secondaryHeader;
}

.slick-slider {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ContactInfo/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

.contactInfo {
h2 {
@include mainHeading;
@include contactHeader;
margin-bottom: 1rem;
}

Expand Down
13 changes: 3 additions & 10 deletions src/components/JobsTrainingHeader/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
@import "../../style/variables";
@import "../../style/headings";

.jobsTrainingHeader {
h2 {
color: $primaryColor;
font-family: $mainFontFamily;
margin-top: 4rem;
text-align: center;
font-size: 2rem;
font-weight: bold;
@include mainHeader;
}

h6 {
color: $darkColor;
text-align: center;
font-family: $mainFontFamily;
margin-bottom: 3rem;
@include secondaryHeader;
}
}
10 changes: 8 additions & 2 deletions src/components/JobsTrainingHome/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "../../style/variables";
@import "../../style/buttons";
@import "../../style/headings";

.jobsTrainingSection {
padding-top: 0.5rem;
Expand All @@ -9,8 +10,13 @@
font-family: $mainFontFamily;

h6 {
color: $primaryColor;
margin-bottom: 3rem;
@include secondaryHeader;
}

.jobsTrainingHeader {
h2 {
margin-top: 3rem;
}
}

.jobsTrainingHeader {
Expand Down
13 changes: 3 additions & 10 deletions src/components/SeekHelp/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
@import "../../style/variables";
@import "../../style/bootstrapImports";
@import "../../style/headings";

.seekHelpSection {
background: $lightColor;
height: 54rem;
margin-bottom: 5rem;

h2 {
color: $primaryColor;
text-align: center;
font-family: $mainFontFamily;
font-weight: bold;
margin-top: 3rem;
padding-top: 0.5rem;
@include mainHeader;
}

h6 {
color: $darkColor;
text-align: center;
font-size: 16px;
font-family: $mainFontFamily;
@include secondaryHeader;
}

.mapStyle {
Expand Down
8 changes: 3 additions & 5 deletions src/components/SignIn/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.signInSection {
/* All section style */
width: 100%;
margin-top: 4rem;
margin-top: 2rem;
margin-bottom: 4rem;

.signInImg {
Expand All @@ -23,10 +23,8 @@
}

h2 {
@include mainHeading;
font-size: 2.8rem;
color: $primaryColor;
margin-bottom: 4rem;
@include mainHeader;
margin: 0 0 4rem 0;
}

h4 {
Expand Down
8 changes: 3 additions & 5 deletions src/components/SignUp/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.signUpSection {
/* All section style */
width: 100%;
margin-top: 4rem;
margin-top: 2rem;
margin-bottom: 4rem;
background-color: $lightColor;

Expand All @@ -20,10 +20,8 @@
}

h2 {
@include mainHeading;
font-size: 2.8rem;
color: $primaryColor;
margin-bottom: 4rem;
@include mainHeader;
margin: 0 0 4rem 0;
}

h4 {
Expand Down
8 changes: 2 additions & 6 deletions src/containers/AboutUsPage/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
@import "../../style/variables";
@import "../../style/headings";

.aboutUsPage {
h2 {
color: $primaryColor;
font-family: $mainFontFamily;
margin-top: 4rem;
font-size: 2rem;
font-weight: bold;
text-align: center;
@include mainHeader;
}

p {
Expand Down
13 changes: 3 additions & 10 deletions src/containers/BlogPage/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
@import "../../style/variables";
@import "../../style/headings";

.blogsMainContainer {
h2 {
color: $primaryColor;
font-family: $mainFontFamily;
margin-top: 4rem;
text-align: center;
font-size: 2rem;
font-weight: bold;
@include mainHeader;
}

h6 {
color: $darkColor;
text-align: center;
font-family: $mainFontFamily;
margin-bottom: 4rem;
@include secondaryHeader;
}
}
12 changes: 3 additions & 9 deletions src/containers/ContactUsPage/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import "../../style/variables";
@import "../../style/headings";

.contactUsPage {
.contactContainer {
Expand All @@ -20,17 +21,10 @@
}

h2 {
color: $primaryColor;
font-family: $mainFontFamily;
margin-top: 4rem;
text-align: center;
font-size: 2rem;
font-weight: bold;
@include mainHeader;
}

h6 {
color: $darkColor;
text-align: center;
font-family: $mainFontFamily;
@include secondaryHeader;
}
}
7 changes: 3 additions & 4 deletions src/containers/ProfilePage/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
}

h2 {
@include mainHeading;
color: $primaryColor;
font-size: 2.7rem;
margin: 1rem 0 2rem 0;
@include mainHeader;
text-align: left;
margin: 1rem 0 3rem 0;
}

.sectionTitle {
Expand Down
13 changes: 3 additions & 10 deletions src/containers/SearchForHelpPage/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "../../style/variables";
@import "../../style/buttons";
@import "../../style/headings";

.searchHelpPage {
margin-bottom: 2rem;
Expand All @@ -8,19 +9,11 @@
}

h2 {
color: $primaryColor;
text-align: center;
font-family: $mainFontFamily;
font-weight: bold;
margin-top: 2rem;
@include mainHeader;
}

h6 {
color: $darkColor;
text-align: center;
font-size: 14px;
margin: 2rem 0;
font-family: $mainFontFamily;
@include secondaryHeader;
}

.seekHelpCards {
Expand Down
19 changes: 18 additions & 1 deletion src/style/_headings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
@mixin mainHeading {
@mixin mainHeader {
color: $primaryColor;
font-weight: bold;
margin-top: 3rem;
font-family: $mainFontFamily;
text-align: center;
font-size: 2rem;
padding-top: 0.5rem;
}

@mixin secondaryHeader {
color: $darkColor;
text-align: center;
font-family: $mainFontFamily;
margin-bottom: 3rem;
}

@mixin contactHeader {
font-family: $mainFontFamily;
font-style: normal;
font-weight: 900;
Expand Down