cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblot...@apache.org
Subject docs commit: Fixing hero section. Fixing image bleeding in docs text. Fixing columns in Getting Started section.
Date Fri, 18 Sep 2015 01:07:59 GMT
Repository: cordova-docs
Updated Branches:
  refs/heads/cordova-website 073d557fa -> 90eada195


Fixing hero section. Fixing image bleeding in docs text. Fixing columns in Getting Started
section.


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

Branch: refs/heads/cordova-website
Commit: 90eada195d0119467fb3a8f2d4350a0ba6d21938
Parents: 073d557
Author: Dmitry Blotsky <dmitry.blotsky@gmail.com>
Authored: Thu Sep 17 18:07:55 2015 -0700
Committer: Dmitry Blotsky <dmitry.blotsky@gmail.com>
Committed: Thu Sep 17 18:07:55 2015 -0700

----------------------------------------------------------------------
 www/_includes/footer.html     |  3 +-
 www/_layouts/docs.html        | 35 +++++++++++-------
 www/index.html                | 74 +++++++++++++++++++-------------------
 www/static/css-src/_docs.scss |  7 ++++
 www/static/css-src/_home.scss | 47 ++++++++++++++----------
 www/static/css-src/main.scss  |  6 ++++
 www/static/js/main.js         | 16 ---------
 7 files changed, 101 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/_includes/footer.html
----------------------------------------------------------------------
diff --git a/www/_includes/footer.html b/www/_includes/footer.html
index 7347097..06ecd28 100644
--- a/www/_includes/footer.html
+++ b/www/_includes/footer.html
@@ -59,13 +59,12 @@
             </div>
         </div>
         <p class="copyright_text">
-            Copyright © 2012, 2013, 2015 The Apache Software Foundation, Licensed under
the <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
Version 2.0</a>.<br/>
+            Copyright &copy; 2012, 2013, 2015 The Apache Software Foundation, Licensed
under the <a target="_blank" href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License, Version 2.0</a>.<br/>
             Apache and the Apache feather logos are <a target="_blank" href="http://www.apache.org/foundation/marks/list/">trademarks</a>
of The Apache Software Foundation.
         </p>
         <a class="closing" href="#top"></a>
     </div>
 </footer>
 
-<script defer type="text/javascript" src="{{ site.baseurl }}/static/js/main.js"></script>
 <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/index.js"></script>
 <script defer type="text/javascript" src="{{ site.baseurl }}/static/js/twitter.js"></script>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/_layouts/docs.html
----------------------------------------------------------------------
diff --git a/www/_layouts/docs.html b/www/_layouts/docs.html
index f39e884..4e3bd4c 100644
--- a/www/_layouts/docs.html
+++ b/www/_layouts/docs.html
@@ -34,7 +34,7 @@ analytics_id: UA-64283057-1
     </div>
 
     <!-- Page content -->
-    <div id="page-toc-source" class="col-md-8 col-md-offset-1">
+    <div class="col-md-8 col-md-offset-1">
 
         <!-- ToC Dropdown (for XS and SM sizes only) -->
         <div class="toc-dropdown content-header visible-xs-block visible-sm-block">
@@ -91,23 +91,31 @@ analytics_id: UA-64283057-1
                             The page will exist because it's for the same version.
                              -->
                             <a href="{{ site.baseurl }}{{ page.url | replace:current_language_path,target_language_path
}}">
+                                {% if page.language == language_id %}
+                                    <span class="selected">
+                                        {{ language.name }}
+                                    </span>
+                                {% else %}
+                                    {{ language.name }}
+                                {% endif %}
+                            </a>
+                        </li>
                     {% else %}
 
                         <!-- Disable languages that don't have this version -->
                         <li class="disabled">
                             <a class="missing-version">
+                                {% if page.language == language_id %}
+                                    <span class="selected">
+                                        {{ language.name }}
+                                    </span>
+                                {% else %}
+                                    {{ language.name }}
+                                {% endif %}
+                            </a>
+                        </li>
                     {% endif %}
 
-                    {% if page.language == language_id %}
-                        <span class="selected">
-                            {{ language.name }}
-                        </span>
-                    {% else %}
-                        {{ language.name }}
-                    {% endif %}
-
-                        </a>
-                    </li>
                     {% endfor %}
                 </ul>
             </div>
