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/08/07 02:43:41 UTC

[1/3] docs commit: Adds base style for single blog post landing page

Repository: cordova-docs
Updated Branches:
  refs/heads/cordova-website 219d7b16a -> cf464189f


Adds base style for single blog post landing page


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

Branch: refs/heads/cordova-website
Commit: ac4381fafc542055a6a540821684821c0451428b
Parents: cef8211
Author: RubenRios <ru...@microsoft.com>
Authored: Thu Aug 6 12:40:21 2015 -0700
Committer: RubenRios <ru...@microsoft.com>
Committed: Thu Aug 6 12:40:21 2015 -0700

----------------------------------------------------------------------
 www/_layouts/post.html       | 34 +++++++++++++++++-----
 www/blog/index.html          |  9 +++---
 www/static/css-src/blog.scss | 60 ++++++++++++++++++++++++++++++++++-----
 3 files changed, 85 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac4381fa/www/_layouts/post.html
----------------------------------------------------------------------
diff --git a/www/_layouts/post.html b/www/_layouts/post.html
index 00aff25..65253f2 100644
--- a/www/_layouts/post.html
+++ b/www/_layouts/post.html
@@ -1,11 +1,31 @@
 ---
 layout: cordova
 ---
-<div class="site">
-    <h2>{{ page.title }}</h2>
-    <div class="meta">Posted by: <a href="{{ page.author.url }}">{{ page.author.name }}</a></div>
-    <p class="meta">{{ page.date | date_to_string }}</p>
-    <div class="post">
-    {{ content }}
-    </div>
+
+<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 }}">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>
+
+

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac4381fa/www/blog/index.html
----------------------------------------------------------------------
diff --git a/www/blog/index.html b/www/blog/index.html
index 3d39759..bce3ab8 100644
--- a/www/blog/index.html
+++ b/www/blog/index.html
@@ -4,7 +4,8 @@ title: Apache Cordova Blog
 ---
 
 <div class="blog">
-  <div id="content" class="container fill">
+  <div id="content" class="container">
+     <div class="row">
     <div class="col-sm-8 blog-list">  
       <div class="blogHeader">
         <h1>Blog</h1>
@@ -31,10 +32,10 @@ title: Apache Cordova Blog
           {% endfor %}
       </ul>
       <a 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>  
     <div class="col-sm-4 social-container">    
         {% include twitterFeed.html %}        
-    </div>      
+    </div>
+     </div>      
   </div>
 </div>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/ac4381fa/www/static/css-src/blog.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/blog.scss b/www/static/css-src/blog.scss
index 293fcbb..3ed47a4 100644
--- a/www/static/css-src/blog.scss
+++ b/www/static/css-src/blog.scss
@@ -1,5 +1,5 @@
 .blog{
-	padding-top: 50px;	
+	padding-top:20px;	
 	.blogHeader{	
 		position: relative;
 		padding-bottom:26px;
@@ -26,10 +26,11 @@
 			}	
 		}					
 	}
-		
+	//landing page
 	.blog-list{
-		width: 680px;
+		max-width: 700px;
 		padding-top: 30px;
+		padding-right: 30px;
 		
 		ul {
 			list-style-type: none;
@@ -88,8 +89,8 @@
 	}
 	
 	.social-container{
-		width: 330px;
-		padding-top: 124px;
+		max-width: 360px;
+		padding-top: 140px;
 		
 		.container{
 			background-color: #f2f2f2;
@@ -156,7 +157,7 @@
 						}
 						.content{
 							color: black;
-							padding-top: 2px;
+							padding-top: 4px;
 							padding-left: 1px;
 						}													
 					}
@@ -177,4 +178,49 @@
 	
 	}
 	
-}
\ No newline at end of file
+	
+	//blog post page
+	.post{
+		padding:0 40px;
+		
+		header{
+
+			.title{
+				color: #3992ab;
+				font-size: 30pt;
+			}
+			.author, .date{
+				font-size: 14pt;
+				color: #999;
+				padding: 0 2px;			
+			}
+			.date{
+				float:right;
+				position: relative;
+				top:-20pt;		
+			}						
+		}		
+		section{
+			padding: 40px 0;
+			color: black;
+		}
+	}
+	
+	
+}
+           
+//         <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>
+// </div>
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/3] docs commit: Merges blog post page changes to latest

Posted by db...@apache.org.
Merges blog post page changes to 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/67cba9f9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/67cba9f9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/67cba9f9

Branch: refs/heads/cordova-website
Commit: 67cba9f92166eb6c379745b6c552947731da9215
Parents: ac4381f 219d7b1
Author: RubenRios <ru...@microsoft.com>
Authored: Thu Aug 6 12:44:29 2015 -0700
Committer: RubenRios <ru...@microsoft.com>
Committed: Thu Aug 6 12:44:29 2015 -0700

