Skip to content

Sass rebuild adjustments and changes #3

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

Open
wants to merge 1 commit into
base: weberjacob-rebuild
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
665 changes: 369 additions & 296 deletions assets/css/application.css

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions assets/scss/base/_base.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
body {
margin-top:0px;
margin-top:0;
font-family: $stack-Lato;
font-weight: normal;
background:#ecf0f1;
font-size: 16px;
background: $body-bg-grey;
background-image: url(data:image/png;base64,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);
overflow-x: hidden;
left: 0;
Expand Down
17 changes: 8 additions & 9 deletions assets/scss/base/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
font-size: $size;
line-height: $l-height;
font-weight: $weight;
color: $color;

color: $color;
}

// Buttons
Expand All @@ -20,15 +19,15 @@
// Shadows

@mixin callout-shadow {
-webkit-box-shadow: 0px 10px 32px -8px rgba($black,0.8);
-moz-box-shadow: 0px 10px 32px -8px rgba($black,0.8);
box-shadow: 0px 10px 32px -8px rgba($black,0.8);
-webkit-box-shadow: 0 0.625rem 2rem -0.5rem rgba($black,0.8);
-moz-box-shadow: 0 0.625rem 2rem -0.5rem rgba($black,0.8);
box-shadow: 0 0.625rem 2rem -0.5rem rgba($black,0.8);
}

@mixin callout-shadow-light {
-webkit-box-shadow: 0px 10px 32px -8px rgba($black,0.3);
-moz-box-shadow: 0px 10px 32px -8px rgba($black,0.3);
box-shadow: 0px 10px 32px -8px rgba($black,0.3);
-webkit-box-shadow: 0 0.625rem 2rem -0.5rem rgba($black,0.3);
-moz-box-shadow: 0 0.625rem 2rem -0.5rem rgba($black,0.3);
box-shadow: 0 0.625rem 2rem -0.5rem rgba($black,0.3);
}

// Trandistions
Expand All @@ -45,6 +44,6 @@
// Borders

@mixin border-top($color) {
border-top: 4px solid $color;
border-top: 0.25rem solid $color;
}

10 changes: 9 additions & 1 deletion assets/scss/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ $lt-grey : #636363;
$header-grey : #e7e7e7;
$aa-blue : #39a6c7;
$bright-green : rgba(114,229,86,1);
$body-bg-grey : #ecf0f1;

// Font stacks

Expand All @@ -23,6 +24,9 @@ $br: 4px;

$global-padding-top : 10px;

// Common Widths
$full-width : 69.1875rem;


// Margins

Expand All @@ -40,5 +44,9 @@ $path-img : '../img';
// Media query breakpoints
$brk-1090 : '(max-width: 1090px)';
$brk-900 : '(max-width: 900px)';
$brk-770 : '(max-width: 770px)';
$brk-865 : '(max-width: 865px)';
$brk-770 : '(max-width: 770px)';
$brk-650 : '(max-width: 650px)';
$brk-615 : '(max-width: 615px)';
$brk-450 : '(max-width: 450px)';

87 changes: 64 additions & 23 deletions assets/scss/layout/_columns.scss
Original file line number Diff line number Diff line change
@@ -1,59 +1,90 @@
/* Homepage Callout ----------- */
.twoColumn, .thirdColumn {
@extend %centered;
max-width: $column-width;
text-align: center;
margin: 20px auto;
margin: 2rem auto;
}

.halfColumn {
@include callout-shadow;
max-width: 48%;
float: left;
margin: 0 1%;
@include callout-shadow;


p {
@include ease-oneSecond-transition;
background-color: rgba($black,0.5);
padding: 10px;
padding: 0.625rem;
max-width: 20%;
margin: -60px auto;
border: 2px solid #43b3d8;
margin: -4rem auto;
border: 0.125rem solid #43b3d8;
border-radius: $br / 2;
}

p:hover {
@include ease-oneSecond-transition;
background-color: #3f9cbb;
transform: scale(1.1);
}
@extend %scale;
background-color: rgba($aa-blue, 0.8);
}

