Skip to content
This repository has been archived by the owner on Sep 27, 2022. It is now read-only.

Commit

Permalink
final
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Simons authored and Eric Simons committed Jan 29, 2016
1 parent 9f05329 commit 0b45af7
Show file tree
Hide file tree
Showing 14 changed files with 525 additions and 358 deletions.
38 changes: 38 additions & 0 deletions pages/auth.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<%= header %>

<div class="auth-page">
<div class="container page">
<div class="row">

<div class="col-md-6 col-md-offset-3 col-xs-12">
<h1 class="text-xs-center">Sign up</h1>
<p class="text-xs-center">
<a href="#">Have an account?</a>
</p>

<!-- <ul class="error-messages">
<li>That email is already taken</li>
</ul> -->

<form>
<fieldset class="form-group">
<input class="form-control form-control-lg" type="text" placeholder="Your Name">
</fieldset>
<fieldset class="form-group">
<input class="form-control form-control-lg" type="text" placeholder="Email">
</fieldset>
<fieldset class="form-group">
<input class="form-control form-control-lg" type="password" placeholder="Password">
</fieldset>
<button class="btn btn-lg btn-primary pull-xs-right">
Sign up
</button>
</form>
</div>

</div>
</div>
</div>


<%= footer %>
34 changes: 34 additions & 0 deletions pages/editor.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<%= header %>

<div class="editor-page">
<div class="container page">
<div class="row">

<div class="col-md-10 col-md-offset-1 col-xs-12">
<form>
<fieldset class="form-group">
<input class="form-control form-control-lg" type="text" placeholder="Post Title">
</fieldset>
<fieldset class="form-group">
<textarea class="form-control" rows="8" placeholder="Write your post (in markdown)"></textarea>
</fieldset>
<fieldset class="form-group">
<input class="form-control" type="text" placeholder="Enter tags">
<div class="tag-list">
<span class="label label-pill label-default"><i class="ion-close-round"></i> programming</span>
<span class="label label-pill label-default"><i class="ion-close-round"></i> javascript</span>
<span class="label label-pill label-default"><i class="ion-close-round"></i> webdev</span>
</div>
</fieldset>
<button class="btn btn-lg btn-primary pull-xs-right">
Create Post
</button>
</form>
</div>

</div>
</div>
</div>


<%= footer %>
126 changes: 65 additions & 61 deletions pages/index.html
Original file line number Diff line number Diff line change
@@ -1,82 +1,86 @@
<%= header %>

<div class="banner home-page">
<div class="container">
<h1 class="logo-font">conduit</h1>
<p>A place to share your knowledge.</p>
<div class="home-page">

<div class="banner">
<div class="container">
<h1 class="logo-font">conduit</h1>
<p>A place to share your knowledge.</p>
</div>
</div>
</div>

<div class="container page">
<div class="row">
<div class="container page">
<div class="row">

<div class="col-md-9">
<div class="feed-toggle">
<ul class="nav nav-pills outline-active">
<li class="nav-item">
<a class="nav-link disabled" href="#">Your Feed</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="#">Global Feed</a>
</li>
</ul>
</div>
<div class="col-md-9">
<div class="feed-toggle">
<ul class="nav nav-pills outline-active">
<li class="nav-item">
<a class="nav-link disabled" href="#">Your Feed</a>
</li>
<li class="nav-item">
<a class="nav-link active" href="#">Global Feed</a>
</li>
</ul>
</div>

<div class="post-preview">
<div class="post-meta">
<a href="profile.html"><img src="http://i.imgur.com/Qr71crq.jpg" /></a>
<div class="info">
<a href="profile.html" class="author">Eric Simons</a>
<span class="date">January 20th</span>
<div class="post-preview">
<div class="post-meta">
<a href="profile.html"><img src="http://i.imgur.com/Qr71crq.jpg" /></a>
<div class="info">
<a href="profile.html" class="author">Eric Simons</a>
<span class="date">January 20th</span>
</div>
<button class="btn btn-outline-primary btn-sm pull-xs-right">
<i class="ion-heart"></i> 29
</button>
</div>
<button class="btn btn-outline-primary btn-sm pull-xs-right">
<i class="ion-heart"></i> 29
</button>
<a href="post.html" class="preview-link">
<h1>How to build webapps that scale</h1>
<p>In my demo, the holy grail layout is nested inside a document, so there's no body or main tags like shown above. Regardless, we're interested in the class names and the appearance of sections in the markup as opposed to the actual elements themselves. In particular, take note of the modifier classes used on the two sidebars, and the trivial order in which they appear in the markup. Let's break this down to paint a clear picture of what's happening...</p>
<span>Read more...</span>
</a>
</div>
<a href="post.html" class="preview-link">
<h1>How to build webapps that scale</h1>
<p>In my demo, the holy grail layout is nested inside a document, so there's no body or main tags like shown above. Regardless, we're interested in the class names and the appearance of sections in the markup as opposed to the actual elements themselves. In particular, take note of the modifier classes used on the two sidebars, and the trivial order in which they appear in the markup. Let's break this down to paint a clear picture of what's happening...</p>
<span>Read more...</span>
</a>
</div>

