-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tons of updates, sticky header, footer, colors/fonts
- Loading branch information
Showing
18 changed files
with
202 additions
and
26 deletions.
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
Binary file not shown.
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -1,5 +1,12 @@ | ||
| jQuery( document ).ready( function( $ ) { | ||
|
|
||
| // Meow | ||
| // Applies sticky class to header when scrolling past first pixel | ||
| $(window).scroll( function() { | ||
| if ( $(this).scrollTop() > 1 ) { | ||
| $('header').addClass("sticky"); | ||
| } else { | ||
| $('header').removeClass("sticky"); | ||
| } | ||
| }); | ||
|
|
||
| }); |
14 changes: 14 additions & 0 deletions
14
www/wp-content/themes/ation2016/src/styles/components/_footer.scss
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,14 @@ | ||
| footer { | ||
| border-top: 1px solid $light-grey; | ||
| font-family: $header-font; | ||
| ul.footer-links { | ||
| list-style-type: none; | ||
| margin-left: 0; | ||
| li { | ||
| display: inline-block; | ||
| color: $grey; | ||
| font-family: inherit; | ||
| padding-right: 20px; | ||
| } | ||
| } | ||
| } |
59 changes: 55 additions & 4 deletions
59
www/wp-content/themes/ation2016/src/styles/components/_header.scss
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 |
|---|---|---|
| @@ -1,6 +1,57 @@ | ||
| .admin-bar { | ||
| header { | ||
| top: 32px; | ||
| } | ||
| } | ||
| header { | ||
| .header-logo { | ||
| max-width: 300px; | ||
| display: block; | ||
| } | ||
| position: fixed; | ||
| color: $orange; | ||
| width: 100%; | ||
| text-align: center; | ||
| font-size: 25px; | ||
| height: $header-height; | ||
| line-height: $header-height; | ||
| background: white; | ||
| transition: all 0.3s ease, box-shadow 0s ease; | ||
| top:0; | ||
| &.sticky { | ||
| font-size: 15px; | ||
| height: $header-height-sticky; | ||
| line-height: $header-height-sticky; | ||
| //text-align: left; | ||
| -webkit-box-shadow: -1px 2px 10px -1px $grey; | ||
| -moz-box-shadow: -1px 2px 10px -1px $grey; | ||
| box-shadow: -1px 2px 10px -1px $grey; | ||
| .header-logo { | ||
| img { | ||
| max-height: $header-height-sticky - 20px; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .header-logo { | ||
| display: block; | ||
| padding-left: 20px; | ||
| padding-top: 10px; | ||
| padding-bottom: 10px; | ||
| img { | ||
| max-height: $header-height-sticky; | ||
| transition: all 0.3s ease; | ||
| } | ||
| } | ||
|
|
||
| nav { | ||
| ul { | ||
| list-style-type: none; | ||
| margin: 0; | ||
| li { | ||
| display: inline-block; | ||
| font-family: $header-font; | ||
| padding-right: 20px; | ||
| a { | ||
| color: $orange; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
www/wp-content/themes/ation2016/src/styles/components/_mainsection.scss
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,3 @@ | ||
| section#content { | ||
| margin-top:$header-height; | ||
| } |
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 |
|---|---|---|
| @@ -1,11 +1,27 @@ | ||
| $orange: orange; | ||
| /* Color */ | ||
| $orange: #ff7200; | ||
| $grey: #a8a8a8; | ||
| $light-grey: #eeeeee; | ||
| $white: white; | ||
|
|
||
| /* Type */ | ||
| @import url(https://fonts.googleapis.com/css?family=Lato:300,400,400italic,700); | ||
| @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,300,400italic); | ||
| $header-font: 'Source Sans Pro', sans-serif; | ||
| $body-font: 'Times New Roman', serif; | ||
|
|
||
| /* Header */ | ||
| $header-height: 100px; | ||
| $header-height-sticky: 70px; | ||
|
|
||
| @import 'type/typography'; | ||
|
|
||
| @import 'components/header'; | ||
| @import 'components/mainsection'; | ||
| @import 'components/footer'; | ||
|
|
||
| @import 'utility/images'; | ||
|
|
||
| .menu { | ||
| color: $orange; | ||
| body { | ||
| background-color: $white; | ||
| } |
9 changes: 6 additions & 3 deletions
9
www/wp-content/themes/ation2016/src/styles/type/_typography.scss
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 |
|---|---|---|
| @@ -1,10 +1,13 @@ | ||
| $header-font: 'Arial', sans-serif; | ||
| $body-font: 'Times New Roman', serif; | ||
|
|
||
| h1, h2, h3, h4, h5, h6 { | ||
| font-family: $header-font; | ||
| } | ||
|
|
||
| p, li, span { | ||
| font-family: $body-font; | ||
| } | ||
|
|
||
| #content { | ||
| p, li, span { | ||
| font-size: 18px; | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -1,5 +1,12 @@ | ||
| jQuery( document ).ready( function( $ ) { | ||
|
|
||
| // Meow | ||
| // Applies sticky class to header when scrolling past first pixel | ||
| $(window).scroll( function() { | ||
| if ( $(this).scrollTop() > 1 ) { | ||
| $('header').addClass("sticky"); | ||
| } else { | ||
| $('header').removeClass("sticky"); | ||
| } | ||
| }); | ||
|
|
||
| }); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,17 +1,75 @@ | ||
| /* Color */ | ||
| /* Type */ | ||
| @import url(https://fonts.googleapis.com/css?family=Lato:300,400,400italic,700); | ||
| @import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,300,400italic); | ||
| /* Header */ | ||
| h1, h2, h3, h4, h5, h6 { | ||
| font-family: "Arial", sans-serif; } | ||
| font-family: "Source Sans Pro", sans-serif; } | ||
|
|
||
| p, li, span { | ||
| font-family: "Times New Roman", serif; } | ||
|
|
||
| header .header-logo { | ||
| max-width: 300px; | ||
| display: block; } | ||
| #content p, #content li, #content span { | ||
| font-size: 18px; } | ||
|
|
||
| .admin-bar header { | ||
| top: 32px; } | ||
|
|
||
| header { | ||
| position: fixed; | ||
| color: #ff7200; | ||
| width: 100%; | ||
| text-align: center; | ||
| font-size: 25px; | ||
| height: 100px; | ||
| line-height: 100px; | ||
| background: white; | ||
| transition: all 0.3s ease, box-shadow 0s ease; | ||
| top: 0; } | ||
| header.sticky { | ||
| font-size: 15px; | ||
| height: 70px; | ||
| line-height: 70px; | ||
| box-shadow: -1px 2px 10px -1px #a8a8a8; } | ||
| header.sticky .header-logo img { | ||
| max-height: 50px; } | ||
| header .header-logo { | ||
| display: block; | ||
| padding-left: 20px; | ||
| padding-top: 10px; | ||
| padding-bottom: 10px; } | ||
| header .header-logo img { | ||
| max-height: 70px; | ||
| transition: all 0.3s ease; } | ||
| header nav ul { | ||
| list-style-type: none; | ||
| margin: 0; } | ||
| header nav ul li { | ||
| display: inline-block; | ||
| font-family: "Source Sans Pro", sans-serif; | ||
| padding-right: 20px; } | ||
| header nav ul li a { | ||
| color: #ff7200; } | ||
|
|
||
| section#content { | ||
| margin-top: 100px; } | ||
|
|
||
| footer { | ||
| border-top: 1px solid #eeeeee; | ||
| font-family: "Source Sans Pro", sans-serif; } | ||
| footer ul.footer-links { | ||
| list-style-type: none; | ||
| margin-left: 0; } | ||
| footer ul.footer-links li { | ||
| display: inline-block; | ||
| color: #a8a8a8; | ||
| font-family: inherit; | ||
| padding-right: 20px; } | ||
|
|
||
| img { | ||
| max-width: 100%; | ||
| display: block; | ||
| height: auto; } | ||
|
|
||
| .menu { | ||
| color: orange; } | ||
| body { | ||
| background-color: white; } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1 +1,16 @@ | ||
| Copyright {{"now"|date('Y')}} | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <ul class="footer-links col-sm-12 col-md-6"> | ||
| <li>© -ATION Digital Media Agency</li> | ||
| <li><a href="http://dmd.uconn.edu/">Digital Media & Design</a></li> | ||
| <li><a href="{{login_link}}">Login</a></li> | ||
| </ul> | ||
| <ul class="footer-links social col-sm-12 col-md-6"> | ||
| <li><a href="https://vimeo.com/ation">Vimeo</a></li> | ||
| <li><a href="https://www.facebook.com/ATIONDM/">Facebook</a></li> | ||
| <li><a href="https://twitter.com/ATIONDM">Twitter</a></li> | ||
| <li><a href="https://www.instagram.com/ationdm/">Instagram</a></li> | ||
| <li><a href="https://www.pinterest.com/ATIONDM/">Pinterest</a></li> | ||
| </ul> | ||
| </div> | ||
| </div> |