diff --git a/app/assets/images/pixelbomb.png b/app/assets/images/pixelbomb.png new file mode 100644 index 0000000..f9b475c Binary files /dev/null and b/app/assets/images/pixelbomb.png differ diff --git a/app/assets/stylesheets/_icons.scss b/app/assets/stylesheets/_icons.scss index 96473fc..4100ca3 100644 --- a/app/assets/stylesheets/_icons.scss +++ b/app/assets/stylesheets/_icons.scss @@ -41,6 +41,18 @@ font-style: normal; } +.linkedin::before { + content: '\f0e1'; + font-family: 'FontAwesome'; + font-style: normal; +} + +.linkedin::before { + content: '\f0e1'; + font-family: 'FontAwesome'; + font-style: normal; +} + .map::before { content: '\f041'; font-family: 'FontAwesome'; diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index 7734ecf..ba2630c 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -43,9 +43,11 @@ $xxl-font-size: 3.75rem; $base-line-height: 1.5rem; // SIZING +$xsm-space: 0.2rem; $little-space: 0.5rem; $med-space: 1rem; $large-space: 2rem; +$larger-space: 2.6rem; $xl-space: 4rem; $xxl-space: 6rem; $xxxl-space: 8rem; diff --git a/app/assets/stylesheets/layout/_footer.scss b/app/assets/stylesheets/layout/_footer.scss index 3fb4d71..c51dc53 100644 --- a/app/assets/stylesheets/layout/_footer.scss +++ b/app/assets/stylesheets/layout/_footer.scss @@ -54,7 +54,7 @@ footer { width: 100%; @include above($small-screen) { - text-align: center; + text-align: left; } li { @@ -73,7 +73,7 @@ footer { } .contact, - .social, + /* .social, // social icons in centre */ nav { flex: 1; } @@ -93,11 +93,12 @@ footer { } .social_icons { - padding-top: 15px; + padding-top: 20px; + font-size: $large-font-size; + letter-spacing: $xsm-space; - img { - max-width: 35px; - padding-right: 10px; + @include above($medium-screen) { + display: none; } } } diff --git a/app/assets/stylesheets/layout/_header.scss b/app/assets/stylesheets/layout/_header.scss index f78c87c..7a4949b 100644 --- a/app/assets/stylesheets/layout/_header.scss +++ b/app/assets/stylesheets/layout/_header.scss @@ -97,7 +97,6 @@ header { .featured { border-radius: $round-border; -/* padding-top: $little-space; */ /* take out*/ font-size: inherit; } } diff --git a/app/assets/stylesheets/pages/_home.scss b/app/assets/stylesheets/pages/_home.scss index 869ba4a..634190e 100644 --- a/app/assets/stylesheets/pages/_home.scss +++ b/app/assets/stylesheets/pages/_home.scss @@ -20,40 +20,34 @@ } p { - line-height: $base-line-height; - padding-bottom: 60px; + line-height: $base-line-height; + padding-bottom: 60px; } + /* social icons */ @include above($medium-screen) { - #social_side_links { - list-style: none; - padding: 60; + + #social_side_links + { + font-size: $med-font-size; position: fixed; - right: 20px; top: 100px; + right: 30px; z-index: 99; + padding: 12px; + background: $grey; + border-radius: $round-border; + text-align: center; + line-height: $larger-space; } - #social_side_links li a { - display: block; - } - - #social_side_links li a img { - background-color: $grey; - border-radius: 0; - display: block; - max-width: 45px; - padding: 10px; - transition: background .2s ease-in-out; - } - - #social_side_links li a:hover img { - background: rgba(0, 0, 0, .9); - } + #social_side_links a {color: $white;} } @include on($medium-screen) { - #social_side_links { + + #social_side_links + { display: none; } } @@ -61,13 +55,16 @@ /* end social icons */ section { - padding-top: $med-space; - padding-left: $med-space; - padding-right: $med-space; - padding-bottom: $xxxl-space; + padding-left: $med-space; + padding-right: xxl-space; + padding-top: $med-space; text-align: left; - } + } + + .photos { + @include squairy-light-background; + } .photos { @include squairy-light-background; @@ -142,7 +139,8 @@ padding-right: $xxl-space; font-weight: bold; letter-spacing: 2px; - text-shadow: 2px 2px 4px #000000; + padding-right: $xxl-space; + text-shadow: 2px 2px 4px $grey; @include above($small-screen) { font-size: $xxl-font-size; @@ -154,15 +152,11 @@ h2 { font-size: $base-line-height; padding-right: $xxl-space; - - @include above($medium-screen) { - } } } #events { @include above($small-screen) { - background: transparent; h2 { @@ -252,6 +246,7 @@ font-size: $normal-font-size; } + .apply-to-demo { background-color: $background-color; border-radius: $base-border-radius; diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 8d0a065..a0cc20b 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -11,8 +11,8 @@ <%= mail_to t('.email'), t('.email') %> - - <%= render 'layouts/social' %> + +