Skip to content
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

Restyle the doc site #56

Merged
merged 4 commits into from
Sep 7, 2016
Merged
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
Binary file modified docs/landing_source/source/favicon.ico
Binary file not shown.
71 changes: 71 additions & 0 deletions docs/landing_source/source/images/envoy_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 5 additions & 8 deletions docs/landing_source/source/localizable/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ layout: layout
<h2 class="hero-headline"><%= t("index.headline") %></h2>
<h3 class="hero-description"><%= t("index.description") %></h3>
<div class="hero-banner-container">
<div class="laptop">
<div class="envoy-logo">
</div>
</div>
</section>
Expand All @@ -20,8 +20,7 @@ layout: layout
<div class="introduction-container" data-waypoint="introduction-container">
<div class="introduction-item second-graphic">
<div class="introduction-item-graphic-wrapper">
<div class="intro-graphic-one">
</div>
<!--<div class="intro-graphic-one"></div>-->
</div>
<div class="introduction-item-text-wrapper">
<h4 class="introduction-item-header">
Expand All @@ -43,15 +42,13 @@ layout: layout
</p>
</div>
<div class="introduction-item-graphic-wrapper">
<div class="intro-graphic-two">
</div>
<!-- <div class="intro-graphic-two"></div>-->
</div>
</div>
</div>

<div class="introduction-item fourth-graphic">
<div class="introduction-item-graphic-wrapper">
<div class="intro-graphic-three">
</div>
<!-- <div class="intro-graphic-three"> </div> -->
</div>
<div class="introduction-item-text-wrapper">
<h4 class="introduction-item-header">
Expand Down
8 changes: 5 additions & 3 deletions docs/landing_source/source/stylesheets/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ $medium-yellow: #F5D784;
$red: #E86A61;
$white: #FFFFFF;

// Confidant colors
$confidant-red: #E86A61;
// Envoy colors
$confidant-red: #FF00BF;
$envoy-blue: #290b54;
$envoy-black-blue: #130229;

// Font Colors
$base-font-color: $black;
Expand All @@ -61,7 +63,7 @@ $hover-button-color: $hover-link-color;

// Background Color
$base-background-color: #fff;
$base-hero-color: $lightest-yellow;
$base-hero-color: transparent;

// Border color
$base-border-color: $light-gray;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
margin-right: 0;

a {
color: $global-nav-link-color;
color: darken($white, 20%);

&:hover {
color: $global-nav-link-hover-color;
color: tint($white, 20%);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ body {

.wrap-container {
@include outer-container;
max-width: 68rem;
padding: 0 $gutter;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
}

&-button-fill {
@include button-filled($red);
@include button-filled($confidant-red);
}

&-button-outline {
@include button-outline($red, $red);
@include button-outline($confidant-red, $confidant-red);
}
}
26 changes: 13 additions & 13 deletions docs/landing_source/source/stylesheets/modules/landing/_hero.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
$white: #FFFFFF;

.hero {
background: $base-hero-color;
background: $envoy-blue;
background: linear-gradient(to bottom, $envoy-blue 0%, $envoy-black-blue 100%);
height: 572px;
margin-bottom: 1em;
text-align: center;
Expand All @@ -10,14 +13,14 @@
}

.hero-headline {
color: $dark-brown;
color: $white;
font-size: $base-font-size * 2.2;
font-weight: 600;
margin: 1.2em 0 0.5em;
}

.hero-description {
color: tint($dark-brown, 20%);
color: darken($white, 20%);
display: inline-block;
font-size: $base-font-size;
line-height: 1.4;
Expand All @@ -31,22 +34,19 @@
}

.hero-banner-container {
.laptop {
background: image_url("laptop.png");
background-size: 350px;
.envoy-logo {
background: image_url("envoy_logo.svg");
background-size: 330px;
background-repeat: no-repeat;
background-position: 50%;
height: 13em;
margin: 0 auto;
width: 330px;
width: 100%;

@include media($medium-screen-up) {
@include span-columns(8 of 12);
@include shift(2);
background-size: 549px;
height: 21em;
position: absolute;
width: 680px;
background-size: 500px;
height: 20em;
width: 100%;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
.introduction-container.active {
margin-top: $global-nav-height;
.introduction-container {
margin-bottom: 7rem;

&.active {
margin-top: $global-nav-height;
}
}

.introduction-item {
Expand Down Expand Up @@ -106,12 +110,13 @@
text-align: center;

@include media($medium-screen-up) {
margin-top: 4em;
text-align: left;
}
}

.introduction-item-header {
font-size: 2rem;
margin-top: 0;
color: $dark-gray;
}

Expand Down