@@ -162,8 +170,9 @@ analytics_id: UA-64283057-1
         -->
         {% endif %}
 
-        {{ content }}
-
+        <div id="page-toc-source">
+            {{ content }}
+        </div>
     </div>
 </div>
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/index.html
----------------------------------------------------------------------
diff --git a/www/index.html b/www/index.html
index 3975779..51de57e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -10,11 +10,11 @@ permalink: /
 <!-- Main jumbotron for a primary marketing message or call to action -->
 <div id="hero">
     <div class="container vertical-center-parent">
-        <div id="hero_section" class="vertical-center-child">
-            <div id="hero_section_left" class="hidden-xs">
-                <img src="{{ site.baseurl }}/static/img/cordova_bot.png" style="width:100%"
/>
+        <div id="hero_section" class="row vertical-center-child">
+            <div class="col-xs-12 col-sm-5 cordova-bot">
+                <img src="{{ site.baseurl }}/static/img/cordova_bot.png" />
             </div>
-            <div id="hero_section_right">
+            <div class="col-xs-12 col-sm-7 hero_content">
                 <img class="hero_logo hidden-xs" src="{{ site.baseurl }}/static/img/logo_text.svg"
/>
                 <!-- <img class="hero_logo visible-xs" src="{{ site.baseurl }}/static/img/logo_full_2.svg"
/> -->
                 <p>Native mobile apps with HTML, CSS & JavaScript</p>
@@ -34,26 +34,26 @@ permalink: /
             </div>
         </div>
     </div>
-    <div id="hero_bottom_strip">
-        <div class="container">
-            <div class="row">
-                <div class="col-xs-4">
-                    <div class="row">
-                        <div class="col-sm-4 col-md-3"><div class="sprite_img" id="sprite_shared_code"></div></div>
-                        <div class="col-sm-8 col-md-9"><div class="value_prop"><p>Reusable
code across platforms</p></div></div>
-                    </div>
+</div>
+<div id="hero_bottom_strip">
+    <div class="container">
+        <div class="row">
+            <div class="col-xs-4">
+                <div class="row">
+                    <div class="col-sm-4 col-md-3"><div class="sprite_img" id="sprite_shared_code"></div></div>
+                    <div class="col-sm-8 col-md-9"><div class="value_prop"><p>Reusable
code across platforms</p></div></div>
                 </div>
-                <div class="col-xs-4">
-                    <div class="row">
-                        <div class="col-sm-4 col-md-3"><div class="sprite_img" id="sprite_offline"></div></div>
-                        <div class="col-sm-8 col-md-9"><div class="value_prop"><p>Support
for offline scenarios</p></div></div>
-                    </div>
+            </div>
+            <div class="col-xs-4">
+                <div class="row">
+                    <div class="col-sm-4 col-md-3"><div class="sprite_img" id="sprite_offline"></div></div>
+                    <div class="col-sm-8 col-md-9"><div class="value_prop"><p>Support
for offline scenarios</p></div></div>
                 </div>
-                <div class="col-xs-4">
-                    <div class="row">
-                        <div class="col-sm-4 col-md-3"><div class="sprite_img" id="sprite_apis"></div></div>
-                        <div class="col-sm-8 col-md-9"><div class="value_prop"><p>Access
native Device APIs</p></div></div>
-                    </div>
+            </div>
+            <div class="col-xs-4">
+                <div class="row">
+                    <div class="col-sm-4 col-md-3"><div class="sprite_img" id="sprite_apis"></div></div>
+                    <div class="col-sm-8 col-md-9"><div class="value_prop"><p>Access
native Device APIs</p></div></div>
                 </div>
             </div>
         </div>
@@ -70,14 +70,14 @@ permalink: /
     </div>
     <!-- GETTING STARTED -->
     <div class="row">
-        <div class="col-md-1">
+        <div class="col-md-1 col-xs-2">
             <div class="number_circle">1</div>
         </div>