<div class="post-preview">
<div class="post-meta">
<a href="profile.html"><img src="http://i.imgur.com/N4VcUeJ.jpg" /></a>
<div class="info">
<a href="profile.html" class="author">Albert Pai</a>
<span class="date">January 20th</span>
<div class="post-preview">
<div class="post-meta">
<a href="profile.html"><img src="http://i.imgur.com/N4VcUeJ.jpg" /></a>
<div class="info">
<a href="profile.html" class="author">Albert Pai</a>
<span class="date">January 20th</span>
</div>
<button class="btn btn-outline-primary btn-sm pull-xs-right">
<i class="ion-heart"></i> 32
</button>
</div>
<button class="btn btn-outline-primary btn-sm pull-xs-right">
<i class="ion-heart"></i> 32
</button>
<a href="post.html" class="preview-link">
<h1>The song you won't ever stop singing. No matter how hard you try.</h1>
<p>In my demo, the holy grail layout is nested inside a document, so there's no body or main tags like shown above. Regardless, we're interested in the class names and the appearance of sections in the markup as opposed to the actual elements themselves. In particular, take note of the modifier classes used on the two sidebars, and the trivial order in which they appear in the markup. Let's break this down to paint a clear picture of what's happening...</p>
<span>Read more...</span>
</a>
</div>
<a href="post.html" class="preview-link">
<h1>The song you won't ever stop singing. No matter how hard you try.</h1>
<p>In my demo, the holy grail layout is nested inside a document, so there's no body or main tags like shown above. Regardless, we're interested in the class names and the appearance of sections in the markup as opposed to the actual elements themselves. In particular, take note of the modifier classes used on the two sidebars, and the trivial order in which they appear in the markup. Let's break this down to paint a clear picture of what's happening...</p>
<span>Read more...</span>
</a>
</div>

</div>
</div>

<div class="col-md-3">
<div class="sidebar">
<p>Popular Tags</p>
<div class="col-md-3">
<div class="sidebar">
<p>Popular Tags</p>

<div class="tag-list">
<a href="#" class="label label-pill label-default">programming</a>
<a href="#" class="label label-pill label-default">javascript</a>
<a href="#" class="label label-pill label-default">angularjs</a>
<a href="#" class="label label-pill label-default">react</a>
<a href="#" class="label label-pill label-default">mean</a>
<a href="#" class="label label-pill label-default">node</a>
<a href="#" class="label label-pill label-default">rails</a>
<div class="tag-list">
<a href="#" class="label label-pill label-default">programming</a>
<a href="#" class="label label-pill label-default">javascript</a>
<a href="#" class="label label-pill label-default">angularjs</a>
<a href="#" class="label label-pill label-default">react</a>
<a href="#" class="label label-pill label-default">mean</a>
<a href="#" class="label label-pill label-default">node</a>
<a href="#" class="label label-pill label-default">rails</a>
</div>
</div>
</div>
</div>

</div>
</div>

</div>

<%= footer %>
13 changes: 9 additions & 4 deletions pages/partials/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,20 @@
<div class="container">
<a class="navbar-brand" href="index.html">conduit</a>
<ul class="nav navbar-nav pull-xs-right">
<li class="nav-item active">
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
<li class="nav-item">
<a class="nav-link" href="editor.html">
<i class="ion-compose"></i>&nbsp;New Post
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Sign in</a>
<a class="nav-link" href="auth.html">Sign up</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Sign up</a>
<a class="nav-link" href="settings.html">Settings</a>
</li>
<!-- <li class="nav-item active">
<a class="nav-link" href="index.html">Home</a>
</li> -->
</ul>
</div>
</nav>
Loading

0 comments on commit 0b45af7

Please sign in to comment.