From 832f21e0612fd9b002560b94bff72f398ca1babf Mon Sep 17 00:00:00 2001 From: Suzanne Knop Date: Sat, 8 Apr 2017 13:04:53 -0400 Subject: [PATCH 1/6] Style folder now public and fed into the express server --- index.html | 25 ++++++++++++++++++------- package.json | 5 +++-- src/main.js | 2 ++ src/style/main.scss | 7 +++++++ 4 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 src/style/main.scss diff --git a/index.html b/index.html index bdacead..d21a31d 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,27 @@ + + -
-
Hi, this is penn course lmk.
+
+
+
+ Hi, this is penn course lmk. +
+
+
+ +
+ +
+ +
+ +
+
-
- -
- -
diff --git a/package.json b/package.json index 4f3aa8d..f5bbf47 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,11 @@ "main": "", "dependencies": { "body-parser": "^1.17.1", + "emailjs": "^1.0.8", "express": "^4.15.2", "mongodb": "^2.2.25", - "penn-sdk": "^0.2.1", - "emailjs": "^1.0.8" + "node-sass": "^4.5.2", + "penn-sdk": "^0.2.1" }, "devDependencies": { "nodemon": "^1.11.0" diff --git a/src/main.js b/src/main.js index 8a976dc..ab0dc21 100644 --- a/src/main.js +++ b/src/main.js @@ -7,6 +7,8 @@ const MongoHelper = require('./MongoHelper.js') app.use(bodyParser.urlencoded({extended: true})) +app.use('/style', express.static(path.join(__dirname, 'style'))) + app.listen(3000, () => { console.log('listening on 3000') MongoHelper.CreateCollections() diff --git a/src/style/main.scss b/src/style/main.scss new file mode 100644 index 0000000..b0eadbc --- /dev/null +++ b/src/style/main.scss @@ -0,0 +1,7 @@ +.searchbar{ + float: none; + margin: 0 auto; +} +.form-group{ + +} From dbd6d3c26b9b13082dfccaa47a3e85e11c2a155f Mon Sep 17 00:00:00 2001 From: Suzanne Knop Date: Sat, 8 Apr 2017 14:00:38 -0400 Subject: [PATCH 2/6] Form styling --- index.html | 34 +++++++++++++++++++++------------- src/style/main.scss | 10 ++++------ 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/index.html b/index.html index d21a31d..565bc47 100644 --- a/index.html +++ b/index.html @@ -5,26 +5,34 @@ - + -
+
-
- Hi, this is penn course lmk. +
+

PennCourseLMK

+

Add courses that you want, and we'll let you know when they open up!

-
-
- -
- -
- -
-
+
+
+ +
+ +
+ +
+ +
+ +
+
+ diff --git a/src/style/main.scss b/src/style/main.scss index b0eadbc..21cfab8 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -1,7 +1,5 @@ -.searchbar{ - float: none; - margin: 0 auto; -} -.form-group{ - +.container{ + .title{ + text-align: center; + } } From 45a17001ece63d8da63e23415369d41e11d525b7 Mon Sep 17 00:00:00 2001 From: Suzanne Knop Date: Sat, 8 Apr 2017 14:49:12 -0400 Subject: [PATCH 3/6] Button and header styling, removed sass --- index.html | 6 +++--- package.json | 1 - src/style/main.css | 8 ++++++++ src/style/main.scss | 5 ----- 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 src/style/main.css delete mode 100644 src/style/main.scss diff --git a/index.html b/index.html index 565bc47..726f373 100644 --- a/index.html +++ b/index.html @@ -4,15 +4,15 @@ + -

PennCourseLMK

-

Add courses that you want, and we'll let you know when they open up!

+

Add courses that you want, and we'll let you know when they open up!

@@ -28,7 +28,7 @@

PennCourseLMK

- +
diff --git a/package.json b/package.json index f5bbf47..69af1f0 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "emailjs": "^1.0.8", "express": "^4.15.2", "mongodb": "^2.2.25", - "node-sass": "^4.5.2", "penn-sdk": "^0.2.1" }, "devDependencies": { diff --git a/src/style/main.css b/src/style/main.css new file mode 100644 index 0000000..a6721dc --- /dev/null +++ b/src/style/main.css @@ -0,0 +1,8 @@ +.title { + color: rgb(150, 0, 0) +} +.subtitle { + font-weight: 300; + margin-left: 10vw; + margin-right: 10vw; +} diff --git a/src/style/main.scss b/src/style/main.scss deleted file mode 100644 index 21cfab8..0000000 --- a/src/style/main.scss +++ /dev/null @@ -1,5 +0,0 @@ -.container{ - .title{ - text-align: center; - } -} From aafd46bd2a1293ef020f10319d8629590cc4538e Mon Sep 17 00:00:00 2001 From: Suzanne Knop Date: Sat, 8 Apr 2017 15:40:47 -0400 Subject: [PATCH 4/6] Merged searchbar typeahead --- index.html | 6 +++--- src/style/main.css | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 124706d..80b18f3 100644 --- a/index.html +++ b/index.html @@ -17,9 +17,9 @@

Add courses that you want, and we'll let you know when the

-
- +
+
diff --git a/src/style/main.css b/src/style/main.css index a6721dc..ea078cb 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -1,6 +1,11 @@ .title { color: rgb(150, 0, 0) } + +.twitter-typeahead{ + width: 100%; +} + .subtitle { font-weight: 300; margin-left: 10vw; From cc8674bda2202390dc3727245f066833a69c13b6 Mon Sep 17 00:00:00 2001 From: Suzanne Knop Date: Fri, 14 Apr 2017 16:51:57 -0400 Subject: [PATCH 5/6] Basic searchbar dropdown styling --- src/style/main.css | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/style/main.css b/src/style/main.css index ea078cb..87538ed 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -1,3 +1,4 @@ + .title { color: rgb(150, 0, 0) } @@ -11,3 +12,28 @@ margin-left: 10vw; margin-right: 10vw; } + +.tt-menu { + width: 100%; + background-color: rgba(250, 250, 250, 0.95); + +} + +.tt-suggestion { + font-weight: 500; + padding: 10px; + font-size: 12pt; + line-height: normal; +} + +.tt-suggestion small { + font-weight: 300; +} + +.tt-cursor { + background-color: rgba(177, 212, 239, 0.95); +} + +/*.tt-dataset.tt-open { + background-color: gray;*/ +} From 1eea1f2823513f7c4f08366c4ebabfe6cc13bbbc Mon Sep 17 00:00:00 2001 From: Suzanne Knop Date: Fri, 14 Apr 2017 17:33:36 -0400 Subject: [PATCH 6/6] Added drop shadows and highlights when selected --- src/style/main.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/style/main.css b/src/style/main.css index 87538ed..747a051 100644 --- a/src/style/main.css +++ b/src/style/main.css @@ -17,6 +17,9 @@ width: 100%; background-color: rgba(250, 250, 250, 0.95); + -webkit-box-shadow: 2px 2px 10px 1px rgba(0,0,0,0.2), -2px 2px 10px 1px rgba(0,0,0,0.1); + -moz-box-shadow: 2px 2px 10px 1px rgba(0,0,0,0.2), -2px 2px 10px 1px rgba(0,0,0,0.1); + box-shadow: 2px 2px 10px 1px rgba(0,0,0,0.2), -2px 2px 10px 1px rgba(0,0,0,0.1); } .tt-suggestion { @@ -24,16 +27,14 @@ padding: 10px; font-size: 12pt; line-height: normal; + color: rgb(90, 90, 90); } .tt-suggestion small { font-weight: 300; } -.tt-cursor { +.tt-cursor, .tt-selectable:hover{ background-color: rgba(177, 212, 239, 0.95); -} - -/*.tt-dataset.tt-open { - background-color: gray;*/ + color: black; }