-        <div class="col-md-7">
+        <div class="col-md-7 col-xs-10">
             <h2>Installing Cordova</h2>
             <p>Cordova command-line runs on <a target="_blank" href="http://nodejs.org/">Node.js</a>
and is available on <a target="_blank" href="https://npmjs.org/package/cordova">NPM</a>.
Follow <a href="{{ site.baseurl }}/docs/en/edge/guide/platforms/">platform specific
guides</a> to install additional platform dependencies. Open a command prompt or Terminal,
and type <code>npm install -g cordova</code>.</p>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 col-xs-12">
             <div class="well_code">
                 <div>
                     <button type="button" class="btn btn btn-primary pull-right btn-copy"
data-clipboard-target="copy-npm-install-text">Copy</button>
@@ -88,15 +88,15 @@ permalink: /
         </div>
     </div>
     <div class="row">
-        <div class="col-md-1">
+        <div class="col-md-1 col-xs-2">
             <div class="number_circle">2</div>
         </div>
-        <div class="col-md-7">
+        <div class="col-md-7 col-xs-10">
             <h2>Create a project</h2>
             <p>Create a blank Cordova project using the command-line tool.  Navigate
to the directory where you wish to create your project and type <code>cordova create
&lt;path&gt;</code>.</p>
             <p>For a complete set of options, type <code>cordova help create</code>.</p>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 col-xs-12">
             <div class="well_code">
                 <div>
                     <button type="button" class="btn btn btn-primary pull-right btn-copy"
data-clipboard-target="copy-cordova-create-text">Copy</button>
@@ -107,16 +107,16 @@ permalink: /
         </div>
     </div>
     <div class="row">
-        <div class="col-md-1">
+        <div class="col-md-1 col-xs-2">
             <div class="number_circle">3</div>
         </div>
-        <div class="col-md-7">
+        <div class="col-md-7 col-xs-10">
             <h2>Add a platform</h2>
             <p>After creating a Cordova project, navigate to the project directory.
 From the project directory, you need to add a platform for which you want to build your app.</p>
             <p>To add a platform, type <code>cordova platform add &lt;platform
name&gt;</code>.</p>
             <p>For a complete list of platforms you can add, run <code>cordova
platform</code>.</p>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 col-xs-12">
             <div class="well_code">
                 <div>
                     <button type="button" class="btn btn btn-primary pull-right btn-copy"
data-clipboard-target="copy-cordova-platform-add-text">Copy</button>
@@ -128,14 +128,14 @@ permalink: /
         </div>
     </div>
     <div class="row">
-        <div class="col-md-1">
+        <div class="col-md-1 col-xs-2">
             <div class="number_circle">4</div>
         </div>
-        <div class="col-md-7">
+        <div class="col-md-7 col-xs-10">
             <h2>Run your app</h2>
             <p>From the command line, run <code>cordova run &lt;platform
name&gt;</code>.</p>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 col-xs-12">
             <div class="well_code">
                 <div>
                     <button type="button" class="btn btn btn-primary pull-right btn-copy"
data-clipboard-target="copy-cordova-run-text">Copy</button>
@@ -146,10 +146,10 @@ permalink: /
         </div>
     </div>
     <div class="row">
-        <div class="col-md-1">
+        <div class="col-md-1 col-xs-2">
             <div class="number_circle">5</div>
         </div>
-        <div class="col-md-7">
+        <div class="col-md-7 col-xs-10">
             <h2>Common next steps</h2>
             <ul class="nav">
                 <li>
