You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2015/09/18 01:53:51 UTC
docs commit: Refactoring blog HTML and CSS. Making other
miscellaneous CSS/HTML fixes. Fixing hero section spacing.
Repository: cordova-docs
Updated Branches:
refs/heads/cordova-website dd554a712 -> 073d557fa
Refactoring blog HTML and CSS. Making other miscellaneous CSS/HTML fixes. Fixing hero section spacing.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/073d557f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/073d557f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/073d557f
Branch: refs/heads/cordova-website
Commit: 073d557fac48c0fb5dfc1e9afea859d72f711cef
Parents: dd554a7
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Thu Sep 17 16:53:45 2015 -0700
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Thu Sep 17 16:53:45 2015 -0700
----------------------------------------------------------------------
www/_layouts/blog.html | 6 +-
www/_layouts/post.html | 128 +++++++++++++++----------------
www/blog/index.html | 91 +++++++++++-----------
www/contribute/index.html | 4 +-
www/index.html | 4 +-
www/static/css-src/_blog.scss | 114 +++++++++++----------------
www/static/css-src/_contribute.scss | 17 +---
www/static/css-src/_home.scss | 16 +++-
www/static/js/index.js | 3 +-
9 files changed, 173 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/_layouts/blog.html
----------------------------------------------------------------------
diff --git a/www/_layouts/blog.html b/www/_layouts/blog.html
index 4a2cfd9..3c9ac0c 100644
--- a/www/_layouts/blog.html
+++ b/www/_layouts/blog.html
@@ -3,4 +3,8 @@ layout: cordova
blog_tab: true
---
-{{ content }}
+<div class="blog">
+ <div class="container">
+ {{ content }}
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/_layouts/post.html
----------------------------------------------------------------------
diff --git a/www/_layouts/post.html b/www/_layouts/post.html
index d22fa18..083fac0 100644
--- a/www/_layouts/post.html
+++ b/www/_layouts/post.html
@@ -2,76 +2,70 @@
layout: blog
---
-<div class="blog">
- <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 }}">RSS Feed</a>
- </div>
+<h1 class="blogHeader">
+ Blog
+ <span class="rss">
+ <img src="{{ site.baseurl }}/static/img/subscribe.png"><a href="{{ site.baseurl }}{{ site.rss_path }}">RSS Feed</a>
+ </span>
+</h1>
+
+<div class="post">
+ <header>
+ <div class="title">{{ page.title }}</div>
+ <div class="author">By:
+ {% if page.author.url %}
+ <a href="{{ page.author.url }}">{{ page.author.name }}</a>
+ {% else %}
+ {{ page.author.name }}
+ {% endif %}
+ </div>
+ <div class="date">{{ page.date | date_to_string }}</div>
+ </header>
+ <section>
+ <div>
+ {{ content }}
+ </div>
+ </section>
+ <footer>
+ <div class="row">
+ <div class="col-sm-6">
+ {% if page.previous %}
+ <a href="{{ site.baseurl }}{{ page.previous.url }}">Previous</a>
+ <br>
+ <br>
+ <a class="title" href="{{ site.baseurl }}{{ page.previous.url }}">{{ page.previous.title }}</a>
+ <div class="date"> {{ page.previous.date | date_to_string }} - By {{ page.previous.author.name }} </div>
+ <p class="content">
+ {{ page.previous.excerpt | strip_html | truncatewords:12 }}
+ </p>
+ {% endif %}
</div>
- <div class="post">
- <header>
- <div class="title">{{ page.title }}</div>
- <div class="author">By:
- {% if page.author.url %}
- <a href="{{ page.author.url }}">{{ page.author.name }}</a>
- {% else %}
- {{ page.author.name }}
- {% endif %}
- </div>
- <div class="date">{{ page.date | date_to_string }}</div>
- </header>
- <section>
- <div>
- {{ content }}
- </div>
- </section>
- <footer>
- <div class="row">
- <div class="col-sm-6">
- {% if page.previous %}
- <a href="{{ site.baseurl }}{{ page.previous.url }}">Previous</a>
- <br>
- <br>
- <a class="title" href="{{ site.baseurl }}{{ page.previous.url }}">{{ page.previous.title }}</a>
- <div class="date"> {{ page.previous.date | date_to_string }} - By {{ page.previous.author.name }} </div>
- <p class="content">
- {{ page.previous.excerpt | strip_html | truncatewords:12 }}
- </p>
- {% endif %}
- </div>
- <div class="col-sm-6">
- {% if page.next %}
- <a href="{{ site.baseurl }}{{ page.next.url }}">Next</a>
- <br>
- <br>
- <a class="title" href="{{ site.baseurl }}{{ page.next.url }}">{{ page.next.title }}</a>
- <div class="date"> {{ page.next.date | date_to_string }} - By {{ page.next.author.name}} </div>
- <p class="content">
- <!--
- NOTE:
- the markdownify filter is used here
- because posts are rendered in sequence;
- that is, the next post's content isn't
- yet rendered at the time that this post
- is being rendered, so page.next.excerpt
- is still in Markdown and not HTML
+ <div class="col-sm-6">
+ {% if page.next %}
+ <a href="{{ site.baseurl }}{{ page.next.url }}">Next</a>
+ <br>
+ <br>
+ <a class="title" href="{{ site.baseurl }}{{ page.next.url }}">{{ page.next.title }}</a>
+ <div class="date"> {{ page.next.date | date_to_string }} - By {{ page.next.author.name}} </div>
+ <p class="content">
+ <!--
+ NOTE:
+ the markdownify filter is used here
+ because posts are rendered in sequence;
+ that is, the next post's content isn't
+ yet rendered at the time that this post
+ is being rendered, so page.next.excerpt
+ is still in Markdown and not HTML
- Reference: https://github.com/jekyll/jekyll/issues/2860
- -->
- {{ page.next.excerpt | markdownify | strip_html | truncatewords:12 }}
- </p>
- {% endif %}
- </div>
- </div>
- </footer>
- <div class="disqus">
- {% include disqus.html %}
- </div>
+ Reference: https://github.com/jekyll/jekyll/issues/2860
+ -->
+ {{ page.next.excerpt | markdownify | strip_html | truncatewords:12 }}
+ </p>
+ {% endif %}
</div>
</div>
+ </footer>
+ <div class="disqus">
+ {% include disqus.html %}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/blog/index.html
----------------------------------------------------------------------
diff --git a/www/blog/index.html b/www/blog/index.html
index e58b953..baaa7dc 100644
--- a/www/blog/index.html
+++ b/www/blog/index.html
@@ -3,6 +3,49 @@ layout: blog
title: Apache Cordova Blog
---
+<div class="row">
+ <div class="col-sm-8 blog-list">
+ <h1 class="blogHeader">
+ Blog
+ <span class="rss">
+ <img src="{{ site.baseurl }}/static/img/subscribe.png"><a href="{{ site.baseurl }}{{ site.rss_path }}">RSS Feed</a>
+ </span>
+ </h1>
+ <ul class="posts">
+ {% for post in site.posts %}
+ <li>
+ <header>
+ <div class="adorner" blogTime="{{ post.date | date_to_rfc822 }}"></div>
+ <h2 class="title">
+ <a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>
+ </h2>
+ <div class="details">
+ <span class="date">{{ post.date | date_to_string }}</span>
+ - by
+ <span class="author">
+ {% if post.author.url %}
+ <a href="{{ post.author.url }}">{{ post.author.name }}</a>
+ {% else %}
+ {{ post.author.name }}
+ {% endif %}
+ </span>
+ <a class="comment" href="{{ site.baseurl }}{{ post.url }}#disqus_thread"></a>
+ </div>
+ </header>
+ <section class="post-excerpt">
+ <p>{{ post.excerpt }}</p>
+ <div><a href="{{ site.baseurl }}{{ post.url }}">More...</a></div>
+ </section>
+ </li>
+ {% endfor %}
+ </ul>
+ <!-- <a target="_blank" href="http://feed1.w3.org/check.cgi?url={{ site.baseurl }}{{ site.rss_path }}"><img src="{{ site.baseurl }}/static/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a> -->
+ </div>
+ <div class="col-sm-4 social-container">
+ {% include twitterFeed.html %}
+ </div>
+</div>
+
<script>
window.onload = function(){
setTimeout(function(){
@@ -12,52 +55,4 @@ title: Apache Cordova Blog
};
</script>
-<div class="blog">
- <div id="content" class="container">
- <div class="row">
- <div class="col-sm-8 blog-list">
- <div class="blogHeader">
- <h1>Blog</h1>
- <div>
- <img src="{{ site.baseurl }}/static/img/subscribe.png">
- <a href="{{ site.baseurl }}{{ site.rss_path }}">RSS Feed</a>
- </div>
- </div>
- <ul class="posts">
- {% for post in site.posts %}
- <li>
- <header>
- <div class="adorner" blogTime="{{ post.date | date_to_rfc822 }}"></div>
- <div>
- <div class="title"><a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a></div>
- <div>
- <span class="date">{{ post.date | date_to_string }}</span>
- <span> - by </span>
- <span class="author">
- {% if post.author.url %}
- <a href="{{ post.author.url }}">{{ post.author.name }}</a>
- {% else %}
- {{ post.author.name }}
- {% endif %}
- </span>
- <a class="comment" href="{{ site.baseurl }}{{ post.url }}#disqus_thread"></a>
- </div>
- </div>
- </header>
- <section class="post-excerpt">
- <p>{{ post.excerpt }}</p>
- <div><a href="{{ site.baseurl }}{{ post.url }}">More...</a></div>
- </section>
- </li>
- {% endfor %}
- </ul>
- <!-- <a target="_blank" href="http://feed1.w3.org/check.cgi?url={{ site.baseurl }}{{ site.rss_path }}"><img src="{{ site.baseurl }}/static/img/valid-rss-rogers.png" alt="[Valid RSS]" title="Validate my RSS feed" /></a> -->
- </div>
- <div class="col-sm-4 social-container">
- {% include twitterFeed.html %}
- </div>
- </div>
- </div>
-</div>
-
{% include comment_count.html %}
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/contribute/index.html
----------------------------------------------------------------------
diff --git a/www/contribute/index.html b/www/contribute/index.html
index afcd8e0..2846584 100644
--- a/www/contribute/index.html
+++ b/www/contribute/index.html
@@ -18,13 +18,13 @@ title: Apache Cordova Plugins
<div class="col-sm-7">
<p>To share your contributions with the community, you can send a pull request on GitHub to the Apache git mirrors. You can also advocate for your changes directly on our <a href="{{ site.baseurl }}/contact">dev mailing list</a>.</p>
<h2>Get Started Now</h2>
- <ol class="contribute-get-started-steps">
+ <ul class="contribute-get-started-steps">
<li>Join the <a href="{{ site.baseurl }}/contact">Mailing List</a></li>
<li>Sign the <a href="http://www.apache.org/licenses/#clas">Individual Contributor License Agreement (ICLA)</a></li>
<li>Create an account in <a href="https://issues.apache.org/jira/secure/Dashboard.jspa">Apache Jira</a></li>
<li>Bookmark the official URL for <a href="https://issues.apache.org/jira/browse/CB/?selectedTab=com.atlassian.jira.jira-projects-plugin:issues-panel">Cordova Issues</a> (See also <a href="http://wiki.apache.org/cordova/IssueWorkflow">Issue Workflow</a>)</li>
<li>Send a brief introduction of yourself to <a href="mailto:dev@cordova.apache.org">dev@cordova.apache.org</a></li>
- </ol>
+ </ul>
</div>
<div class="col-sm-5">
<div class="well">
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/index.html
----------------------------------------------------------------------
diff --git a/www/index.html b/www/index.html
index 9001890..3975779 100644
--- a/www/index.html
+++ b/www/index.html
@@ -24,10 +24,10 @@ permalink: /
<img src="{{ site.baseurl }}/static/img/platform-logos.svg" width="188px" /><a href="#supported_platforms_section" class="platforms_more">+4 more...</a>
</div>
<div>
- <a href="#getstarted" class="btn btn-lg btn-primary">
+ <a href="#getstarted" class="col-xs-12 col-sm-5 btn btn-lg btn-primary">
Get Started
</a>
- <a href="{{ site.baseurl }}/docs/en/edge/guide/overview/" class="btn btn-lg btn-primary">
+ <a href="{{ site.baseurl }}/docs/en/edge/guide/overview/" class="col-xs-12 col-sm-6 btn btn-lg btn-primary">
Documentation
</a>
</div>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/static/css-src/_blog.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_blog.scss b/www/static/css-src/_blog.scss
index 3b6660c..aad080e 100644
--- a/www/static/css-src/_blog.scss
+++ b/www/static/css-src/_blog.scss
@@ -1,95 +1,69 @@
-.blog{
- .blogHeader{
- position: relative;
- padding:0 15px 25px 15px;
- h1{
- color: #b58733;
- font-size: 30pt;
- }
- div{
- position: absolute;
- top: 20px;
- left: 96px;
-
- img{
- float: left;
- padding-left:14px;
- }
- a{
- float: left;
+.blog {
+ .blogHeader {
+ color: #b58733;
+ font-size: 30pt;
+ padding-top: 10px;
+ padding-bottom: 30px;
+ .rss {
+ a {
font-size: 12pt;
- padding-left:4px;
+ padding-left: 4px;
font-weight: lighter;
- color: #4cc2e4;
+ color: $brand-primary;
+ vertical-align: middle;
}
}
}
- //landing page
- .blog-list{
- max-width: 700px;
- padding-top: 10px;
- padding-right: 30px;
-
- ul {
- list-style-type: none;
- }
- .posts{
+ // landing page
+ .blog-list {
+ max-width: 700px;
+ ul.posts {
+ list-style: none;
+ padding-left: 30px;
- li .newBlog
- {
+ li .newBlog {
background-color: #3992ab;
}
- header{
-
- position: relative;
- height: 64px;
-
- .adorner{
+ header {
+ .title, .details {
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+ .adorner {
height: 50px;
width: 5px;
background-color: #f2f2f2;
position: absolute;
- left: -20px;
+ left: 18px;
}
-
- .title{
- text-overflow: ellipsis;
- overflow: hidden;
- white-space: nowrap;
+ .title {
+ font-size: 24px;
+ font-weight: 400;
+ margin: 0px;
+ width: 100%;
color: $brand-primary-darker;
}
-
- div:nth-of-type(2){
- color: #b58733;
- font-size: 18pt;
- top:-4px;
- position: relative;
-
- span {
- font-size: 80%;
- color: #999;
- position: relative;
- top:-6px;
- }
-
- .date{
+ .details {
+ color: #999;
+ font-size: 18px;
+ .date {
color: #2f2f2f;
}
-
- .comment{
+ .author {
+ }
+ .comment {
float: right;
font-size: 15px;
}
}
}
- section{
+ section {
padding-bottom: 100px;
}
-
}
-
}
.social-container{
@@ -182,12 +156,10 @@
}
- //blog post page
- div.post{
- padding:0 15px;
-
- header{
-
+ // blog post page
+ .post {
+ header {
+ margin-bottom: 20px;
.title{
color: #3992ab;
font-size: 30pt;
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/static/css-src/_contribute.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_contribute.scss b/www/static/css-src/_contribute.scss
index e4b4892..e4abb33 100644
--- a/www/static/css-src/_contribute.scss
+++ b/www/static/css-src/_contribute.scss
@@ -122,24 +122,9 @@ a:hover .report-bug-icon {
}
.contribute-get-started-steps {
- list-style: none;
+ padding-left: 17px;
counter-reset: contribute-steps-counter;
> li {
margin-bottom:.5em;
}
- > li::before {
- counter-increment: contribute-steps-counter;
- content: counter(contribute-steps-counter);
- width: 2em;
- height: 2em;
- background: $brand-primary-darker;
- display: inline-block;
- border-radius: 2em;
- line-height: 2em;
- text-align: center;
- font-size: 1em;
- color: white;
- margin-left:-40px;
- margin-right:19px;
- }
}
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/static/css-src/_home.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_home.scss b/www/static/css-src/_home.scss
index 6de6a6f..fe25248 100644
--- a/www/static/css-src/_home.scss
+++ b/www/static/css-src/_home.scss
@@ -11,7 +11,7 @@ html {
#hero {
height:1020px;
- background-color:$gray-transparent;
+ background-color: $gray-transparent;
background-image: url("{{ site.baseurl }}/static/img/wisplight.jpg");
background-size: cover;
position:relative;
@@ -40,6 +40,9 @@ html {
font-weight: bold;
}
}
+ .btn {
+ margin-bottom: 3px;
+ }
}
.hero_logo {
width:100%;
@@ -48,6 +51,17 @@ html {
}
}
+@media (min-width: $screen-sm-min) {
+ #hero #hero_section .btn + .btn {
+ margin-left: 3px;
+ }
+}
+@media (max-width: $screen-xs-max) {
+ #hero #hero_section_right p {
+ margin-bottom: 20px;
+ }
+}
+
#hero_bottom_strip {
position: absolute;
top: 100%;
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/073d557f/www/static/js/index.js
----------------------------------------------------------------------
diff --git a/www/static/js/index.js b/www/static/js/index.js
index a6fbb5e..a9ab5a4 100644
--- a/www/static/js/index.js
+++ b/www/static/js/index.js
@@ -79,8 +79,7 @@ function checkNotification() {
var dates = [];
if (lastVisit != "") {
{% for post in site.posts %}
- dates.push('{{ post.date | date_to_rfc822 }}');
- {% endfor %}
+ dates.push('{{ post.date | date_to_rfc822 }}');{% endfor %}
}
var new_blog_count = 0;
for(var i = 0; i < dates.length ; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org