@media #{$brk-770} {
max-width: 90%;
width: 90% !important;
float: none;
margin: 0 auto 2rem;
}
}

.smallScreenFloat {

@media #{$brk-770} {
float: left;
width: 100%;
display: block;
text-align: center;
position: absolute;
right: 0%;
}
}

.callout h2 {
margin: 17% 25%;
background-color: $white;
padding: 4%;
font-size: 1.2em;
font-size: 1.2rem;
border-radius: 0 0 $br * 0.833333333 $br * 0.833333333;

@media #{$brk-770} {
margin-bottom: 10%;
}

@media #{$brk-615} {
margin-bottom: 19%;
}
}

.halfColumn::last-of-type {
margin-right: 0;
}

.calloutOne, .calloutTwo {
@extend %centered-bg;
background-image: url('#{$path-img}/image-1.jpg');
width: 50%;
height: 270px;
height: 16.875rem;
border-radius: $br;
background-position: center;
background-size: cover;

p a {
color: $white;
}

h2 {
@include border-top($orange)
@include border-top($orange);

@media #{$brk-770} {
margin-bottom: 4rem;
}
}
}

Expand All @@ -68,21 +99,25 @@

.calloutThree, .calloutFour, .calloutFive {
background-image: url('#{$path-img}/image-3.jpg');
@extend %centered-bg;
width: 50%;
height: 310px;
height: 19.375rem;
border-radius: $br;
background-position: center;
background-size: cover;
outline: 2px solid $white;
outline-offset: -20px;
outline: 0.125rem solid $white;
outline-offset: -1.5rem;

h2 {
margin: 40% 25%;
@include border-top($bright-green)
@include border-top($bright-green);

@media #{$brk-770} {
margin: 17% 25%;
}
}

&:hover {
box-shadow: inset 0 0 0 20px rgba($black,0.6);
box-shadow: inset 0 0 0 1.5rem rgba($black,0.6);
}
}

Expand All @@ -92,7 +127,7 @@

.calloutFive {
background-image: url('#{$path-img}/image-5.jpg');
background-position: right center;
@extend %centered-bg;
}

.thirdColumn {
Expand All @@ -107,10 +142,16 @@
margin: 0 1.3%;
float: left;
@include callout-shadow;

@media #{$brk-770} {
width: 90%;
max-width: 90%;
margin-bottom: 3.125rem;
margin-left: 5%;
}
}

div:last-child {
margin-right: 0;
}
}

}
25 changes: 16 additions & 9 deletions assets/scss/layout/_containers.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
/* Homepage slider ----------- */
.slideCallout {
@include border-top(#51bad8);
@extend %centered;
margin: -24% auto 0;
position: relative;
max-width: 375px;
text-align: center;
max-width: 23.4375rem;
background-color: $white;
padding: 3% 2%;
font-size: 2.1em;
font-size: 2.1rem;
border-radius: 0 0 $br * 0.833333333 $br * 0.833333333;
color: #5c5c5c;

@media #{$brk-450} {
font-size: 1.25rem;
max-width: 15.625rem;
margin-bottom: 0.5625rem;
margin-top: -26%;
}
}

.slideButton {
@include button-bg;
@extend %centered;
@include button-bg;
border-radius: $br * 0.666666666;
padding: 12px 23px;
font-size: 16px;
padding: 0.75rem 1.4375rem;
font-size: 0.9rem;
border: none;
margin: -14px auto 0;
margin: -0.875rem auto 0;
position: relative;
color: $white;
width: 125px;
width: 7.8125rem;
display: inline-block;
text-align: center;
}
20 changes: 20 additions & 0 deletions assets/scss/layout/_extends.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Centered and center text

%centered {
text-align: center;
}

%centered-bg {
background-position: center;
}

// Scale Transform

%scale {
transform: scale(1.1);
}

// Columns
%columns {
width: 46.5%;
}
Loading