Skip to content

Commit

Permalink
Merge pull request #10 from andela/feature/UI-landingPage-137138325
Browse files Browse the repository at this point in the history
#137138325  Users should see a landing page with effective UI/UX
  • Loading branch information
andela-oadebayo committed Jan 20, 2017
2 parents ee8fa27 + 68e0407 commit 5da5a87
Show file tree
Hide file tree
Showing 21 changed files with 721 additions and 1,371 deletions.
5 changes: 3 additions & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"eqeqeq": true
}
"eqeqeq": true,
"node": true
}
38 changes: 38 additions & 0 deletions .vscode/formatter.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"onSave": true,
"javascript": {
"indent_size": 2,
"indent_char": " ",
"eol": "auto",
"preserve_newlines": true,
"break_chained_methods": false,
"max_preserve_newlines": 0,
"space_in_paren": false,
"space_in_empty_paren": false,
"jslint_happy": false,
"space_after_anon_function": false,
"keep_array_indentation": false,
"space_before_conditional": true,
"unescape_strings": false,
"wrap_line_length": 0,
"e4x": false,
"end_with_newline": true,
"comma_first": false,
"brace_style": "collapse-preserve-inline"
},
"css": {
"indent_size": 2,
"indentCharacter": " ",
"indent_char": " ",
"selector_separator_newline": true,
"end_with_newline": false,
"newline_between_rules": true,
"eol": "\n"
},
"html": {
"indent_inner_html": false,
"indent_size": 2,
"indent_char": " ",
"indent_character": " "
}
}
1 change: 1 addition & 0 deletions app/views/includes/foot.jade
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ script(type='text/javascript', src='/js/services/game.js')
script(type='text/javascript', src='/js/controllers/index.js')
script(type='text/javascript', src='/js/controllers/header.js')
script(type='text/javascript', src='/js/controllers/game.js')
script(type='text/javascript', src='/js/controllers/navbar.js')
script(type='text/javascript', src='/js/init.js')

//Socket.io Client Library
Expand Down
1 change: 1 addition & 0 deletions app/views/includes/head.jade
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ head
link(rel='stylesheet', href='/lib/bootstrap/css/bootstrap.css')
link(rel='stylesheet', href='/css/common.css')
link(rel='stylesheet', href='/css/animate.css')
link(rel='stylesheet', href='/css/design.css')
link(rel='stylesheet', href='/css/style.css')


Expand Down
Loading

0 comments on commit 5da5a87

Please sign in to comment.