From 94f7e71f576f298c2baf96fe95b933bb3312ef37 Mon Sep 17 00:00:00 2001 From: Kevin Lezama Date: Thu, 12 Oct 2017 11:04:10 -0400 Subject: [PATCH 1/4] Add name to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a38d4d6..ef74180 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ assignment_bootstrap_sprint =========================== -Pick yourself up! +Name: Kevin Lezama [A Bootstrap, HTM5 and SASS project from the Viking Code School](http://www.vikingcodeschool.com) From 8ea8dbc450d31f8b47400c503f1e893140a3ae24 Mon Sep 17 00:00:00 2001 From: Kevin Lezama Date: Thu, 12 Oct 2017 15:59:27 -0400 Subject: [PATCH 2/4] Jumbo Site recreate finished --- css/main.css | 3 + index.html | 82 ++++++++++++++++ prepros-6.config | 246 +++++++++++++++++++++++++++++++++++++++++++++++ scss/main.scss | 4 + 4 files changed, 335 insertions(+) create mode 100644 css/main.css create mode 100644 index.html create mode 100644 prepros-6.config create mode 100644 scss/main.scss diff --git a/css/main.css b/css/main.css new file mode 100644 index 0000000..3a5e0f8 --- /dev/null +++ b/css/main.css @@ -0,0 +1,3 @@ +body { + padding-top: 50px; + padding-bottom: 20px; } diff --git a/index.html b/index.html new file mode 100644 index 0000000..51cccdc --- /dev/null +++ b/index.html @@ -0,0 +1,82 @@ + + + + + Bootstrap One + + + + + + + + + +
+
+

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.

+ +
+
+
+ +
+

© 2016 Company, Inc.

+
+
+ + diff --git a/prepros-6.config b/prepros-6.config new file mode 100644 index 0000000..ba335a9 --- /dev/null +++ b/prepros-6.config @@ -0,0 +1,246 @@ +{ + "name": "assignment_bootstrap_sprint", + "firstRun": false, + "exportConfig": true, + "fileConfigs": [], + "fileTree": { + "expandedDirs": [], + "hideSystemFiles": true, + "systemFiles": [ + ".*", + "desktop.ini", + "prepros.config", + "$RECYCLE.BIN", + "prepros.cfg", + "prepros-6.config", + "Prepros Export" + ], + "hideUnwatchedFiles": false + }, + "imports": [], + "projectView": { + "selectedView": "file-tree" + }, + "fileWatcher": { + "enabled": true, + "watchedExtensions": [ + "less", + "sass", + "scss", + "styl", + "md", + "markdown", + "coffee", + "js", + "jade", + "haml", + "slim", + "ls", + "kit", + "png", + "jpg", + "jpeg", + "ts", + "pug", + "css", + "html", + "htm", + "php" + ] + }, + "pathFilters": [ + "node_modules", + ".*", + "bower_components", + "prepros.config", + "Prepros Export", + "prepros-6.config", + "prepros.cfg", + "wp-admin", + "wp-includes" + ], + "server": { + "port": 7881, + "assignNewPortAutomatically": true, + "enable": true, + "proxy": { + "enable": false, + "url": "" + } + }, + "browser-sync": { + "enable": false, + "clicks": true, + "forms": true, + "scroll": true + }, + "live-reload": { + "enable": true, + "animate": true, + "delay": 0 + }, + "ftp-deploy": { + "connectionType": "ftp", + "remotePath": "", + "uploadTimeout": 20000, + "uploadOnChange": false, + "ftp": { + "secure": false, + "host": "", + "port": 21, + "user": "", + "password": "" + }, + "sftp": { + "host": "", + "port": 22, + "usePrivateKey": false, + "username": "", + "password": "", + "privateKey": "", + "passphrase": "" + }, + "pathFilters": [ + "config.rb", + "prepros.config", + "prepros-6.config", + "node_modules", + "Prepros Export", + ".git", + ".idea", + ".sass-cache", + ".hg", + ".svn", + ".cache", + ".DS_Store", + "*.sass", + "*.scss", + "*.less", + "*.pug", + "*.jade", + "*.styl", + "*.haml", + "*.slim", + "*.coffee", + "*.ls", + "*.kit", + "*.ts" + ], + "history": [] + }, + "file-type-sass": "{\"compilers\":[\"node-sass\",\"autoprefixer\",\"minify-css\"]}", + "file-type-less": "{\"compilers\":[\"less\",\"autoprefixer\",\"minify-css\"]}", + "autoprefixer": { + "browsers": "last 5 versions" + }, + "file-type-pug": "{\"compilers\":[\"pug\"]}", + "file-type-css": "{\"compilers\":[\"autoprefixer\",\"cssnext\",\"minify-css\"]}", + "file-type-javascript": "{\"compilers\":[\"concat-js\",\"babel\",\"uglify-js\"]}", + "file-type-stylus": "{\"compilers\":[\"stylus\",\"autoprefixer\",\"minify-css\"]}", + "file-type-markdown": "{\"compilers\":[\"markdown\"]}", + "file-type-haml": "{\"compilers\":[\"haml\"]}", + "file-type-slim": "{\"compilers\":[\"slim\"]}", + "file-type-coffee-script": "{\"compilers\":[\"coffee-script\",\"uglify-js\"]}", + "file-type-livescript": "{\"compilers\":[\"livescript\",\"uglify-js\"]}", + "file-type-kit": "{\"compilers\":[\"kit\"]}", + "uglify-js": { + "ie8": false, + "compress": { + "sequences": true, + "properties": true, + "dead_code": true, + "drop_debugger": true, + "unsafe": false, + "unsafe_comps": false, + "unsafe_math": false, + "unsafe_proto": false, + "unsafe_regexp": false, + "conditionals": true, + "comparisons": true, + "evaluate": true, + "booleans": true, + "loops": true, + "unused": true, + "toplevel": false, + "top_retain": "", + "hoist_funs": true, + "hoist_vars": false, + "if_return": true, + "join_vars": true, + "cascade": true, + "collapse_vars": true, + "reduce_vars": true, + "warnings": true, + "negate_iife": true, + "pure_getters": false, + "pure_funcs": [], + "drop_console": false, + "expression": false, + "keep_fargs": true, + "keep_fnames": false, + "passes": 1, + "keep_infinity": false, + "side_effects": true, + "global_defs": [] + }, + "output": { + "ascii_only": false, + "beautify": false, + "bracketize": false, + "comments": "", + "indent_level": 4, + "indent_start": 0, + "inline_script": false, + "keep_quoted_props": false, + "max_line_len": false, + "preamble": "", + "preserve_line": false, + "quote_keys": false, + "quote_style": 0, + "semicolons": true, + "shebang": true, + "width": 80 + } + }, + "cssnext": { + "customProperties": true, + "applyRule": true, + "calc": false, + "nesting": true, + "customMedia": true, + "mediaQueriesRange": true, + "customSelectors": true, + "attributeCaseInsensitive": true, + "colorRebeccapurple": true, + "colorHwb": true, + "colorGray": true, + "colorHexAlpha": true, + "colorFunction": true, + "fontVariant": true, + "filter": true, + "initial": true, + "rem": true, + "pseudoElements": true, + "pseudoClassMatches": true, + "pseudoClassNot": true, + "pseudoClassAnyLink": true, + "colorRgba": true, + "overflowWrap": true + }, + "file-type-typescript": "{\"compilers\":[\"typescript\",\"uglify-js\"]}", + "babel": { + "useBabelRc": true, + "presets": { + "babel-preset-es2015": true + }, + "plugins": { + "babel-plugin-syntax-jsx": true, + "babel-plugin-transform-react-jsx": true, + "babel-plugin-transform-async-to-generator": true, + "babel-plugin-transform-class-properties": true, + "babel-plugin-transform-object-rest-spread": true + } + }, + "file-type-png": "{\"compilers\":[\"png\"]}", + "file-type-jpg": "{\"compilers\":[\"jpg\"]}" +} \ No newline at end of file diff --git a/scss/main.scss b/scss/main.scss new file mode 100644 index 0000000..9fc7d65 --- /dev/null +++ b/scss/main.scss @@ -0,0 +1,4 @@ +body { + padding-top: 50px; + padding-bottom: 20px; +} From 1cd38487f5fce06968bc32c44c6044c43964c432 Mon Sep 17 00:00:00 2001 From: Kevin Lezama Date: Thu, 12 Oct 2017 16:02:44 -0400 Subject: [PATCH 3/4] Typo in README --- README.html | 12 ++++++++++++ README.md | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 README.html diff --git a/README.html b/README.html new file mode 100644 index 0000000..7698884 --- /dev/null +++ b/README.html @@ -0,0 +1,12 @@ + + + + README.md + + +

assignment_bootstrap_sprint

+

Name: Kevin Lezama

+

A Bootstrap, HTML5 and SASS project from the Viking Code School

+ + + \ No newline at end of file diff --git a/README.md b/README.md index ef74180..8717421 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ assignment_bootstrap_sprint Name: Kevin Lezama -[A Bootstrap, HTM5 and SASS project from the Viking Code School](http://www.vikingcodeschool.com) +[A Bootstrap, HTML5 and SASS project from the Viking Code School](http://www.vikingcodeschool.com) From 6145744585b103cf5d092ad8b4eeda8f917ccb22 Mon Sep 17 00:00:00 2001 From: Kevin Lezama Date: Thu, 12 Oct 2017 16:04:25 -0400 Subject: [PATCH 4/4] remove README.html --- README.html | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 README.html diff --git a/README.html b/README.html deleted file mode 100644 index 7698884..0000000 --- a/README.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - README.md - - -

assignment_bootstrap_sprint

-

Name: Kevin Lezama

-

A Bootstrap, HTML5 and SASS project from the Viking Code School

- - - \ No newline at end of file