From b94a2da015f5172ba2d1d95fc4c3570e6a94d2ca Mon Sep 17 00:00:00 2001 From: Elias Hantula Date: Fri, 10 Nov 2017 16:32:45 -0500 Subject: [PATCH 1/3] k --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a38d4d6..b758cf7 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ assignment_bootstrap_sprint Pick yourself up! [A Bootstrap, HTM5 and SASS project from the Viking Code School](http://www.vikingcodeschool.com) +Elias Hantula From b46cd726392fbcdd8cb0a40d2d3856834371a2c3 Mon Sep 17 00:00:00 2001 From: Elias Hantula Date: Sat, 11 Nov 2017 13:02:51 -0500 Subject: [PATCH 2/3] initial --- index.html | 22 ++++++++++++++++++++++ styles/public/stylesheets | 25 +++++++++++++++++++++++++ styles/styles.css | 0 3 files changed, 47 insertions(+) create mode 100644 index.html create mode 100644 styles/public/stylesheets create mode 100644 styles/styles.css diff --git a/index.html b/index.html new file mode 100644 index 0000000..c0b9379 --- /dev/null +++ b/index.html @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + +
+
+
+ +
+ + + diff --git a/styles/public/stylesheets b/styles/public/stylesheets new file mode 100644 index 0000000..b4d9810 --- /dev/null +++ b/styles/public/stylesheets @@ -0,0 +1,25 @@ +/* +Errno::ENOENT: No such file or directory @ rb_sysopen - app/sass + +Backtrace: +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin/compiler.rb:454:in `read' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin/compiler.rb:454:in `update_stylesheet' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin/compiler.rb:209:in `each' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin/compiler.rb:294:in `watch' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/plugin.rb:109:in `method_missing' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/exec/sass_scss.rb:360:in `watch_or_update' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/exec/sass_scss.rb:51:in `process_result' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/exec/base.rb:52:in `parse' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/lib/sass/exec/base.rb:19:in `parse!' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/gems/sass-3.5.3/bin/sass:13:in `' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/bin/sass:23:in `load' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/bin/sass:23:in `
' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/bin/ruby_executable_hooks:15:in `eval' +/Users/eliashantula/.rvm/gems/ruby-2.3.3/bin/ruby_executable_hooks:15:in `
' +*/ +body:before { + white-space: pre; + font-family: monospace; + content: "Errno::ENOENT: No such file or directory @ rb_sysopen - app/sass"; } diff --git a/styles/styles.css b/styles/styles.css new file mode 100644 index 0000000..e69de29 From 872f69b632a4cc5f0fc29a9ee1eadcc60cda4532 Mon Sep 17 00:00:00 2001 From: Elias Hantula Date: Sat, 11 Nov 2017 23:18:04 -0500 Subject: [PATCH 3/3] sprint --- index.html | 52 +++++++++++++++++++++++++++--- styles/styles.css | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index c0b9379..c9aae80 100644 --- a/index.html +++ b/index.html @@ -5,17 +5,61 @@ - + - + - + -
+ +
+ +
+

Hello, World!

+

This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.

+
+
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

+
diff --git a/styles/styles.css b/styles/styles.css index e69de29..2771000 100644 --- a/styles/styles.css +++ b/styles/styles.css @@ -0,0 +1,80 @@ +.container-fluid { + width: 100%; + margin-left: auto; + margin-right: auto; + max-width: initial; + padding: 0px +} + +body { + + padding-bottom: 20px; +} + + +label { + color: white; +} + +.forms { + padding-top: 8px; + margin-right: 15px; +} +.jumbotron { + +} +.arrow { + + margin-left: 5px; + padding-top: 5px; + float: right; + font-size:8px +} + +.main { + font-size: 20px +} + +.arrowmain{ + + margin-left: 5px; + padding-top: 10px; + float: right; + font-size:8px +} +.navbar { + margin-bottom: 0px; + border-radius: 0px +} +.navbar-header { +width: 100%; + +} + +.navbar-brand { +padding-left: 25px; +} +.menu2 { + padding-top: 10px; +} + +.btn-primary { + margin-top: 2px; +} + +.dropdown-menu { + background-color: black; + width: 100%; + margin-top:-10px; +} + + .form-group { +margin: 0px; +} + +.glyphicon { + color: white; + background-color: black; + font-size:20px; + +}