Permalink
Browse files

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

  • Loading branch information...
1 parent 0b230bd commit 42256e410a35c12f33755261901e6a238b67e5f1 Karthik Viswanathan committed Jul 23, 2012
Showing with 54 additions and 49 deletions.
  1. +6 −6 Makefile
  2. +1 −1 lib/users.js
  3. +3 −3 package.json
  4. +41 −36 public/stylesheets/main.styl
  5. +1 −1 views/layout.jade
  6. +2 −2 views/templates/layouts/layout.jade
View
12 Makefile
@@ -1,19 +1,19 @@
test:
- @./node_modules/.bin/mocha
+ @./node_modules/.bin/mocha --reporter list
test-projects:
- @./node_modules/.bin/mocha test/test.projects.js
+ @./node_modules/.bin/mocha --reporter list test/test.projects.js
test-screens:
- @./node_modules/.bin/mocha test/test.screens.js
+ @./node_modules/.bin/mocha --reporter list test/test.screens.js
test-components:
- @./node_modules/.bin/mocha test/test.components.js
+ @./node_modules/.bin/mocha --reporter list test/test.components.js
test-elements:
- @./node_modules/.bin/mocha test/test.elements.js
+ @./node_modules/.bin/mocha --reporter list test/test.elements.js
test-authenticate:
- @./node_modules/.bin/mocha test/test.authenticate.js
+ @./node_modules/.bin/mocha --reporter list test/test.authenticate.js
.PHONY: test
View
2 lib/users.js
@@ -40,7 +40,7 @@ exports.getEmail = function(db, id, callback) {
* error - null if the id was added or an error otherwise
* id - if error is null, the id of the user
*/
-function addUserId(email, callback) {
+function addUserId(db, email, callback) {
db.incr('user:id:id', function(err, id) {
if (err) {
callback(err);
View
6 package.json
@@ -10,13 +10,13 @@
"client-sessions": "0.0.3",
"connect": "1.8.7",
"express": "2.5.9",
+ "hiredis": "0.1.14",
"jade": ">= 0.20.3",
+ "nconf": "0.6.0",
+ "redis": "0.7.1",
"request": "2.9.153",
"socket.io": "0.9.6",
"stylus": "0.27.2",
- "nconf": "0.6.0",
- "hiredis": "0.1.14",
- "redis": "0.7.1",
"winston": "0.6.1"
},
"devDependencies": {
View
77 public/stylesheets/main.styl
@@ -25,34 +25,36 @@ strong, em
font-family "Lucida Grande", "Lucida Sans", "Lucida Sans Unicode", Verdana, Tahoma, sans-serif
h1, h2, h3, h4, h5, h6
- font-family Quicksand, "Josefin Sans", "Trebuchet MS", Helvetica, Arial, Sans-Serif
- font-weight normal
- letter-spacing -1px
+ font-family "Open Sans", "Josefin Sans", "Trebuchet MS", Helvetica, Arial, Sans-Serif
+ font-weight 400
margin 0
+h1, h2
+ font-weight 300
+
h1
- font-size: 30px;
- line-height: 36px;
+ font-size 30px
+ line-height 36px
h2
- font-size: 24px;
- line-height: 36px;
+ font-size 24px
+ line-height 36px
h3
- font-size: 18px;
- line-height: 27px;
+ font-size 18px
+ line-height 27px
h4, h5, h6
- line-height: 18px;
+ line-height 18px
h4
- font-size: 16px;
+ font-size 16px
h5
- font-size: 15px;
+ font-size 15px
h6
- font-size: 14px;
+ font-size 14px
ul, ol
padding-left 0
@@ -91,7 +93,6 @@ header
header h1 a
float left
font-size 40px
- font-weight normal
line-height 1
text-transform uppercase
color #eee
@@ -136,7 +137,7 @@ header a
#sidebar input[type='text'], #sidebar textarea, .field-select
background #333
- border-color #555
+ border-color #444
box-shadow(inset 0 3px 4px #303030)
color #eee
@@ -146,7 +147,7 @@ header a
height 20px
margin-bottom 10px
line-height 18px
- border 1px solid #555
+ border 1px solid #444
outline none
border-radius(5px)
@@ -277,9 +278,9 @@ header a
box-shadow(0 0 8px rgba(82, 168, 236, 0.6))
outline none
-.drop-target, .drag-element
- border 2px dashed #999
- border-radius(10px)
+.drop-target
+ border 1px dashed #999
+ border-radius(5px)
margin-bottom 20px
.drop-target
@@ -301,27 +302,29 @@ header a
text-align center
text-transform uppercase
+.drag-element, .elements ul, #sidebar .elements form
+ margin 0 -21px
+ padding 20px 40px
+ box-shadow inset 0 0 2px #222
+
+.elements h2
+ margin-bottom 10px
+
+.elements ul
+ margin-bottom 20px
+
.drag-element
- padding 15px 20px
text-align center
- border 1px solid
cursor crosshair
- box-shadow inset 0 0 2px #222
-
-.elements ul, .elements form
- border 1px solid
- padding 15px 20px
- border-radius(5px)
- box-shadow inset 0 0 2px #222
.article-container
border-color #4380d3
-.article, .article-elements ul, .article-elements form
+.article
margin-top 10px
- border-color #4380d3
- border-color #284c7e
- background rgba(5, 49, 109, 0.3)
+
+.article, .article-elements ul, .article-elements form
+ background rgba(5, 49, 109, 0.2)
.article p
margin 5px 0
@@ -372,7 +375,7 @@ header a
.form, .form-elements ul, .form-elements form
border-color #8e244b
- background rgba(144, 0, 53, 0.3)
+ background rgba(144, 0, 53, 0.2)
.form-elements input[type='text'], .form-elements textarea
width 160px
@@ -402,13 +405,15 @@ header a
#prototype-header a
float right
- color #3366bb
- line-height 36px
+ margin-top 3px
#prototype-header i
margin 1px 5px 0 0
-#back, img.live-element, img.share-element
+#back
+ margin-bottom 15px
+
+img.live-element, img.share-element
margin-bottom 10px
.form-submit
View
2 views/layout.jade
@@ -10,7 +10,7 @@ html
// TODO: add favicon later - link(rel='shortcut icon', href='/images/favicon.png')
link(rel='stylesheet', href='/stylesheets/bootstrap-stripped.min.css')
link(rel='stylesheet', href='/stylesheets/main.css')
- link(rel='stylesheet', href='http://fonts.googleapis.com/css?family=Quicksand')
+ link(rel='stylesheet', href='http://fonts.googleapis.com/css?family=Open+Sans:300,400')
block styles
View
4 views/templates/layouts/layout.jade
@@ -1,8 +1,8 @@
script#layout-template(type='text/template')
if !sharing
#prototype-header
- h2 ‘#{screenHash[screenId].title}’ Screen Prototype
- a(href='/share/#{session.id}/project/#{projectId}/screen/#{screenId}')
+ h2 ‘#{screenHash[screenId].title}’ screen prototype
+ a.btn(href='/share/#{session.id}/project/#{projectId}/screen/#{screenId}', tabindex='-1')
i.icon-globe
| Share Screen

0 comments on commit 42256e4

Please sign in to comment.