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/16 03:31:38 UTC
[1/2] docs commit: Making tools and apps cards have fixed heights.
Repository: cordova-docs
Updated Branches:
refs/heads/cordova-website dce13e5ba -> 65031b7f0
Making tools and apps cards have fixed heights.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/a92aee79
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/a92aee79
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/a92aee79
Branch: refs/heads/cordova-website
Commit: a92aee7920237c7c3147d8144af4d2c7c8ab463c
Parents: dce13e5
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Fri Sep 11 14:30:53 2015 -0700
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Tue Sep 15 18:20:47 2015 -0700
----------------------------------------------------------------------
www/_includes/tools_and_showcase.html | 14 +++++++-------
www/static/css-src/_home.scss | 31 +++++++++++++++++++++++++++++-
2 files changed, 37 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/a92aee79/www/_includes/tools_and_showcase.html
----------------------------------------------------------------------
diff --git a/www/_includes/tools_and_showcase.html b/www/_includes/tools_and_showcase.html
index 968895e..3d7c8f0 100644
--- a/www/_includes/tools_and_showcase.html
+++ b/www/_includes/tools_and_showcase.html
@@ -5,10 +5,10 @@
<h2>Work with Cordova even more efficiently</h2>
</div>
</div>
- <div class="row cordova_tools_gallery">
+ <div class="row card_gallery">
{% for tool in site.data.tools %}
<div class="col-lg-2 col-sm-4 card">
- <div class="card_inner">
+ <div class="tool card_inner">
<img src="{{ site.baseurl }}/static/img/tools/{{ tool.image }}" class="center-block"/>
<p class="card_title">
{% if tool.url %}
@@ -19,8 +19,8 @@
{{ tool.name }}
{% endif %}
</p>
- <p>
- {{ tool.description | truncatewords:50 }}
+ <p class="text">
+ {{ tool.description | strip_html | truncate:255 }}
</p>
</div>
</div>
@@ -42,13 +42,13 @@
<h2>See other apps that use Cordova</h2>
</div>
</div>
- <div class="row cordova_tools_gallery">
+ <div class="row card_gallery">
{% for app in site.data.showcase-apps %}
<div class="col-lg-2 col-sm-4 card">
<div class="showcase_app_thumb">
<img src="{{ site.baseurl }}/static/img/showcase-apps/{{ app.image }}" class="center-block"/>
</div>
- <div class="card_inner">
+ <div class="app card_inner">
<p class="card_title">
{% if app.url %}
<a href="{{ app.url }}">
@@ -58,7 +58,7 @@
{{ app.name }}
{% endif %}
</p>
- <p>{{ app.description | truncatewords:20 }}</p>
+ <p class="text">{{ app.description | strip_html | truncate:200 }}</p>
</div>
</div>
{% endfor %}
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/a92aee79/www/static/css-src/_home.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_home.scss b/www/static/css-src/_home.scss
index d03027a..8f2b656 100644
--- a/www/static/css-src/_home.scss
+++ b/www/static/css-src/_home.scss
@@ -234,7 +234,7 @@ img#logo_top {
padding-top: 20px;
padding-bottom: 20px;
}
-.cordova_tools_gallery {
+.card_gallery {
color:white;
.card {
padding:8px;
@@ -249,6 +249,16 @@ img#logo_top {
height:50px;
padding-bottom:10px;
}
+ &.tool {
+ .text {
+ height: 250px;
+ }
+ }
+ &.app {
+ .text {
+ height: 100px;
+ }
+ }
}
.showcase_app_thumb {
background-color: #AD6E6E;
@@ -260,6 +270,25 @@ img#logo_top {
}
}
}
+/* make cards smaller on smaller screens */
+@media (max-width: 767px) {
+ .card_gallery {
+ .card {
+ .card_inner {
+ &.tool {
+ .text {
+ height: 100px;
+ }
+ }
+ &.app {
+ .text {
+ height: 50px;
+ }
+ }
+ }
+ }
+ }
+}
.add_seemore_links {
margin: 15px 0;
a { padding-left:30px; }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] docs commit: Fixing up column heights some more.
Posted by db...@apache.org.
Fixing up column heights some more.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/65031b7f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/65031b7f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/65031b7f
Branch: refs/heads/cordova-website
Commit: 65031b7f0fb81bd377610078e6ed7ce95cf313f2
Parents: a92aee7
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Tue Sep 15 18:24:16 2015 -0700
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Tue Sep 15 18:24:16 2015 -0700
----------------------------------------------------------------------
www/_includes/tools_and_showcase.html | 4 +--
www/static/css-src/_home.scss | 45 ++++++++++++++----------------
www/static/css-src/main.scss | 5 ++--
3 files changed, 26 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/65031b7f/www/_includes/tools_and_showcase.html
----------------------------------------------------------------------
diff --git a/www/_includes/tools_and_showcase.html b/www/_includes/tools_and_showcase.html
index 3d7c8f0..bc74f46 100644
--- a/www/_includes/tools_and_showcase.html
+++ b/www/_includes/tools_and_showcase.html
@@ -7,7 +7,7 @@
</div>
<div class="row card_gallery">
{% for tool in site.data.tools %}
- <div class="col-lg-2 col-sm-4 card">
+ <div class="col-lg-2 col-md-4 col-sm-6 col-xs-12 card">
<div class="tool card_inner">
<img src="{{ site.baseurl }}/static/img/tools/{{ tool.image }}" class="center-block"/>
<p class="card_title">
@@ -44,7 +44,7 @@
</div>
<div class="row card_gallery">
{% for app in site.data.showcase-apps %}
- <div class="col-lg-2 col-sm-4 card">
+ <div class="col-lg-2 col-md-4 col-sm-6 col-xs-12 card">
<div class="showcase_app_thumb">
<img src="{{ site.baseurl }}/static/img/showcase-apps/{{ app.image }}" class="center-block"/>
</div>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/65031b7f/www/static/css-src/_home.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_home.scss b/www/static/css-src/_home.scss
index 8f2b656..6de6a6f 100644
--- a/www/static/css-src/_home.scss
+++ b/www/static/css-src/_home.scss
@@ -249,19 +249,14 @@ img#logo_top {
height:50px;
padding-bottom:10px;
}
- &.tool {
- .text {
- height: 250px;
- }
+ &.tool .text {
+ height: 250px;
}
- &.app {
- .text {
- height: 100px;
- }
+ &.app .text {
+ height: 100px;
}
}
.showcase_app_thumb {
- background-color: #AD6E6E;
width: 100%;
height: 100px;
img {
@@ -271,21 +266,23 @@ img#logo_top {
}
}
/* make cards smaller on smaller screens */
-@media (max-width: 767px) {
- .card_gallery {
- .card {
- .card_inner {
- &.tool {
- .text {
- height: 100px;
- }
- }
- &.app {
- .text {
- height: 50px;
- }
- }
- }
+@media (max-width: $screen-lg-min) {
+ .card_gallery .card .card_inner {
+ &.tool .text {
+ height: 120px;
+ }
+ &.app .text {
+ height: 70px;
+ }
+ }
+}
+@media (max-width: $screen-md-min) {
+ .card_gallery .card .card_inner {
+ &.tool .text {
+ height: 100px;
+ }
+ &.app .text {
+ height: 50px;
}
}
}
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/65031b7f/www/static/css-src/main.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/main.scss b/www/static/css-src/main.scss
index 70b691d..34dbf3f 100644
--- a/www/static/css-src/main.scss
+++ b/www/static/css-src/main.scss
@@ -39,8 +39,9 @@ $screen-sm-min: 768px;
$screen-xs-max: $screen-sm-min - 1;
$screen-md-min: 992px;
$screen-sm-max: $screen-md-min - 1;
-$screen-lg: (min-width: 1200px);
-$scree-md-max: $screen-lg - 1;
+$screen-lg-min: 1200px;
+$screen-lg: (min-width: $screen-lg-min);
+$screen-md-max: $screen-lg - 1;
/* Mixin that prefixes any CSS rule */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org