Skip to content

Commit

Permalink
minor layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SingingBush committed Apr 18, 2016
1 parent 0f7ad40 commit e4c4c5d
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 74 deletions.
8 changes: 8 additions & 0 deletions public/styles/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@
body {
font-family: 'Droid Sans', serif;
}

.jumbotron-primary {
/*background-color: rgba(54, 55, 197, 0.87);*/
background-color: #0275d8; /* Same Blue that is used by Bootstrap */
box-shadow: inset 0 0 5rem rgba(0,0,0,.5);
color: #fff;
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
}
Binary file modified screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 11 additions & 10 deletions views/error.dt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ block title
title Error

block body
.jumbotron
h1 #{error.message}
p.lead A #{error.code} error has occurred:
//- p path: #{req.path}
div.container(role='main')
.jumbotron
h1 #{error.message}
p.lead A #{error.code} error has occurred:
//- p path: #{req.path}

p
a.btn.btn-primary(href="/") Return to the home page
p
a.btn.btn-primary(href="/") Return to the home page

//- This bit should be removed in production environment
-if(error.debugMessage.length)
p The server produced the following stack trace:
pre= error.debugMessage
//- This bit should be removed in production environment
-if(error.debugMessage.length)
p The server produced the following stack trace:
pre= error.debugMessage
3 changes: 2 additions & 1 deletion views/header.dt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
header
nav.navbar.navbar-light.bg-faded.m-b-1(role='navigation')
nav.navbar.navbar-dark.bg-inverse(role='navigation')
.container
a.navbar-brand(href="/")
| Eloquent
ul.nav.navbar-nav
li.nav-item
a.nav-link(href="/") Home
ul.nav.navbar-nav.pull-right
- if (authenticated)
li.nav-item
a.nav-link(href="/profile")
Expand Down
31 changes: 18 additions & 13 deletions views/index.dt
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,21 @@ block title
title Home

block body
.row
.col-md-12
- foreach( p; blogPosts )
h2 #{p.title}
p.lead #{p.author.displayname}
p
span.fa.fa-clock-o
| #{p.created}
hr
p !{p.content}
a.btn.btn-primary(href="#") Read More
span.fa.fa-chevron-right
hr
.jumbotron.jumbotron-primary
.container
h1 Home Page

.container(role='main')
.row
.col-md-12
- foreach( p; blogPosts )
h2 #{p.title}
p.lead #{p.author.displayname}
p
span.fa.fa-clock-o
| #{p.created}
hr
p !{p.content}
a.btn.btn-primary(href="#") Read More
span.fa.fa-chevron-right
hr
2 changes: 1 addition & 1 deletion views/layout.dt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ html(lang='en')
body(role='document')
include header

div.container(role='main')
section
block body

footer
Expand Down
53 changes: 27 additions & 26 deletions views/login.dt
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,31 @@ block title
title Login

block body
.row
.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
- if (authenticated)
h4 Sign Out
hr
form.form-horizontal(action="logout", method="POST")
button.btn.btn-primary.btn-lg.btn-block(type="submit") Log out
- else
h4 Log in
hr
form.form-horizontal(action="login", method="POST")
.form-group
.input-group
label(for='usrName', class='sr-only') Username
input.form-control(id="usrName", type="text", name="username", placeholder="Username")
.input-group-addon
i.fa.fa-user
.form-group
.input-group
label(for='passWrd', class='sr-only') Password
input.form-control(id="passWrd", type="password", name="password", placeholder="Password")
.input-group-addon
i.fa.fa-lock
div.container(role='main')
.row
.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
- if (authenticated)
h4 Sign Out
hr
form.form-horizontal(action="logout", method="POST")
button.btn.btn-primary.btn-lg.btn-block(type="submit") Log out
- else
h4 Log in
hr
form.form-horizontal(action="login", method="POST")
.form-group
.input-group
label(for='usrName', class='sr-only') Username
input.form-control(id="usrName", type="text", name="username", placeholder="Username")
.input-group-addon
i.fa.fa-user
.form-group
.input-group
label(for='passWrd', class='sr-only') Password
input.form-control(id="passWrd", type="password", name="password", placeholder="Password")
.input-group-addon
i.fa.fa-lock

button.btn.btn-primary.btn-lg(type="submit") Login
- if (_error)
p.text-danger #{_error}
button.btn.btn-primary.btn-lg(type="submit") Login
- if (_error)
p.text-danger #{_error}
47 changes: 24 additions & 23 deletions views/profile.dt
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
extends layout

block body
.row
.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
- if (authenticated)
.alert.alert-dismissable.alert-success
button.close(type="button", data-dismiss="alert") x
| Here are your posts #{user.username}
- else
.alert.alert-dismissable.alert-danger
button.close(type="button", data-dismiss="alert") x
| This shouldn't happen
.row
.col-md-12
- foreach( p; blogPosts )
h2 #{p.title}
p.lead #{p.author.displayname}
p
span.fa.fa-clock-o
| #{p.created}
hr
p !{p.content}
a.btn.btn-primary(href="#") Read More
span.fa.fa-chevron-right
hr
div.container(role='main')
.row
.col-md-6.col-md-offset-3.col-sm-8.col-sm-offset-2
- if (authenticated)
.alert.alert-dismissable.alert-success
button.close(type="button", data-dismiss="alert") x
| Here are your posts #{user.username}
- else
.alert.alert-dismissable.alert-danger
button.close(type="button", data-dismiss="alert") x
| This shouldn't happen
.row
.col-md-12
- foreach( p; blogPosts )
h2 #{p.title}
p.lead #{p.author.displayname}
p
span.fa.fa-clock-o
| #{p.created}
hr
p !{p.content}
a.btn.btn-primary(href="#") Read More
span.fa.fa-chevron-right
hr

0 comments on commit e4c4c5d

Please sign in to comment.