@@ -166,7 +166,7 @@ permalink: /
                 </li>
             </ul>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 col-xs-12">
         </div>
     </div>
 </div>

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/static/css-src/_docs.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_docs.scss b/www/static/css-src/_docs.scss
index 3d00edf..49a7255 100644
--- a/www/static/css-src/_docs.scss
+++ b/www/static/css-src/_docs.scss
@@ -1,6 +1,13 @@
 .docs {
     margin-bottom: 20px;
 
+    /* this is so that wide images don't stick out of their paragraphs */
+    p {
+        img {
+            width: 100%;
+        }
+    }
+
     .site-toc-title {
         font-weight: 300;
         font-size: 22px;

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/static/css-src/_home.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_home.scss b/www/static/css-src/_home.scss
index fe25248..953308e 100644
--- a/www/static/css-src/_home.scss
+++ b/www/static/css-src/_home.scss
@@ -10,7 +10,8 @@ html {
 }
 
 #hero {
-	height:1020px;
+	min-height: 500px;
+    height: 70%;
 	background-color: $gray-transparent;
     background-image: url("{{ site.baseurl }}/static/img/wisplight.jpg");
     background-size: cover;
@@ -20,17 +21,17 @@ html {
 		width:80%;
 		max-width:730px;
 		font-size:18px;
-		margin-top:-100px;  /* vertically centers more accuaretly since bottom bar is absolutely
positioned*/
 		> div {
 			display: inline-block;
 		}
-		#hero_section_left {
-			width:39%;
-			vertical-align: top;
+		.cordova-bot {
+            text-align: center;
+            img {
+                width: 100%;
+            }
 		}
 
-		#hero_section_right {
-			width:59%;
+		.hero_content {
 			div {
 				padding-bottom:20px;
 			}
@@ -52,25 +53,32 @@ html {
 }
 
 @media (min-width: $screen-sm-min) {
-    #hero #hero_section .btn + .btn {
-        margin-left: 3px;
+    #hero {
+        #hero_section .btn + .btn {
+            margin-left: 3px;
+        }
     }
 }
 @media (max-width: $screen-xs-max) {
-    #hero #hero_section_right p {
-        margin-bottom: 20px;
+    #hero {
+        height: 100%;
+        .hero_content p {
+            margin-bottom: 20px;
+        }
+        #hero_section .cordova-bot {
+            img {
+                width: 60%;
+            }
+        }
     }
 }
 
 #hero_bottom_strip {
-    position: absolute;
-    top: 100%;
     min-height: 200px;
-    background-color: rgba(128,128,128,.15);
+    background-color: rgb(42,42,42);
+    color: white;
     width: 100%;
     margin: 0;
-    /* margin-top: -200px; */ /* Less responsive */
-	@include vendor-prefix(transform, translateY(-100%));
 
 	.container {
 		padding-top:55px;
@@ -92,15 +100,16 @@ html {
 .value_prop {
 	max-width: 146px;
 	height: 4em;
-	div, p {
+	p {
 		top:50%;
 		position: relative;
 		transform: translateY(-50%);
+        padding-left: 10px;
 	}
 }
 
 @media (max-width: 767px) {
-	#hero #hero_section #hero_section_right { width:100%; }
+	#hero #hero_section .hero_content { width:100%; }
 	#hero_bottom_strip {
 		min-height: initial;
 		.container {
@@ -188,7 +197,7 @@ img#logo_top {
 	padding-bottom:19px + 50px;
 	position:relative;
 	background-color: $gray-10;
-	margin-top:46px;
+	margin-top:25px;
 	div {
 		@extend .well_code;
 		position: absolute;

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/static/css-src/main.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/main.scss b/www/static/css-src/main.scss
index 34dbf3f..99920ed 100644
--- a/www/static/css-src/main.scss
+++ b/www/static/css-src/main.scss
@@ -125,6 +125,12 @@ h2 {
 	background-color: $brand-primary;
 }
 
+/*
+code {
+    color: rgb(133, 133, 133);
+}
+*/
+
 @import 'home';
 @import 'blog';
 @import 'plugins';

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/90eada19/www/static/js/main.js
----------------------------------------------------------------------
diff --git a/www/static/js/main.js b/www/static/js/main.js
deleted file mode 100644
index a52d467..0000000
--- a/www/static/js/main.js
+++ /dev/null
@@ -1,16 +0,0 @@
-$(document).ready(function () {
-
-	function setHeroHeight() {
-
-		// resize the hero to the innerWidth of the window
-		var window_height = window.innerHeight;
-		var navbar_spacer = $('#_fixed_navbar_spacer').height();
-		var adjusted_window_height = window_height - navbar_spacer;
-		if (adjusted_window_height > 549) { // do not resize on small devices
-			$('#hero').height(adjusted_window_height);
-		}
-	}
-
-	setHeroHeight();
-	$(window).resize(function() { setHeroHeight() });
- });


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


Mime
View raw message