-
Notifications
You must be signed in to change notification settings - Fork 51
Pubsite modernization - for real this time #296
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
Merged
vivian-hafener
merged 12 commits into
ComputerScienceHouse:develop
from
vivian-hafener:develop
Jul 7, 2022
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
37f0113
Started bringing changes from old re-write to dev
vivian-hafener 18dcbdb
Fixed sizing of h2 elements
vivian-hafener 90fe872
Copied over scss to main.scss and added stats
vivian-hafener 841f9aa
Fixed the inclusion of .jekyll-cache in git
vivian-hafener a4c800b
Updated fonts in index.html
vivian-hafener 5790196
Fixed blog card issue
vivian-hafener eef9ea2
Fixed issue with tour dropdown button
vivian-hafener d7485e0
Fixed blog card sizing issue
vivian-hafener 382d045
Fixed headline font sizing and padding on headline
vivian-hafener c918426
Cleaning up my SCSS and making project images bigger
vivian-hafener 5901832
Merge branch 'ComputerScienceHouse:develop' into develop
vivian-hafener aa29a43
Fixed opacity on about card and sizing of projects
vivian-hafener 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 hidden or 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 |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ vendor/ | |
| _site | ||
| .sass-cache | ||
| .jekyll-metadata | ||
| .jekyll-cache | ||
| npm-debug.log | ||
| .bundle/ | ||
| node_modules/ | ||
|
|
||
This file contains hidden or 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,86 @@ | ||
| .content { | ||
| position: relative; | ||
| width: 100%; | ||
| margin: auto; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .content-overlay { | ||
| background: rgba(0,0,0,0.6); | ||
| position: absolute; | ||
| height: 100%; | ||
| width: 100%; | ||
| left: 0; | ||
| top: 0; | ||
| bottom: 0; | ||
| right: 0; | ||
| opacity: 0; | ||
| -webkit-transition: all 0.4s ease-in-out 0s; | ||
| -moz-transition: all 0.4s ease-in-out 0s; | ||
| transition: all 0.4s ease-in-out 0s; | ||
| } | ||
|
|
||
| .content:hover .content-overlay{ | ||
| opacity: 1; | ||
| } | ||
|
|
||
| .content-image{ | ||
| width: 100%; | ||
| } | ||
|
|
||
| .content-background { | ||
| background: rgba(0, 0, 0, 0.45); | ||
| } | ||
|
|
||
| .content-details { | ||
| position: absolute; | ||
| text-align: center; | ||
| padding-left: 1em; | ||
| padding-right: 1em; | ||
| width: 100%; | ||
| top: 50%; | ||
| left: 50%; | ||
| opacity: 0; | ||
| -webkit-transform: translate(-50%, -50%); | ||
| -moz-transform: translate(-50%, -50%); | ||
| transform: translate(-50%, -50%); | ||
| -webkit-transition: all 0.3s ease-in-out 0s; | ||
| -moz-transition: all 0.3s ease-in-out 0s; | ||
| transition: all 0.3s ease-in-out 0s; | ||
| } | ||
vivian-hafener marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| .content:hover .content-details{ | ||
| top: 50%; | ||
| left: 50%; | ||
| opacity: 1; | ||
| } | ||
|
|
||
| .content-details h3{ | ||
| color: #fff; | ||
| font-weight: 500; | ||
| letter-spacing: 0.15em; | ||
| margin-bottom: 0.5rem; | ||
| padding: auto; | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| .content-details p{ | ||
| color: #fff; | ||
| font-size: 0.8em; | ||
| } | ||
|
|
||
| .fadeIn-bottom{ | ||
| top: 80%; | ||
| } | ||
|
|
||
| @media screen and (max-width: 700px) { | ||
| .content-details{ | ||
| top: 50%; | ||
| left: 50%; | ||
| opacity: 1; | ||
| } | ||
| .content-overlay{ | ||
| opacity: 1; | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or 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,134 @@ | ||
| $card-size: 300px; | ||
| $p-m-default: 20px; | ||
|
|
||
| $black: #111; | ||
| $white: #FFF; | ||
|
|
||
| $csh-pink: #b0197e; | ||
| $csh-blue: #404b69; | ||
| $gray: #f4f4f6; | ||
|
|
||
| // Easing Properties | ||
| $easeOutQuad: cubic-bezier(0.250, 0.460, 0.450, 0.940); | ||
|
|
||
| // PX to EM | ||
| $browser-context: 16; | ||
|
|
||
| @function em($pixels, $context: $browser-context) { | ||
| @if (unitless($pixels)) { | ||
| $pixels: $pixels * 1px; | ||
| } | ||
|
|
||
| @if (unitless($context)) { | ||
| $context: $context * 1px; | ||
| } | ||
|
|
||
| @return $pixels / $context * 1em; | ||
| } | ||
|
|
||
| // Transition Mixin | ||
| @mixin transition($transition...) { | ||
| -moz-transition: $transition; | ||
| -o-transition: $transition; | ||
| -webkit-transition: $transition; | ||
| transition: $transition; | ||
| } | ||
|
|
||
|
|
||
| .triple_a { | ||
| @include transition(all 300ms $easeOutQuad); | ||
| &:hover { | ||
| @include transition(all 300ms $easeOutQuad); | ||
| } | ||
| } | ||
|
|
||
| #wrapper { | ||
| position: relative; | ||
| display: flex; | ||
| height: 100vh; | ||
| align-items: center; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| article.card { | ||
| background-image: linear-gradient(0deg, $csh-blue 0%, $csh-pink 100%); | ||
| width: $card-size; | ||
| height: $card-size; | ||
| margin: $p-m-default; | ||
| position: relative; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| .card-image { | ||
| max-width: 100%; | ||
| width: 100%; | ||
| height: $card-size; | ||
| object-fit: cover; | ||
| transform: translate(0,0); | ||
| @include transition(all 400ms $easeOutQuad); | ||
| } | ||
|
|
||
| .card-meta { | ||
| font-size: em(11); | ||
| text-transform: uppercase; | ||
| letter-spacing: 1px; | ||
| &:before { | ||
| content: ''; | ||
| height: 1px; | ||
| width: 30px; | ||
| background-color: #fff; | ||
| position: relative; | ||
| display: block; | ||
| margin-bottom: 10px; | ||
| backface-visibility: hidden; | ||
| opacity: 0; | ||
| transform: translate(0,-10px); | ||
| @include transition(all 200ms $easeOutQuad); | ||
| } | ||
| } | ||
|
|
||
| .card-text { | ||
| color: #FFF; | ||
| // This next line controls the background opacity | ||
| background-color: rgba($black, .40); | ||
| position: absolute; | ||
| padding: $p-m-default; | ||
| z-index: 10; | ||
| width:100%; | ||
| height: 100%; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| align-content: flex-end; | ||
| @include transition(all 200ms $easeOutQuad); | ||
| } | ||
|
|
||
| .card-title { | ||
| margin: 8px 0; | ||
| font-weight: 300; | ||
| font-size: em(30); | ||
| } | ||
|
|
||
| @media screen and (min-width: 800px) { | ||
| .card a { | ||
| &:hover { | ||
| .card-text { | ||
| background-color: rgba($black, .60); | ||
| } | ||
| .card-meta { | ||
| &:before { | ||
| transform: translate(0,0); | ||
| opacity: 1; | ||
| @include transition(all 200ms $easeOutQuad); | ||
| } | ||
| } | ||
|
|
||
| .card-image { | ||
| transform: translate(20px,0); | ||
| @include transition(all 400ms $easeOutQuad); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.