Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Touch up styles. Organize packages. Fix bug in user module.

  • Loading branch information...
commit 42256e410a35c12f33755261901e6a238b67e5f1 1 parent 0b230bd
Karthik Viswanathan karthikv authored
12 Makefile
... ... @@ -1,19 +1,19 @@
1 1 test:
2   - @./node_modules/.bin/mocha
  2 + @./node_modules/.bin/mocha --reporter list
3 3
4 4 test-projects:
5   - @./node_modules/.bin/mocha test/test.projects.js
  5 + @./node_modules/.bin/mocha --reporter list test/test.projects.js
6 6
7 7 test-screens:
8   - @./node_modules/.bin/mocha test/test.screens.js
  8 + @./node_modules/.bin/mocha --reporter list test/test.screens.js
9 9
10 10 test-components:
11   - @./node_modules/.bin/mocha test/test.components.js
  11 + @./node_modules/.bin/mocha --reporter list test/test.components.js
12 12
13 13 test-elements:
14   - @./node_modules/.bin/mocha test/test.elements.js
  14 + @./node_modules/.bin/mocha --reporter list test/test.elements.js
15 15
16 16 test-authenticate:
17   - @./node_modules/.bin/mocha test/test.authenticate.js
  17 + @./node_modules/.bin/mocha --reporter list test/test.authenticate.js