----------------------------------------------------------------------
 .gitignore                        |  1 +
 _config.yml                       | 41 +-------------------
 _dev.yml                          | 38 ++++++++++++++++++
 _prod.yml                         |  4 ++
 gulpfile.js                       | 40 +++++++++++++------
 tools/bin/gen_languages.py        | 24 ++++++++++--
 tools/bin/toc.py                  | 14 +++++--
 www/_data/toc/en-5-0-0-manual.yml |  5 +++
 www/_data/toc/en-edge-manual.yml  |  5 +++
 www/_includes/header.html         | 56 +++++++++++++++------------
 www/_layouts/blog.html            |  6 +++
 www/_layouts/docs.html            | 40 +++++++++++--------
 www/_layouts/post.html            |  8 +---
 www/blog/index.html               | 64 +++++++++++++++----------------
 www/static/css-src/docs.scss      | 70 ++++++++++++++++++++++++++++++++--
 www/static/js/docs.js             |  2 +-
 16 files changed, 278 insertions(+), 140 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/67cba9f9/www/_layouts/post.html
----------------------------------------------------------------------
diff --cc www/_layouts/post.html
index 65253f2,e516056..7e739d2
--- a/www/_layouts/post.html
+++ b/www/_layouts/post.html
@@@ -1,31 -1,11 +1,27 @@@
  ---
- layout: cordova
+ layout: blog
  ---
- 
 -<div class="site container">
 -    <h2>{{ page.title }}</h2>
 -    <div class="meta">Posted by: <a href="{{ page.author.url }}">{{ page.author.name }}</a></div>
 -    <p class="meta">{{ page.date | date_to_string }}</p>
 -    <div class="post">
 -    {{ content }}
 -    </div>
 -</div>
 +<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 }}">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>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/67cba9f9/www/blog/index.html
----------------------------------------------------------------------
diff --cc www/blog/index.html
index bce3ab8,ccab47e..7935aca
--- a/www/blog/index.html
+++ b/www/blog/index.html
@@@ -4,38 -4,37 +4,38 @@@ title: Apache Cordova Blo
  ---
  
  <div class="blog">
 -  <div id="content" class="container fill">
 -    <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 }}">Subscribe</a>
 +  <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 }}">Subscribe</a>
++        <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 }}">Subscribe</a>
++            </div>
++          </div>
++          <ul class="posts">
++              {% for post in site.posts %}
++              <li>
++                <header>
++                  <div class="adorner"></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"><a href="{{ post.author.url }}">{{ post.author.name }}</a></span></div>
++                  </div>
++                </header>
++                <section class="post-excerpt">
++                  <p>{{ post.content | strip_html | truncatewords:80 }}</p>
++                  <div><a href="{{ site.baseurl }}{{ post.url }}">More...</a></div>
++                </section>
++              </li>
++              {% endfor %}
++          </ul>
++          <a 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>
--      <ul class="posts">
--          {% for post in site.posts %}
--          <li>
--            <header>
--              <div class="adorner"></div>
-               <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"><a href="{{ post.author.url }}">{{ post.author.name }}</a></span></div>
--              </div>
--            </header>
--            <section class="post-excerpt">
--              <p>{{ post.content | strip_html | truncatewords:80 }}</p>
--              <div><a href="{{ site.baseurl }}{{ post.url }}">More...</a></div>
--            </section>
--          </li>
--          {% endfor %}
--      </ul>
--      <a 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 class="col-sm-4 social-container">
 -        {% include twitterFeed.html %}
 -    </div>
++     </div> 
    </div>
- </div>
+ </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[3/3] docs commit: Merging with post HTML.

Posted by db...@apache.org.
Merging with post HTML.


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

Branch: refs/heads/cordova-website
Commit: cf464189f35ce110e34c5f3e97aedba12b805e63
Parents: 67cba9f
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Thu Aug 6 17:43:27 2015 -0700
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Thu Aug 6 17:43:27 2015 -0700

----------------------------------------------------------------------
 www/_layouts/docs-en.html |  2 +-
 www/_layouts/docs-ru.html |  2 +-
 www/_layouts/post.html    | 48 ++++++++++++++++++++++--------------------
 3 files changed, 27 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cf464189/www/_layouts/docs-en.html
----------------------------------------------------------------------
diff --git a/www/_layouts/docs-en.html b/www/_layouts/docs-en.html
index 3387436..c2edb92 100644
--- a/www/_layouts/docs-en.html
+++ b/www/_layouts/docs-en.html
@@ -1,6 +1,6 @@
 ---
 layout: docs
-not_latest_warning_text: This is not the latest version of the documentation!
+not_latest_warning_text: This is not the latest version of the documentation.
 toc_text: Table of Contents
 ---
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cf464189/www/_layouts/docs-ru.html
----------------------------------------------------------------------
diff --git a/www/_layouts/docs-ru.html b/www/_layouts/docs-ru.html
index 7e26906..a05516c 100644
--- a/www/_layouts/docs-ru.html
+++ b/www/_layouts/docs-ru.html
@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Документация API Apache Cordova
-not_latest_warning_text: Это не самая последняя версия документации!
+not_latest_warning_text: Это не самая последняя версия документации.
 toc_text: Содержание
 ---
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/cf464189/www/_layouts/post.html
----------------------------------------------------------------------
diff --git a/www/_layouts/post.html b/www/_layouts/post.html
index 7e739d2..e77b105 100644
--- a/www/_layouts/post.html
+++ b/www/_layouts/post.html
@@ -1,27 +1,29 @@
 ---
 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 }}">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>
\ No newline at end of file
+    <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>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org