From 5872fbb6953b57fb341a47e0c4c2313c008e0c03 Mon Sep 17 00:00:00 2001 From: ccoenraets Date: Wed, 22 Jul 2015 11:37:20 -0400 Subject: [PATCH 1/4] edit readme --- .idea/workspace.xml | 206 ++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 +- 2 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..3650c7ca0 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1437576736740 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 746d7473e..fbe6bf522 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -ES6 Tutorial \ No newline at end of file +## ES6 Tutorial + +Start the tutorial [here](http://ccoenraets.github.io/es6-tutorial). \ No newline at end of file From 226be3afaf54901b3cc15c09d905d847aa381f55 Mon Sep 17 00:00:00 2001 From: ccoenraets Date: Wed, 22 Jul 2015 11:38:18 -0400 Subject: [PATCH 2/4] remove project files --- .gitignore | 1 + .idea/workspace.xml | 206 -------------------------------------------- 2 files changed, 1 insertion(+), 206 deletions(-) create mode 100644 .gitignore delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..723ef36f4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 3650c7ca0..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1437576736740 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From e384088463fc4cab8459964cb56840ac10a3c781 Mon Sep 17 00:00:00 2001 From: ccoenraets Date: Mon, 14 Dec 2015 17:16:16 -0500 Subject: [PATCH 3/4] Update for Babel 6 and Webpack --- styles.css => css/styles.css | 0 index.html | 4 ++-- calc.js => js/main.js | 0 package.json | 16 ---------------- 4 files changed, 2 insertions(+), 18 deletions(-) rename styles.css => css/styles.css (100%) rename calc.js => js/main.js (100%) delete mode 100644 package.json diff --git a/styles.css b/css/styles.css similarity index 100% rename from styles.css rename to css/styles.css diff --git a/index.html b/index.html index 24813073d..2bab86b0f 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - +
@@ -23,6 +23,6 @@

Monthly Payment:

- + \ No newline at end of file diff --git a/calc.js b/js/main.js similarity index 100% rename from calc.js rename to js/main.js diff --git a/package.json b/package.json deleted file mode 100644 index 7eda016e0..000000000 --- a/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "es6-tutorial", - "version": "1.0.0", - "description": "ECMAScript 6 Tutorial", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "Christophe Coenraets (http://coenraets.org/)", - "license": "ISC", - "repository": "https://gitub.com/ccoenraets/es6-tutorial", - "devDependencies": { - "babel-core": "^5.7.4", - "http-server": "^0.8.0" - } -} From 6022f53704ff8c95c0a9cf3ba6fd6d3e7c111a2d Mon Sep 17 00:00:00 2001 From: ccoenraets Date: Tue, 15 Dec 2015 10:57:59 -0500 Subject: [PATCH 4/4] css update --- css/styles.css | 130 ++++++++++++++++++++++++++++++++----------------- index.html | 17 +++++-- 2 files changed, 97 insertions(+), 50 deletions(-) diff --git a/css/styles.css b/css/styles.css index c8372cbf5..f0aefa900 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1,3 +1,52 @@ +body { + font-family: 'Roboto', 'Sans Serif'; + font-size: 16px; + padding: 0; + margin: 0; +} + +header { + background-color: #03A9F4; + padding: 14px; + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); +} + +h1, h2, h3 { + font-weight: 300; +} + +header > h1 { + font-weight: 300; + font-size: 24px; + margin: 0; + color: #FFFFFF; +} + +h2 { + font-size: 22px; + margin: 20px 0 0 0; +} + +h2 > .currency { + color: #0288D1; +} + +h3 { + margin: 10px 0 28px 0; +} + +h3 > span { + color: #0288D1; +} + +.principal { + color: #0288D1; +} + +.interest { + color: #EF6C00; +} + input[type=text] { -webkit-appearance: none; width: 150px; @@ -12,45 +61,15 @@ input[type=text] { box-shadow: none; } -button { - -webkit-appearance: button; - color: #333; - background-color: #DDD; - border-color: #ccc; - display: inline-block; - padding: 6px 12px; - font-size: 14px; - font-weight: 400; - line-height: 1.42857143; - text-align: center; - white-space: nowrap; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - background-image: none; - border: 1px solid #CCC; - border-radius: 2px; -} - -button:hover { - background: none repeat scroll 0 0 #CCC; -} - -button:active { - background: none repeat scroll 0 0 #BBB; -} - -button:focus { - outline:0; -} - table { border-collapse: collapse; + font-weight: 300; + font-size: 12px; +} + +th { + text-align: right; + font-weight: 400; } td { @@ -58,7 +77,6 @@ td { padding: 0 .5rem; } - th, td { border: solid 1px #EEEEEE !important; @@ -69,6 +87,7 @@ label { display: inline-block; width: 80px; text-align: right; + margin-right: 4px; } .content { @@ -82,13 +101,13 @@ label { } .bar.principal { - background-color: rgb(166, 197, 103); - margin-right:.5px; + background-color: #0288D1; + margin-right:1px; } .bar.interest { - background-color: rgb(252, 187, 105); - margin-left:.5px; + background-color: #EF6C00; + margin-left:1px; } .stretch { @@ -114,7 +133,28 @@ label { margin: 6px 0; } -.form button { - margin: 8px 0; - margin-left: 84px; +button { + text-transform: none; + -webkit-appearance: none; + cursor: pointer; + padding: 12px 18px; + border-radius: 2px; + background: #FCFCFC; + font-size: 16px; + border: solid 1px #ddd; + color: #444; +} + +button:hover { + background: #F4F4F4; + border: solid 1px #ccc; +} + +button:active { + background: #FEFEFE; + border: solid 1px #ddd; +} + +button:focus { + outline:0; } \ No newline at end of file diff --git a/index.html b/index.html index 2bab86b0f..0364f0343 100644 --- a/index.html +++ b/index.html @@ -2,24 +2,31 @@ + +
+

Mortgage Calculator

+
- +
- +
- - + + +
+
+ +
-

Monthly Payment: