Skip to content

Commit 9fdbac9

Browse files
author
Rhiana Heath
authored
Merge pull request #54 from exec-io/feature/redesign
Feature/redesign
2 parents 403779b + 0b458d1 commit 9fdbac9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1887
-1182
lines changed
Lines changed: 32 additions & 32 deletions
Loading
Lines changed: 41 additions & 41 deletions
Loading

app/assets/javascripts/application.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
//= require trix
2121

2222
// Components
23+
//= require components/header
2324
//= require components/secret-item
2425
//= require components/two-factor-fields
2526
//= require components/new-secret-form
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
$(function() {
2+
// Add smooth scrolling to all header links
3+
$('.main-nav__links a[href^="/home#"], .footer-links a[href^="/home#"]').on('click', function(event) {
4+
smoothScrolling(event);
5+
});
6+
});
7+
8+
function smoothScrolling(event) {
9+
var link = event.target;
10+
11+
if (link.hash !== "") {
12+
var hash = link.hash;
13+
var target = $(hash).length > 0;
14+
15+
// Scroll a little higher to account for the sticky header
16+
var headerHeight = 50;
17+
var yValue = $(hash).offset().top - headerHeight;
18+
19+
if (target) {
20+
$('html, body').animate({
21+
scrollTop: yValue
22+
}, 800);
23+
}
24+
}
25+
}

app/assets/stylesheets/application.sass

Lines changed: 0 additions & 89 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@import "base/variables";
2+
@import "base/tools";
3+
@import "pickadate/default";
4+
@import "pickadate/default.date";
5+
@import "bootstrap-sprockets";
6+
@import "bootstrap";
7+
@import "base/normalize";
8+
@import "base/body";
9+
@import "base/typography";
10+
11+
12+
@import "objects/alerts";
13+
@import "objects/buttons";
14+
15+
@import "trix";
16+
17+
// Layouts
18+
@import "layouts/dashboard";
19+
@import "layouts/devise";
20+
@import "layouts/home";
21+
@import "layouts/secrets";
22+
@import "layouts/topsekrit";
23+
24+
// Components
25+
@import "components/footer";
26+
@import "components/header";
27+
@import "components/banner";
28+
@import "components/panels";
29+
30+
@import "components/two-factor-fields";
31+
@import "components/email-preview";
32+
@import "components/steps";
33+
34+
// Helpers
35+
@import "base/helpers";
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
html, body {
2+
width: 100%;
3+
background-color: white;
4+
font-weight: normal;
5+
}
6+
7+
body {
8+
min-height: 100vh;
9+
display: flex;
10+
flex-direction: column;
11+
}
12+
13+
html, body, div, span, applet, object, iframe,
14+
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
15+
a, abbr, acronym, address, big, cite, code,
16+
del, dfn, em, img, ins, kbd, q, s, samp,
17+
small, strike, strong, sub, sup, tt, var,
18+
b, u, i, center,
19+
dl, dt, dd, ol, ul, li,
20+
fieldset, form, label, legend,
21+
input, textarea, button,
22+
table, caption, tbody, tfoot, thead, tr, th, td,
23+
article, aside, canvas, details, embed,
24+
figure, figcaption, footer, header, hgroup,
25+
menu, nav, output, ruby, section, summary,
26+
time, mark, audio, video {
27+
font-size: 16px;
28+
font-family: $font-family;
29+
line-height: 1.1;
30+
color: $text-default-color;
31+
}
32+
33+
iframe {
34+
border: 0;
35+
}
36+
37+
.container-fluid {
38+
padding-left: 0;
39+
padding-right: 0;
40+
padding-bottom: 90px;
41+
}
42+
.row {
43+
margin-left: 0;
44+
margin-right: 0;
45+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.top-buffer {
2+
margin-top: 30px;
3+
}
4+
5+
.hidden {
6+
display: none;
7+
}

0 commit comments

Comments
 (0)