cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblot...@apache.org
Subject [05/20] docs commit: Merged with Ruben. Work on showcase
Date Thu, 06 Aug 2015 01:06:17 GMT
Merged with Ruben.  Work on showcase


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

Branch: refs/heads/cordova-website
Commit: 1e722e02fc1afa1ba116f0c8ce1afe1f620a346a
Parents: d2eac02 401eef1
Author: Brad Gashler <bgashler1@users.noreply.github.com>
Authored: Wed Aug 5 17:41:54 2015 -0700
Committer: Brad Gashler <bgashler1@users.noreply.github.com>
Committed: Wed Aug 5 17:41:54 2015 -0700

----------------------------------------------------------------------
 README.md                                   |  59 +++++---
 _config.yml                                 |  27 ++--
 gulpfile.js                                 |   6 +-
 tools/bin/all_toc.py                        |  46 ++++++
 tools/bin/gen_defaults.py                   |   1 -
 tools/bin/gen_toc.py                        |  96 ------------
 tools/bin/toc.py                            | 108 ++++++++++++++
 tools/bin/util.py                           |  10 ++
 www/_data/.gitignore                        |   1 +
 www/_data/pl/edge/toc-manual.yml            |  66 +++++++++
 www/_data/toc/.gitignore                    |   1 -
 www/_includes/twitterFeed.html              |  35 +++++
 www/_layouts/docs.html                      |  11 +-
 www/blog/index.html                         |  47 ++++--
 www/docs/de/edge/index.md                   |  46 +++---
 www/docs/en/1.5.0/index.md                  |   2 +-
 www/static/css-src/blog.scss                | 180 +++++++++++++++++++++++
 www/static/css-src/main.scss                |  28 ++--
 www/static/img/follow_twitter_rectangle.png | Bin 0 -> 3961 bytes
 www/static/img/subscribe.png                | Bin 0 -> 3243 bytes
 www/static/img/twitter_profile.png          | Bin 0 -> 3430 bytes
 21 files changed, 585 insertions(+), 185 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/1e722e02/www/static/css-src/main.scss
----------------------------------------------------------------------
diff --cc www/static/css-src/main.scss
index b454a53,0c1fa01..6fa8f77
--- a/www/static/css-src/main.scss
+++ b/www/static/css-src/main.scss
@@@ -26,8 -27,7 +27,9 @@@ $badge-line-height: 1.25
  /* Other brand colors */
  $brand-gold: #F1B444;
  $brand-gold-darker: #B58733;
 +$gray-90: lighten($gray-base, 10%);
  $gray-50: lighten($gray-base, 50%);
++$gray-40: lighten($gray-base, 60%);
  $gray-20: lighten($gray-base, 80%);
  $gray-10: lighten($gray-base, 90%);
  $brand-primary: #4CC2E4;
@@@ -120,7 -119,7 +121,13 @@@ img#logo_top 
  		float:none;
  	}
    }
--  
++
++.badge {
++    padding: 1px 5px;
++    font-size: 12px;
++    margin-top: -13px;
++}
++
    
  
  
@@@ -182,22 -181,6 +189,23 @@@
  
  
  /*
 +********* Showcase Section ***********
 +*/
 +.dark {
 +	background-color: $gray-90;
 +}
 +.showcase_section_intro {
 +    margin: auto;
 +	float:none;
-     max-width: 600px;
++    max-width: 700px;
 +	h1 { color: $brand-gold; padding-bottom:0; }
- 	h2 { color: white; font-size: 18px; padding:0; margin-top:0 }
- 	p, span { color: white; text-align: left; }
++	h2 { color: white; font-size: 18px; font-weight:normal; padding:0; margin-top:0 }
++	p, span { color: $gray-40; text-align: left; }
 +	
 +}
++.
 +
 +/*
  ********* Modifications to Bootstrap ***********
  */
  button.btn {
@@@ -215,13 -198,17 +223,5 @@@ h1 
  }
  h2 {
  	color: $gray-50;
--	font-size: 24px;
 -}
 -<<<<<<< HEAD
 -.nav_bar_center > ul {
 -	display: inline-block;
 -	float:none;
--}
 -=======
--.badge {
--	font-size:12px;
--	margin-top:-14px;
--	padding: 1px 5px;
--}
- p {
- 	line-height:30px;
 ->>>>>>> 01674e4f8c5272d176270d2b3b73ac73c758c066
++	font-size: 18px;
 +}


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


Mime
View raw message