Merges prev/next UI controls with latest

Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/b11d0baf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/b11d0baf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/b11d0baf

Branch: refs/heads/cordova-website
Commit: b11d0baf6b2d95be1d40f526da408f3aee0fd2ff
Parents: f63ffac cf46418
Author: RuRios <[email protected]>
Authored: Fri Aug 7 15:55:27 2015 -0700
Committer: RuRios <[email protected]>
Committed: Fri Aug 7 15:55:27 2015 -0700

----------------------------------------------------------------------
 gulpfile.js            | 4 ++--
 www/_layouts/post.html | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b11d0baf/gulpfile.js
----------------------------------------------------------------------
diff --cc gulpfile.js
index 357fdec,357fdec..881df7c
--- a/gulpfile.js
+++ b/gulpfile.js
@@@ -88,7 -88,7 +88,7 @@@ gulp.task("watch", function () 
  });
  
  gulp.task("gen-dev", function (done) {
--    exec("C:\\Ruby21\\bin\\jekyll.bat", ["build"].concat(DEV_FLAGS), done);
++    exec("C:\\Ruby193\\bin\\jekyll.bat", ["build"].concat(DEV_FLAGS), done);
  });
  
  gulp.task("regen-dev", ["gen-dev"], function () {
@@@ -100,7 -100,7 +100,7 @@@ gulp.task("build-dev", ["configs", "sty
  });
  
  gulp.task("gen-prod", function (done) {
--    exec("C:\\Ruby21\\bin\\jekyll.bat", ["build"].concat(PROD_FLAGS), done);
++    exec("C:\\Ruby193\\bin\\jekyll.bat", ["build"].concat(PROD_FLAGS), done);
  });
  
  gulp.task("build-prod", ["configs", "styles"], function (done) {

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/b11d0baf/www/_layouts/post.html
----------------------------------------------------------------------
diff --cc www/_layouts/post.html
index 5cd1e2e,e77b105..c90ca37
--- a/www/_layouts/post.html
+++ b/www/_layouts/post.html
@@@ -1,53 -1,29 +1,54 @@@
  ---
  layout: blog
  ---
+ 
  <div class="blog">
-   <div id="content" class="container">
 -    <div id="content" class="container">
 -         <div class="row">
 -            <div class="blogHeader">
 -                <h1>Blog</h1>
 -                <div>
 -                    <img src="{{ site.baseurl }}/static/img/subscribe.png">
 -                    <a href="{{ site.baseurl }}{{ site.rss_path 
}}">Subscribe</a>
 -                </div>
 -            </div>
 -            <div class="post">
 -                <header>
 -                    <div class="title">{{ page.title }}</div>
 -                    <div class="author">By: {{ page.author.name }}</div>
 -                    <div class="date">{{ page.date | date_to_string }}</div>
 -                </header>
 -                <section>
 -                    <div>
 -                        {{ content }}
 -                    </div>
 -                </section>
 -            </div>
 -        </div>
 -    </div>
 -</div>
++ <div id="content" class="container">
 +     <div class="row">
 +        <div class="blogHeader">
 +          <h1>Blog</h1>
 +          <div>
 +            <img src="{{ site.baseurl }}/static/img/subscribe.png">
 +            <a href="{{ site.baseurl }}{{ site.rss_path }}">Subscribe</a>
 +          </div>
 +        </div>                 
 +        <div class="post">
 +            <header>
 +              <div class="title">{{ page.title }}</div>
 +              <div class="author">By: {{ page.author.name }}</div>
 +              <div class="date">{{ page.date | date_to_string }}</div>
 +            </header>
 +            <section>
 +              <div class="content">
 +                {{ content }}
 +              </div>
 +            </section>                                            
 +        </div>              
 +     </div>
 +     <div class="row">
 +        <section class="nextprev-controls">               
 +          <div class="prev">
 +            <img src="{{ site.baseurl }}/static/img/post-prev.png">
 +          </div>
 +          <div class="next">
 +            <div class="title"><a href="{{ site.baseurl }}{{ post.url 
}}">Title next article</a></div>
 +            <div><span class="date">3 days ago</span><span> - </span><span 
class="author">Author name</span></div>
 +            <img src="{{ site.baseurl }}/static/img/post-next.png">
 +          </div>
 +        </section>            
 +        <section class="nextprev-posts">                                      
   
 +          <div class="prev col-sm-6">
 +            <div class="header"><a href="{{ site.baseurl }}{{ post.url 
}}">Prev article</a></div>
 +            <div class="title"><a href="{{ site.baseurl }}{{ post.url 
}}">Title prev article</a></div>
 +            <div><span class="date">3 days ago</span><span> - by </span><span 
class="author">Author name</span></div>
 +            <div class="excerpt">Gumbo beet greens corn soko endive gumbo 
gourd. Parsley shallot courgette tatsoi pea sprouts fava bean collard greens 
wakame tomato...</div>
 +          </div>
 +          <div class="next col-sm-6">
 +            <div class="header"><a href="{{ site.baseurl }}{{ post.url 
}}">Next article</a></div>
 +            <div class="title"><a href="{{ site.baseurl }}{{ post.url 
}}">Title next article</a></div>
 +            <div><span class="date">2 days ago</span><span> - by </span><span 
class="author">Author name</span></div>
 +            <div class="excerpt"> Dandelion cucumber earthnut pea peanut soko 
zucchini. Gumbo beet greens corn soko endive gumbo gourd... </div>
 +          </div>                                                
 +        </section>               
 +     </div>       
 +  </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to