Skip to content

Merge dev to main #39

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

Merged
merged 2 commits into from
Jan 17, 2022
Merged

Merge dev to main #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e20224
fix colors blog & jobs
benjacanas Jan 17, 2022
aba4029
Merge pull request #38 from bitlogic/CUN-1177-3
julsh21 Jan 17, 2022
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
2 changes: 1 addition & 1 deletion src/components/BlogPage/BlogArticle/BlogArticle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
width: 100%;
height: 150px;
padding: 0 15px;

color: $primary;
h1,
h2,
h3,
Expand Down
7 changes: 7 additions & 0 deletions src/components/JobsPage/JobsPage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
}
}

.cats-chevron {
color: $primary !important;
& path {
fill: $primary !important;
}
}

.widget-container {
min-height: 65vh;
margin-top: 20px !important;
Expand Down
5 changes: 4 additions & 1 deletion src/components/NavBar/NavBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
margin-top: 2rem;
}
.NavBar__Item {
padding: 0.5rem 1rem;
padding: 0.5rem 0.5rem;
}
.NavBar__Link {
text-decoration: none;
Expand All @@ -44,6 +44,8 @@
color: #1ecad3;
}



@media screen and (min-width: 992px) {
.NavBar__Logo {
width: 143px;
Expand All @@ -61,6 +63,7 @@
}
}


.theme-toggle-checkbox:checked + .theme-toggle-label .theme-toggle-ball{
transform: translateX(24px);
}
Expand Down
3 changes: 2 additions & 1 deletion src/context/themeContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
const themes = {
light: {
'--nav-footer-container': '#2a2c2e',

'--blog-card-container': '#f5f5f5',
'--primary': '#000000',
'--primary-hover': '#000000',
'--primary-container': '#ffffff',
Expand All @@ -13,6 +13,7 @@ const themes = {
},
dark: {
'--nav-footer-container': '#383838',
'--blog-card-container': '#383838',

'--primary': '#ffffff',
'--primary-hover': '#000000',
Expand Down
1 change: 1 addition & 0 deletions src/styles/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $primary-font: "Roboto", sans-serif;
$medium: 20px;

$nav-footer-container: var(--nav-footer-container);
$blog-card-container: var(--blog-card-container);

$primary: var(--primary);
$primary-hover: var(--primary-hover);
Expand Down
4 changes: 3 additions & 1 deletion src/templates/BlogItemDetail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
flex-direction: column;
justify-content: center;
align-items: center;

}

&__description {
Expand Down Expand Up @@ -106,7 +107,8 @@
max-width: 420px;
padding: 15px;
margin: 20px 0;
background: $grey-light;
background: $blog-card-container;
border-radius: 5px;
box-shadow: 0 3px 7px -1px rgba(#000, 0.1);
overflow: hidden;
z-index: 0;
Expand Down