From bcdd6909128ca74d0cde54c0b63edce04ff77fc6 Mon Sep 17 00:00:00 2001 From: Nienke Date: Fri, 24 Jun 2016 12:04:06 +0200 Subject: [PATCH] Fix these thingies --- public/css/main.css | 278 ++++++++++++++++++++++++++++++++++------ public/css/main.css.map | 5 - public/css/main.scss | 200 ----------------------------- 3 files changed, 236 insertions(+), 247 deletions(-) diff --git a/public/css/main.css b/public/css/main.css index 1d0199c..bd770b8 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1,42 +1,236 @@ -/* -Error: Invalid CSS after "...e108e0887be39af": expected "{", was "" - on line 223 of css/main.scss - -218: background: linear-gradient(#F1D4AF, #eee9d9); -219: flex-direction: column; -220: -webkit-flex-direction: column; -221: } -222: >>>>>>> 379d4f3f03a754a4a72fcb834e108e0887be39af - -Backtrace: -css/main.scss:223 -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:1189:in `expected' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:1125:in `expected' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:1120:in `tok!' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:656:in `block' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:649:in `ruleset' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:675:in `block_child' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:668:in `block_contents' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:125:in `stylesheet' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/scss/parser.rb:41:in `parse' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/engine.rb:406:in `_to_tree' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/engine.rb:381:in `_render_with_sourcemap' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/engine.rb:298:in `render_with_sourcemap' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:492:in `update_stylesheet' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:209:in `each' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:473:in `on_file_changed' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/lib/sass/plugin/compiler.rb:331:in `block in watch' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/listener.rb:252:in `call' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/listener.rb:252:in `on_change' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/listener.rb:290:in `block in initialize_adapter' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:254:in `call' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:254:in `report_changes' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:323:in `poll_changed_directories' -/Users/nienke/.rvm/gems/ruby-2.2.1/gems/sass-3.4.22/vendor/listen/lib/listen/adapter.rb:299:in `block in start_poller' -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Error: Invalid CSS after \"...e108e0887be39af\": expected \"{\", was \"\"\A on line 223 of css/main.scss\A \A 218: background: linear-gradient(#F1D4AF, #eee9d9);\A 219: flex-direction: column;\A 220: -webkit-flex-direction: column;\A 221: }\A 222: >>>>>>> 379d4f3f03a754a4a72fcb834e108e0887be39af"; } +/* Primary Sass file. + ========================================================================== */ +/** + * 1. Import modules (functions, mixins and variables -- everything that doesn't actually cause Sass to output CSS). + * 2. Import partials (breakdown by element type) + * 3. Import vendors (all third-party CSS) + */ +/** + * Shadow text mixin. + */ +/** + * Breakpoint mixin and variable for responsive layouts. + */ +/** + * The page base. + */ +@import url(vendors/normalize.css); +@import url(vendors/flaticon.css); +@import url(https://fonts.googleapis.com/css?family=Karla|Montserrat|Inconsolata|Rubik); +body { + background-color: #7aa2cb; } + +.flexcontainer { + display: -webkit-flex; + display: flex; + -webkit-flex-direction: column; + flex-direction: column; } + +.flexpage, .intro-page, .info-page, .footer-page, .login-page { + display: flex; + display: -webkit-flex; + justify-content: center; + align-items: center; } + +/** + * First section of the main page, containing the logo, login/registration buttons, and a down arrow. + */ +.intro-page { + background: linear-gradient(#070a15, #252b46); + height: 100vh; + flex-direction: column; + -webkit-flex-direction: column; } + @media (max-width: 1200px) { + .intro-page { + min-height: 100vh; } } + +/** + * Second section of the main page, containing the three descriptive column and flaticons (http://www.flaticon.com/authors/madebyoliver). + */ +.info-page { + background: linear-gradient(#F1D4AF, #eee9d9); + flex-direction: row; + -webkit-flex-direction: row; + min-height: 80vh; } + @media (max-width: 1200px) { + .info-page { + flex-direction: column; + -webkit-flex-direction: column; + min-height: 80vh; } } + +.info-page-item { + margin: 50px; } + +/** + * Third section of the main page, containing the link to the Github page. + */ +.footer-page { + flex: 1; + background-color: #e2f2f0; + flex-direction: column; + -webkit-flex-direction: column; + min-height: 20vh; } + @media (max-width: 1200px) { + .footer-page { + height: 100%; } } + +/** + * Login and register pages. + */ +.login-page { + background: linear-gradient(#070a15, #252b46); + flex-direction: column; + -webkit-flex-direction: column; } + +.login-page-form { + background-color: #fff; + box-sizing: border-box; + border-radius: 5px; + border-top: 0; + border-bottom: 3px solid #d2d5e7; + border-right: 3px solid #d2d5e7; + border-left: 0; } + +ul.topnav { + list-style-type: none; + margin: 0; + padding: 20px; + overflow: hidden; } + +ul.topnav li { + float: left; } + +ul.topnav li a { + display: inline-block; + padding: 15px 26px; + text-decoration: none; + font-size: 15px; + background-color: #fff; + margin: 0 10px 0px 10px; + border-radius: 5px; + color: #2f3472; } + +ul.topnav li a:hover { + background-color: #dee2ea; + text-decoration: none; } + +ul.topnav li.icon { + display: none; } + +input { + padding: 10px; + box-sizing: border-box; + border: 1px solid #cedadf; + border-radius: 4px; + font-size: 1.5em; + font-family: "Montserrat"; } + +input:focus { + border: 1px solid #000; } + +button { + background-color: #aca4bc; + border: none; + color: white; + padding: 16px 32px; + text-decoration: none; + margin: 4px 2px; + font-size: 1.5em; + font-family: "Montserrat"; } + +/** + * Main + */ +body { + font-family: 'Karla', sans-serif; + font-size: 100%; } + +/** + * First section of the main page, containing the logo, login/registration buttons, and a down arrow. + */ +.intro-page-logo { + font-family: 'Montserrat', serif; + font-size: 12em; + 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; } + @media (max-width: 1200px) { + .intro-page-logo { + font-size: 3.5em; + padding: 20px; + 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; } } + +.intro-page-welcome-text { + font-family: 'Inconsolata', serif; + font-size: 2em; + text-transform: uppercase; + color: #fff; } + @media (max-width: 1200px) { + .intro-page-welcome-text { + font-size: 1em; + padding-top: 10px; } } + +.fa-angle-double-down { + color: #424769; } + +/** + * Second section of the main page, containing the three descriptive column and flaticons (http://www.flaticon.com/authors/madebyoliver). + */ +.info-page h1 { + font-family: 'Rubik'; + color: #dab199; + text-align: center; + font-size: 2em; + text-transform: uppercase; + line-height: 2em; } + @media (max-width: 1200px) { + .info-page h1 { + line-height: 1em; } } + +.info-page-item { + font-size: 1em; + line-height: 1.6em; + color: #8b6d5c; } + +[class^="flaticon-"]:before, [class*=" flaticon-"]:before, +[class^="flaticon-"]:after, [class*=" flaticon-"]:after { + font-size: 10em; + color: #fff; } + @media (max-width: 1200px) { + [class^="flaticon-"]:before, [class*=" flaticon-"]:before, + [class^="flaticon-"]:after, [class*=" flaticon-"]:after { + font-size: 5em; } } + +/** + * Third section of the main page, containing the link to the Github page. + */ +.footer-page a { + color: black; } + +.footer-page-title, .footer-page h1, .footer-page h2 { + font-family: 'Inconsolata'; + color: #E08E79; + font-weight: lighter; + text-transform: lowercase; } + +.footer-page h1 { + font-size: 1.5em; } + +.footer-page h2 { + font-size: 1.2em; } + @media (max-width: 1200px) { + .footer-page h2 { + font-size: 1em; + margin: 20px; } } + +/** + * Login and register pages. + */ +.login-page-logo { + font-family: 'Montserrat', serif; + font-size: 6em; + 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; } + +/*# sourceMappingURL=main.css.map */ diff --git a/public/css/main.css.map b/public/css/main.css.map index 569b60e..6911554 100644 --- a/public/css/main.css.map +++ b/public/css/main.css.map @@ -1,12 +1,7 @@ { "version": 3, -<<<<<<< HEAD "mappings": "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", "sources": ["main.scss","modules/_modules.scss","partials/_base.scss","partials/_navigation.sass","partials/_forms.sass","partials/_typography.scss"], -======= -"mappings": "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", -"sources": ["main.scss","navigation.sass","forms.sass"], ->>>>>>> 379d4f3f03a754a4a72fcb834e108e0887be39af "names": [], "file": "main.css" } \ No newline at end of file diff --git a/public/css/main.scss b/public/css/main.scss index 48c1702..2b6374b 100644 --- a/public/css/main.scss +++ b/public/css/main.scss @@ -20,203 +20,3 @@ @import "vendors/normalize.css"; @import "vendors/flaticon.css"; @import url(https://fonts.googleapis.com/css?family=Karla|Montserrat|Inconsolata|Rubik); -<<<<<<< HEAD -======= - -// base, mixins, extensions -body { - background-color: #7aa2cb; - font-family: 'Karla', sans-serif; - font-size:100%; -} - -.flexcontainer { - display: -webkit-flex; - display: flex; - - -webkit-flex-direction: column; - flex-direction: column; -} - -.flexpage { - display: flex; - display: -webkit-flex; - - justify-content: center; - 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; -} - -$break-small: 1200px; - -@mixin break-small { - @media (max-width: #{$break-small}) { - @content; - } -} - -// first section with logo and navigation -.intro-page { - @extend .flexpage; - background: linear-gradient(#070a15, #252b46); - height: 100vh; - flex-direction: column; - -webkit-flex-direction: column; - @include break-small { - min-height: 80vh; - } -} - -.intro-page-logo { - font-family: 'Montserrat', serif; - font-size: 12em; - text-transform: uppercase; - color: #E08E79; - @include long-shadow-text(30, 0, #F1D4AF); - @include break-small { - font-size: 3.5em; - padding: 20px; - @include long-shadow-text(20, 0, #F1D4AF); - } -} - -.intro-page-welcome-text { - font-family: 'Inconsolata', serif; - font-size: 2em; - text-transform: uppercase; - color: #fff; - @include break-small { - font-size: 1em; - padding-top: 10px; - } -} - -.fa-angle-double-down { - color: #424769; -} - -// second section containing information columns -.info-page { - @extend .flexpage; - background: linear-gradient(#F1D4AF, #eee9d9); - flex-direction: row; - -webkit-flex-direction: row; - min-height: 80vh; - @include break-small { - flex-direction: column; - -webkit-flex-direction: column; - min-height: 80vh; - } -} - -.info-page h1 { - font-family: 'Rubik'; - color: #dab199; - text-align: center; - font-size: 2em; - text-transform: uppercase; - line-height: 2em; - @include break-small { - line-height: 1em; - } -} - -.info-page-item { - font-size: 1em; - line-height: 1.6em; - color: #8b6d5c; - margin: 50px; -} - -[class^="flaticon-"]:before, [class*=" flaticon-"]:before, -[class^="flaticon-"]:after, [class*=" flaticon-"]:after { - font-size: 10em; - color: #fff; - @include break-small { - font-size: 5em; - } -} - -// third section containing the footer -.footer-page { - @extend .flexpage; - flex: 1; - background-color: #e2f2f0; - flex-direction: column; - -webkit-flex-direction: column; - min-height: 20vh; - @include break-small { - height: 100%; - } -} - -.footer-page a { - color: black -} - -.footer-page-title { - font-family: 'Inconsolata'; - color: #E08E79; - font-weight: lighter; - text-transform: lowercase; -} - -.footer-page h1 { - @extend .footer-page-title; - font-size: 1.5em; -} - -.footer-page h2 { - @extend .footer-page-title; - font-size: 1.2em; - @include break-small { - font-size: 1em; - margin: 20px; - } -} - -// login and register pages. forms make-up can be found in forms.sass. -.login-page { - @extend .flexpage; - background: linear-gradient(#070a15, #252b46); - flex-direction: column; - -webkit-flex-direction: column; - padding: 40px; - } - -.login-page-logo { - font-family: 'Montserrat', serif; - font-size: 6em; - text-transform: uppercase; - color: #E08E79; - @include long-shadow-text(10, 0, #F1D4AF);} - -.login-page-form { - background-color: #fff; - padding: 100px; - box-sizing: border-box; - border-radius: 5px; - border-top: 0; - border-bottom: 3px solid #d2d5e7; - border-right: 3px solid #d2d5e7; - border-left: 0; -} - -// panel page -.panel-page { - @extend .flexpage; - background: linear-gradient(#F1D4AF, #eee9d9); - flex-direction: column; - -webkit-flex-direction: column; -} ->>>>>>> 379d4f3f03a754a4a72fcb834e108e0887be39af