18 18
19 19 .PHONY: test
2  lib/users.js
@@ -40,7 +40,7 @@ exports.getEmail = function(db, id, callback) {
40 40 * error - null if the id was added or an error otherwise
41 41 * id - if error is null, the id of the user
42 42 */
43   -function addUserId(email, callback) {
  43 +function addUserId(db, email, callback) {
44 44 db.incr('user:id:id', function(err, id) {
45 45 if (err) {
46 46 callback(err);
6 package.json
@@ -10,13 +10,13 @@
10 10 "client-sessions": "0.0.3",
11 11 "connect": "1.8.7",
12 12 "express": "2.5.9",
  13 + "hiredis": "0.1.14",
13 14 "jade": ">= 0.20.3",
  15 + "nconf": "0.6.0",
  16 + "redis": "0.7.1",
14 17 "request": "2.9.153",
15 18 "socket.io": "0.9.6",
16 19 "stylus": "0.27.2",
17   - "nconf": "0.6.0",
18   - "hiredis": "0.1.14",
19   - "redis": "0.7.1",
20 20 "winston": "0.6.1"
21 21 },
22 22 "devDependencies": {
77 public/stylesheets/main.styl
@@ -25,34 +25,36 @@ strong, em
25 25 font-family "Lucida Grande", "Lucida Sans", "Lucida Sans Unicode", Verdana, Tahoma, sans-serif
26 26
27 27 h1, h2, h3, h4, h5, h6
28   - font-family Quicksand, "Josefin Sans", "Trebuchet MS", Helvetica, Arial, Sans-Serif
29   - font-weight normal
30   - letter-spacing -1px
  28 + font-family "Open Sans", "Josefin Sans", "Trebuchet MS", Helvetica, Arial, Sans-Serif
  29 + font-weight 400
31 30 margin 0
32 31
  32 +h1, h2
  33 + font-weight 300
  34 +
33 35 h1
34   - font-size: 30px;
35   - line-height: 36px;
  36 + font-size 30px
  37 + line-height 36px
36 38
37 39 h2
38   - font-size: 24px;
39   - line-height: 36px;
  40 + font-size 24px
  41 + line-height 36px
40 42
41 43 h3
42   - font-size: 18px;
43   - line-height: 27px;
  44 + font-size 18px
  45 + line-height 27px
44 46
45 47 h4, h5, h6
46   - line-height: 18px;
  48 + line-height 18px
47 49
48 50 h4
49   - font-size: 16px;
  51 + font-size 16px
50 52
51 53 h5
52   - font-size: 15px;
  54 + font-size 15px
53 55
54 56 h6
55   - font-size: 14px;
  57 + font-size 14px
56 58
57 59 ul, ol
58 60 padding-left 0
@@ -91,7 +93,6 @@ header
91 93 header h1 a
92 94 float left
93 95 font-size 40px
94   - font-weight normal
95 96 line-height 1
96 97 text-transform uppercase
97 98 color #eee
@@ -136,7 +137,7 @@ header a
136 137
137 138 #sidebar input[type='text'], #sidebar textarea, .field-select
138 139 background #333
139   - border-color #555
  140 + border-color #444
140 141 box-shadow(inset 0 3px 4px #303030)
141 142 color #eee
142 143
@@ -146,7 +147,7 @@ header a
146 147 height 20px
147 148 margin-bottom 10px
148 149 line-height 18px
149   - border 1px solid #555
  150 + border 1px solid #444
150 151 outline none
151 152 border-radius(5px)
152 153
@@ -277,9 +278,9 @@ header a
277 278 box-shadow(0 0 8px rgba(82, 168, 236, 0.6))
278 279 outline none
279 280
280   -.drop-target, .drag-element
281   - border 2px dashed #999
282   - border-radius(10px)
  281 +.drop-target
  282 + border 1px dashed #999
  283 + border-radius(5px)
283 284 margin-bottom 20px
284 285
285 286 .drop-target
@@ -301,27 +302,29 @@ header a
301 302 text-align center
302 303 text-transform uppercase
303 304
  305 +.drag-element, .elements ul, #sidebar .elements form
  306 + margin 0 -21px
  307 + padding 20px 40px
  308 + box-shadow inset 0 0 2px #222
  309 +
  310 +.elements h2
  311 + margin-bottom 10px
  312 +
  313 +.elements ul
  314 + margin-bottom 20px
  315 +
304 316 .drag-element
305   - padding 15px 20px
306 317 text-align center
307   - border 1px solid
308 318 cursor crosshair
309   - box-shadow inset 0 0 2px #222
310   -
311   -.elements ul, .elements form
312   - border 1px solid
313   - padding 15px 20px
314   - border-radius(5px)
315   - box-shadow inset 0 0 2px #222
316 319
317 320 .article-container
318 321 border-color #4380d3
319 322
320   -.article, .article-elements ul, .article-elements form
  323 +.article
321 324 margin-top 10px
322   - border-color #4380d3
323   - border-color #284c7e
324   - background rgba(5, 49, 109, 0.3)
  325 +
  326 +.article, .article-elements ul, .article-elements form
  327 + background rgba(5, 49, 109, 0.2)
325 328
326 329 .article p
327 330 margin 5px 0
@@ -372,7 +375,7 @@ header a
372 375
373 376 .form, .form-elements ul, .form-elements form
374 377 border-color #8e244b
375   - background rgba(144, 0, 53, 0.3)
  378 + background rgba(144, 0, 53, 0.2)
376 379
377 380 .form-elements input[type='text'], .form-elements textarea
378 381 width 160px
@@ -402,13 +405,15 @@ header a
402 405
403 406 #prototype-header a
404 407 float right
405   - color #3366bb
406   - line-height 36px
  408 + margin-top 3px
407 409
408 410 #prototype-header i
409 411 margin 1px 5px 0 0
410 412
411   -#back, img.live-element, img.share-element
  413 +#back
  414 + margin-bottom 15px
  415 +
  416 +img.live-element, img.share-element
412 417 margin-bottom 10px
413 418
414 419 .form-submit
2  views/layout.jade
@@ -10,7 +10,7 @@ html
10 10 // TODO: add favicon later - link(rel='shortcut icon', href='/images/favicon.png')
11 11 link(rel='stylesheet', href='/stylesheets/bootstrap-stripped.min.css')
12 12 link(rel='stylesheet', href='/stylesheets/main.css')
13   - link(rel='stylesheet', href='http://fonts.googleapis.com/css?family=Quicksand')
  13 + link(rel='stylesheet', href='http://fonts.googleapis.com/css?family=Open+Sans:300,400')
14 14
15 15 block styles
16 16
4 views/templates/layouts/layout.jade
... ... @@ -1,8 +1,8 @@
1 1 script#layout-template(type='text/template')
2 2 if !sharing
3 3 #prototype-header
4   - h2 ‘#{screenHash[screenId].title}’ Screen Prototype
5   - a(href='/share/#{session.id}/project/#{projectId}/screen/#{screenId}')
  4 + h2 ‘#{screenHash[screenId].title}’ screen prototype
  5 + a.btn(href='/share/#{session.id}/project/#{projectId}/screen/#{screenId}', tabindex='-1')
6 6 i.icon-globe
7 7 | Share Screen
8 8

0 comments on commit 42256e4

Please sign in to comment.
Something went wrong with that request. Please try again.