From de05be2a8b2bd931f6655059785abd8af7393086 Mon Sep 17 00:00:00 2001 From: davegandy Date: Sun, 6 Oct 2013 11:59:04 -0400 Subject: [PATCH] responsive screen-lg updated --- src/_includes/examples/new.html | 6 +- src/_includes/jumbotron.html | 2 +- src/_includes/license.html | 4 +- src/_includes/navbar.html | 79 ++++++++++--------- src/_includes/why.html | 4 +- src/assets/less/site-3.0.0.less | 13 +-- .../less/site/{ => bootstrap}/code.less | 0 .../less/site/{ => bootstrap}/jumbotron.less | 0 .../less/site/{ => bootstrap}/navbar.less | 2 +- .../less/site/{ => bootstrap}/variables.less | 0 .../less/site/{ => bootstrap}/wells.less | 0 .../less/site/responsive/screen-lg.less | 52 ++++++++++++ src/examples.html | 2 +- 13 files changed, 111 insertions(+), 53 deletions(-) rename src/assets/less/site/{ => bootstrap}/code.less (100%) rename src/assets/less/site/{ => bootstrap}/jumbotron.less (100%) rename src/assets/less/site/{ => bootstrap}/navbar.less (89%) rename src/assets/less/site/{ => bootstrap}/variables.less (100%) rename src/assets/less/site/{ => bootstrap}/wells.less (100%) create mode 100644 src/assets/less/site/responsive/screen-lg.less diff --git a/src/_includes/examples/new.html b/src/_includes/examples/new.html index eb5242b0e..cd37dfb83 100644 --- a/src/_includes/examples/new.html +++ b/src/_includes/examples/new.html @@ -1,7 +1,7 @@ <{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles">

New Styles in {{ site.fontawesome.minor_version }}

-
+

Rotated and Flipped Icons

  normal
@@ -12,7 +12,7 @@   fa-flip-vertical
-
+

Stacked Icons

@@ -39,7 +39,7 @@
-
+

Better Bulleted Lists

diff --git a/src/_includes/why.html b/src/_includes/why.html index 2cc68bf82..95ec58488 100644 --- a/src/_includes/why.html +++ b/src/_includes/why.html @@ -1,4 +1,4 @@ -
+

One Font, {{ icons | size }} Icons

@@ -38,4 +38,4 @@ Font Awesome won't trip up screen readers, unlike other icon fonts.
-
+ diff --git a/src/assets/less/site-3.0.0.less b/src/assets/less/site-3.0.0.less index 7839d3a32..f8eb0a5c6 100644 --- a/src/assets/less/site-3.0.0.less +++ b/src/assets/less/site-3.0.0.less @@ -2,11 +2,12 @@ --- @import "bootstrap-{{ site.bootstrap.version }}/bootstrap"; -@import "site/variables"; -@import "site/navbar"; -@import "site/jumbotron"; -@import "site/code"; -@import "site/wells"; +@import "site/bootstrap/variables"; +@import "site/bootstrap/navbar"; +@import "site/bootstrap/jumbotron"; +@import "site/bootstrap/code"; +@import "site/bootstrap/wells"; + @import "site/layout"; @import "site/social-buttons"; @import "site/jumbotron-carousel"; @@ -17,3 +18,5 @@ @import "site/footer"; @import "site/lazy"; @import "site/carbonad"; + +@import "site/responsive/screen-lg"; diff --git a/src/assets/less/site/code.less b/src/assets/less/site/bootstrap/code.less similarity index 100% rename from src/assets/less/site/code.less rename to src/assets/less/site/bootstrap/code.less diff --git a/src/assets/less/site/jumbotron.less b/src/assets/less/site/bootstrap/jumbotron.less similarity index 100% rename from src/assets/less/site/jumbotron.less rename to src/assets/less/site/bootstrap/jumbotron.less diff --git a/src/assets/less/site/navbar.less b/src/assets/less/site/bootstrap/navbar.less similarity index 89% rename from src/assets/less/site/navbar.less rename to src/assets/less/site/bootstrap/navbar.less index 58c6b9fcd..fe01b8698 100644 --- a/src/assets/less/site/navbar.less +++ b/src/assets/less/site/bootstrap/navbar.less @@ -9,7 +9,7 @@ .fa-flag { padding-right: 3px; } } -//.navbar .nav > li > a { padding: 12px 10px 9px; } +.navbar-nav > li > a { padding: 12px 10px 9px; } //.navbar-nav > li > a { // padding-top: 16px; diff --git a/src/assets/less/site/variables.less b/src/assets/less/site/bootstrap/variables.less similarity index 100% rename from src/assets/less/site/variables.less rename to src/assets/less/site/bootstrap/variables.less diff --git a/src/assets/less/site/wells.less b/src/assets/less/site/bootstrap/wells.less similarity index 100% rename from src/assets/less/site/wells.less rename to src/assets/less/site/bootstrap/wells.less diff --git a/src/assets/less/site/responsive/screen-lg.less b/src/assets/less/site/responsive/screen-lg.less new file mode 100644 index 000000000..37b5ead98 --- /dev/null +++ b/src/assets/less/site/responsive/screen-lg.less @@ -0,0 +1,52 @@ +@media (min-width: @screen-lg) { + #icon-carousel { + @size: 290px; + font-size: @size; + line-height: @size + 5; + .carousel-control { + top: @size + 20px; + .square(30px); + font-size: 40px; + line-height: 35px; + left: 370/2 - 40px; + &.right { + right: 370/2 - 40px; + } + } + } + + .jumbotron-ad { + padding: 65px 0 50px; + h1 { + margin-top: 25px; + font-size: 90px; + } + p { + font-size: 35px; + margin: 35px 0 20px; + } + } + + .jumbotron-carousel { + padding: 50px 0; + h1 { font-size: 100px; } + p { + font-size: 40px; + margin: 20px 0; + } + .btn-large { + font-size: 30px; + padding: 21px 35px; + } + .shameless-self-promotion { + margin-top: 30px; + } + } + + .stripe-ad .lead { margin-top: 7px; } + + .lead { + font-size: 26px; + line-height: 36px; + } +} \ No newline at end of file diff --git a/src/examples.html b/src/examples.html index ae854d8fa..1aca2b7b0 100644 --- a/src/examples.html +++ b/src/examples.html @@ -4,7 +4,7 @@ title: Font Awesome Examples navbar_active: examples relative_path: ../ --- -{% capture jumbotron_h1 %}  Examples{% endcapture %} +{% capture jumbotron_h1 %}  Examples{% endcapture %} {% capture jumbotron_p %}Lots of easy ways to use Font Awesome{% endcapture %} {% include jumbotron.html %}