-
Notifications
You must be signed in to change notification settings - Fork 22
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.
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
refactor images, change heading colors on scroll #464
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9de1b22
refactored how we pull in images using gatsby docs
ccchwang a9f13a1
color for text and buttons change on scroll
ccchwang 8d969cf
added all dummy text. refactored how colors change
ccchwang cb486c9
refactored color loops in scss
ccchwang 023a389
small tweaks
ccchwang c4dfb2a
ran yarn format
ccchwang 00b4c54
add icons, minify images (#465)
b28f2f8
Ch/browser graphic (#467)
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import menu from './menu.png' | ||
import VigetLogo from './viget-logo.js' | ||
import microcosmLogo from './microcosm-logo.png' | ||
|
||
export { menu, VigetLogo, microcosmLogo } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,4 @@ $page-gutter-desktop: 20px; | |
$nav-height: 76px; | ||
$footer-height: 145px; | ||
|
||
$section-count: 3; | ||
$section-count: 8; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,9 +90,17 @@ $section-top-padding-desktop: $nav-height + 110px; | |
// CONTENT - elements | ||
|
||
.section__content__heading { | ||
color: color(primary-1); | ||
font-size: rem(30); | ||
margin-bottom: rem(40); | ||
position: relative; | ||
transition: transition(color); | ||
|
||
@for $i from 2 through $section-count { | ||
.bg-color-#{$i} & { | ||
color: color(primary-#{$i}); | ||
} | ||
} | ||
|
||
@include breakpoint(large-desktop-up) { | ||
margin-bottom: rem(63); | ||
|
@@ -114,8 +122,16 @@ $section-top-padding-desktop: $nav-height + 110px; | |
|
||
.section__content__subheading { | ||
@include font-family-medium; | ||
color: color(secondary-1); | ||
margin-bottom: 0.5rem; | ||
text-transform: uppercase; | ||
transition: transition(color); | ||
|
||
@for $i from 2 through $section-count { | ||
.bg-color-#{$i} & { | ||
color: color(secondary-#{$i}); | ||
} | ||
} | ||
|
||
.toggle-container.-mobile & { | ||
@include breakpoint(medium-desktop-down) { | ||
|
@@ -167,14 +183,23 @@ $section-top-padding-desktop: $nav-height + 110px; | |
} | ||
|
||
.section__toggle-btn { | ||
background-color: color(secondary-1); | ||
border-radius: 10px; | ||
font-size: rem(18); | ||
height: 57px; | ||
text-transform: uppercase; | ||
transition: transition(background-color); | ||
width: 217px; | ||
font-size: rem(18); | ||
|
||
@for $i from 2 through $section-count { | ||
.bg-color-#{$i} & { | ||
background-color: color(secondary-#{$i}); | ||
} | ||
} | ||
|
||
&::after { | ||
content: 'Browser View'; | ||
opacity: 0.6; | ||
} | ||
|
||
&.-browserView { | ||
|
@@ -224,6 +249,10 @@ $section-top-padding-desktop: $nav-height + 110px; | |
&:last-child { | ||
@include breakpoint(large-desktop-up) { | ||
margin-bottom: 60vh; | ||
|
||
&::after { | ||
content: '' | ||
} | ||
} | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. below are just placeholder images that I'll swap out in another PR |
||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll replace all the
alt="TODO"
at the end