From f007966ffd79f040abf0dad8e1f1a69422ac7d86 Mon Sep 17 00:00:00 2001 From: Nienke Date: Tue, 21 Jun 2016 14:54:43 +0200 Subject: [PATCH] Clean up CSS, add inline comments --- public/css/main.css | 22 ++++++----------- public/css/main.css.map | 2 +- public/css/main.scss | 55 +++++++++++++++++------------------------ 3 files changed, 30 insertions(+), 49 deletions(-) diff --git a/public/css/main.css b/public/css/main.css index 1d6a06c..7a384fd 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -95,28 +95,24 @@ body { .intro-page-logo { font-family: 'Montserrat', serif; font-size: 15em; - line-height: 0.8em; text-transform: uppercase; color: #E08E79; text-shadow: 0px 0px 0px #e9bd84, 1px 1px 0px #e9bd84, 2px 2px 0px #e9bd84, 3px 3px 0px #e9bd84, 4px 4px 0px #e9bd84, 5px 5px 0px #e9bd84, 6px 6px 0px #e9bd84, 7px 7px 0px #e9bd84, 8px 8px 0px #e9bd84, 9px 9px 0px #e9bd84, 10px 10px 0px #e9bd84, 11px 11px 0px #e9bd84, 12px 12px 0px #e9bd84, 13px 13px 0px #e9bd84, 14px 14px 0px #e9bd84, 15px 15px 0px #e9bd84, 16px 16px 0px #e9bd84, 17px 17px 0px #e9bd84, 18px 18px 0px #e9bd84, 19px 19px 0px #e9bd84, 20px 20px 0px #e9bd84, 21px 21px 0px #e9bd84, 22px 22px 0px #e9bd84, 23px 23px 0px #e9bd84, 24px 24px 0px #e9bd84, 25px 25px 0px #e9bd84, 26px 26px 0px #e9bd84, 27px 27px 0px #e9bd84, 28px 28px 0px #e9bd84, 29px 29px 0px #e9bd84, 30px 30px 0px #e9bd84; } -.fa-angle-double-down { - color: #424769; - margin-top: 50px; } - .intro-page-welcome-text { font-family: 'Inconsolata', serif; - padding: 50px; font-size: 2em; - line-height: 0.8em; text-transform: uppercase; color: #fff; } +.fa-angle-double-down { + color: #424769; + margin-top: 50px; } + .info-page { background: linear-gradient(#F1D4AF, #eee9d9); - /* Standard syntax */ flex-direction: row; - height: 80vh; } + height: 100vh; } .info-page h1 { font-family: 'Rubik'; @@ -127,9 +123,7 @@ body { .info-page-item { padding: 50px; - font-family: "Karla"; } - -.info-page-item p { + font-family: 'Karla'; font-size: 0.9em; line-height: 1.6em; color: #8b6d5c; @@ -137,9 +131,7 @@ body { [class^="flaticon-"]:before, [class*=" flaticon-"]:before, [class^="flaticon-"]:after, [class*=" flaticon-"]:after { - font-size: 10em; } - -.info-page-item span { + font-size: 10em; color: #fff; } .footer-page { diff --git a/public/css/main.css.map b/public/css/main.css.map index 16dae41..4c57418 100644 --- a/public/css/main.css.map +++ b/public/css/main.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["main.scss","navigation.sass","forms.sass"], "names": [], "file": "main.css" diff --git a/public/css/main.scss b/public/css/main.scss index 624cb4a..9bf4488 100644 --- a/public/css/main.scss +++ b/public/css/main.scss @@ -1,24 +1,13 @@ +// imports @import "normalize.css"; @import "flaticon.css"; @import "navigation.sass"; @import "forms.sass"; @import "tables.css"; - - @import url(https://fonts.googleapis.com/css?family=Open+Sans|Roboto|Playfair+Display|Bree+Serif|Lato|Source+Sans+Pro|Montserrat|Inconsolata); @import url(https://fonts.googleapis.com/css?family=Karla|Raleway|Bitter|Quicksand|Patua+One|Rubik|Cantarell); -@mixin long-shadow-text ($distance, $blur, $color) { - $shadows: null; - $color: darken($color, 10); - $blur: $blur + px; - @for$i from 0 through $distance { - $dist: $i + px; - $shadows: append($shadows, ($dist $dist $blur $color), comma); - } - text-shadow: $shadows; -} - +// base, mixins, extensions body { background-color: #7aa2cb; font-family: 'Karla'; @@ -35,6 +24,17 @@ body { align-items: center; } +@mixin long-shadow-text ($distance, $blur, $color) { + $shadows: null; + $color: darken($color, 10); + $blur: $blur + px; + @for$i from 0 through $distance { + $dist: $i + px; + $shadows: append($shadows, ($dist $dist $blur $color), comma); + } + text-shadow: $shadows; +} + // first section with logo and navigation .intro-page { @extend .flexpage; @@ -46,32 +46,29 @@ body { .intro-page-logo { font-family: 'Montserrat', serif; font-size: 15em; - line-height: 0.8em; text-transform: uppercase; color: #E08E79; @include long-shadow-text(30, 0, #F1D4AF); } -.fa-angle-double-down { - color: #424769; - margin-top: 50px; -} - .intro-page-welcome-text { font-family: 'Inconsolata', serif; - padding: 50px; font-size: 2em; - line-height: 0.8em; text-transform: uppercase; color: #fff; } +.fa-angle-double-down { + color: #424769; + margin-top: 50px; +} + +// second section containing information -// second section containing the information .info-page { @extend .flexpage; - background: linear-gradient(#F1D4AF, #eee9d9); /* Standard syntax */ + background: linear-gradient(#F1D4AF, #eee9d9); flex-direction: row; - height: 80vh; + height: 100vh; } .info-page h1 { @@ -84,23 +81,16 @@ body { .info-page-item { padding: 50px; - font-family: 'Karla' -} - -.info-page-item p { + font-family: 'Karla'; font-size: 0.9em; line-height: 1.6em; color: #8b6d5c; text-align: center; - } [class^="flaticon-"]:before, [class*=" flaticon-"]:before, [class^="flaticon-"]:after, [class*=" flaticon-"]:after { font-size: 10em; -} - -.info-page-item span { color: #fff; } @@ -134,7 +124,6 @@ body { } - // login page .login-page { @extend .flexpage;