Skip to content

Commit

Permalink
Merge branch 'master' of github.com:zurb/foundation
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt committed Oct 24, 2011
2 parents 3d4fd6d + 048bc34 commit 096825c
Show file tree
Hide file tree
Showing 8 changed files with 216 additions and 230 deletions.
2 changes: 1 addition & 1 deletion README.markdown
View file
@@ -1,4 +1,4 @@
WELCOME TO FOUNDATION
Welcome to Foundation
=====================

Foundation is a rock-solid, responsive framework for rapidly prototyping and iterating into production code. It includes a 12-column, future-friendly grid and tons of great tools and elements that'll get you up and running in no time. Clone the repo to get the marketing site, docs, and base source. You can also visit http://foundation.zurb.com to download just the base source as a starting boilerplate.
Expand Down
2 changes: 2 additions & 0 deletions index.html
View file
Expand Up @@ -17,6 +17,8 @@
<!-- These files are being included - to omit files, move them to the block below. -->

<link rel="stylesheet" href="stylesheets/globals.css">
<link rel="stylesheet" href="stylesheets/typography.css">
<link rel="stylesheet" href="stylesheets/grid.css">
<link rel="stylesheet" href="stylesheets/ui.css">
<link rel="stylesheet" href="stylesheets/forms.css">
<link rel="stylesheet" href="stylesheets/orbit.css">
Expand Down
2 changes: 2 additions & 0 deletions marketing/docs/includes/_documentation_head.php
View file
Expand Up @@ -17,6 +17,8 @@

<!-- Included CSS Files -->
<link rel="stylesheet" href="../../stylesheets/globals.css">
<link rel="stylesheet" href="../../stylesheets/typography.css">
<link rel="stylesheet" href="../../stylesheets/grid.css">
<link rel="stylesheet" href="../../stylesheets/ui.css">
<link rel="stylesheet" href="../../stylesheets/forms.css">
<link rel="stylesheet" href="../../stylesheets/orbit.css">
Expand Down
97 changes: 42 additions & 55 deletions marketing/docs/presentation.css
View file
Expand Up @@ -165,67 +165,54 @@ footer.row a:hover {

/* Font-Face */
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-regular-webfont.woff') format('woff'), url('../fonts/proximanova-regular-webfont.ttf') format('truetype'), url('../fonts/proximanova-regular-webfont.svg') format('svg');
src: url('../fonts/proximanova-regular-webfont.eot');
font-weight: normal;
font-style: normal; }

@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-regularitalic-webfont.woff') format('woff'), url('../fonts/proximanova-regularitalic-webfont.ttf') format('truetype'), url('../fonts/proximanova-regularitalic-webfont.svg') format('svg');
src: url('../fonts/proximanova-regularitalic-webfont.eot');
font-weight: normal;
font-style: italic; }

font-family: 'Proxima';
src: url(../fonts/proximanova-regular-webfont.eot?1307578394);
src: url('../fonts/proximanova-regular-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-regular-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-regular-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-regular-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-light-webfont.woff') format('woff'), url('../fonts/proximanova-light-webfont.ttf') format('truetype'), url('../fonts/proximanova-light-webfont.svg') format('svg');
src: url('../fonts/proximanova-light-webfont.eot');
font-weight: 300;
font-style: normal; }

font-family: 'Proxima';
font-style: italic;
src: url(../fonts/proximanova-regitalic-webfont.eot?1307578394);
src: url('../fonts/proximanova-regitalic-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-regitalic-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-regitalic-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-regitalic-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-lightitalic-webfont.woff') format('woff'), url('../fonts/proximanova-lightitalic-webfont.ttf') format('truetype'), url('../fonts/proximanova-lightitalic-webfont.svg') format('svg');
src: url('../fonts/proximanova-lightitalic-webfont.eot');
font-weight: 300;
font-style: italic; }

font-family: 'Proxima';
font-weight: 300;
src: url(../fonts/proximanova-light-webfont.eot?1307578394);
src: url('../fonts/proximanova-light-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-light-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-light-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-light-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-semibold-webfont.woff') format('woff'), url('../fonts/proximanova-semibold-webfont.ttf') format('truetype'), url('../fonts/proximanova-semibold-webfont.svg') format('svg');
src: url('../fonts/proximanova-semibold-webfont.eot');
font-weight: 600;
font-style: normal; }

font-family: 'Proxima';
font-weight: 600;
src: url(../fonts/proximanova-semibold-webfont.eot?1307578394);
src: url('../fonts/proximanova-semibold-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-semibold-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-semibold-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-semibold-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-semibolditalic-webfont.woff') format('woff'), url('../fonts/proximanova-semibolditalic-webfont.ttf') format('truetype'), url('../fonts/proximanova-semibolditalic-webfont.svg') format('svg');
src: url('../fonts/proximanova-semibolditalic-webfont.eot');
font-weight: 600;
font-style: italic; }

font-family: 'Proxima';
font-weight: 600;
font-style: italic;
src: url(../fonts/proximanova-semibolditalic-webfont.eot?1307578394);
src: url('../fonts/proximanova-semibolditalic-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-semibolditalic-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-semibolditalic-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-semibolditalic-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-bold-webfont.woff') format('woff'), url('../fonts/proximanova-bold-webfont.ttf') format('truetype'), url('../fonts/proximanova-bold-webfont.svg') format('svg');
src: url('../fonts/proximanova-bold-webfont.eot');
font-weight: 800;
font-style: normal; }

font-family: 'Proxima';
font-weight: bold;
src: url(../fonts/proximanova-bold-webfont.eot?1307578394);
src: url('../fonts/proximanova-bold-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-bold-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-bold-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-bold-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-bolditalic-webfont.woff') format('woff'), url('../fonts/proximanova-bolditalic-webfont.ttf') format('truetype'), url('../fonts/proximanova-bolditalic-webfont.svg') format('svg');
src: url('../fonts/proximanova-bolditalic-webfont.eot');
font-weight: 800;
font-style: italic; }

font-family: 'Proxima';
font-weight: bold;
font-style: italic;
src: url(../fonts/proximanova-boldit-webfont.eot?1307578394);
src: url('../fonts/proximanova-boldit-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-boldit-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-boldit-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-boldit-webfont.svg#webfont2rpW2ohz') format('svg')
}
@font-face {
font-family: "Proxima Nova";
src: url('../fonts/proximanova-extrabold-webfont.woff') format('woff'), url('../fonts/proximanova-extrabold-webfont.ttf') format('truetype'), url('../fonts/proximanova-extrabold-webfont.svg') format('svg');
src: url('../fonts/proximanova-extrabold-webfont.eot');
font-weight: 900;
font-style: normal; }
font-family: 'Proxima';
font-weight: 900;
src: url(../fonts/proximanova-extrabold-webfont.eot?1307578394);
src: url('../fonts/proximanova-extrabold-webfont.eot?iefix') format('eot'),url(../fonts/proximanova-extrabold-webfont.woff?1307578394) format('woff'),url(../fonts/proximanova-extrabold-webfont.ttf?1307578394) format('truetype'),url('../fonts/proximanova-extrabold-webfont.svg#webfont2rpW2ohz') format('svg')
}

h1, h2, h3, h4, h5, h6 {
font-family: "Proxima Nova", "Helvetica Neue", "Helvetica", Arial, sans-serif; }
font-family: "Proxima", "Helvetica Neue", "Helvetica", Arial, sans-serif; }
2 changes: 2 additions & 0 deletions marketing/includes/_header.php
View file
Expand Up @@ -17,6 +17,8 @@

<!-- Included CSS Files -->
<link rel="stylesheet" href="../stylesheets/globals.css">
<link rel="stylesheet" href="../stylesheets/typography.css">
<link rel="stylesheet" href="../stylesheets/grid.css">
<link rel="stylesheet" href="../stylesheets/ui.css">
<link rel="stylesheet" href="../stylesheets/forms.css">
<link rel="stylesheet" href="../stylesheets/orbit.css">
Expand Down
174 changes: 0 additions & 174 deletions stylesheets/globals.css
View file
Expand Up @@ -4,13 +4,10 @@
Table of Contents
-----------------------------------------------------
:: Reset & Standards
:: Typography
:: Links
:: Lists
:: Mobile-Friendly Grid
:: Tables
:: Misc
:: Block Grids
*/


Expand Down Expand Up @@ -76,69 +73,6 @@
body { background: #fff; font-family: "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, "Lucida Grande", sans-serif; font-size: 13px; line-height: 18px; color: #555; position: relative; -webkit-font-smoothing: antialiased; }


/* --------------------------------------------------
:: Typography
-------------------------------------------------- */
h1, h2, h3, h4, h5, h6 { color: #181818; font-weight: bold; line-height: 1.25 }
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; }
h1 { font-size: 46px; font-size: 4.6rem; margin-bottom: 12px;}
h2 { font-size: 35px; font-size: 3.5rem; margin-bottom: 9px; }
h3 { font-size: 28px; font-size: 2.8rem; margin-bottom: 9px; }
h4 { font-size: 21px; font-size: 2.1rem; margin-bottom: 3px; }
h5 { font-size: 18px; font-size: 1.8rem; font-weight: normal; margin-bottom: 3px; }
h6 { font-size: 15px; font-size: 1.5rem; font-weight: normal; }

.subheader { color: #777; font-weight: 300; margin-bottom: 24px; }

p { line-height: 17px; margin: 0 0 18px; }
p img { margin: 0; }
p.lead { font-size: 18px; font-size: 1.8rem; line-height: 24px; }

/* Mobile */

@media handheld, only screen and (max-width: 767px) {
body, p { font-size: 15px; font-size: 1.5rem; line-height: 1.4; }
}

em { font-style: italic; line-height: inherit; }
strong { font-weight: bold; line-height: inherit; }
small { font-size: 60%; line-height: inherit; }

h1 small, h2 small, h3 small, h4 small, h5 small { color: #777; }

/* Blockquotes */
blockquote, blockquote p { line-height: 20px; color: #777; }
blockquote { margin: 0 0 18px; padding: 9px 20px 0 19px; border-left: 1px solid #ddd; }
blockquote cite { display: block; font-size: 12px; font-size: 1.2rem; color: #555; }
blockquote cite:before { content: "\2014 \0020"; }
blockquote cite a, blockquote cite a:visited { color: #555; }

hr { border: solid #ddd; border-width: 1px 0 0; clear: both; margin: 12px 0 18px; height: 0; }

abbr, acronym { text-transform: uppercase; font-size: 90%; color: #222; border-bottom: 1px solid #ddd; cursor: help; }
abbr { text-transform: none; }

/**
* Print styles.
*
* Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/
* Credit to Paul Irish and HTML5 Boilerplate (html5boilerplate.com)
*/
@media print {
* { background: transparent !important; color: black !important; text-shadow: none !important; filter:none !important;
-ms-filter: none !important; } /* Black prints faster: sanbeiji.com/archives/953 */
p a, p a:visited { color: #444 !important; text-decoration: underline; }
p a[href]:after { content: " (" attr(href) ")"; }
abbr[title]:after { content: " (" attr(title) ")"; }
.ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; } /* Don't show links for images, or javascript/internal links */
pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
thead { display: table-header-group; } /* css-discuss.incutio.com/wiki/Printing_Tables */
tr, img { page-break-inside: avoid; }
@page { margin: 0.5cm; }
p, h2, h3 { orphans: 3; widows: 3; }
h2, h3{ page-break-after: avoid; }
}


/* --------------------------------------------------
:: Links
Expand All @@ -162,88 +96,6 @@
li { margin-bottom: 12px; }
ul.large li { line-height: 21px; }


/* --------------------------------------------------
:: Grid
-------------------------------------------------- */

.container { padding: 0px 20px; }

.row { width: 100%; max-width: 980px; min-width: 727px; margin: 0 auto; }
/* To fix the grid into a certain size, set max-width to width */
.row .row { min-width: 0px; }

.column, .columns { margin-left: 4.4%; float: left; min-height: 1px; position: relative; }
.column:first-child, .columns:first-child { margin-left: 0px; }

.row .one.columns { width: 4.3%; }
.row .two.columns { width: 13%; }
.row .three.columns { width: 21.68%; }
.row .four.columns { width: 30.4%; }
.row .five.columns { width: 39.1%; }
.row .six.columns { width: 47.8%; }
.row .seven.columns { width: 56.5%; }
.row .eight.columns { width: 65.2%; }
.row .nine.columns { width: 73.9%; }
.row .ten.columns { width: 82.6%; }
.row .eleven.columns { width: 91.3%; }
.row .twelve.columns { width: 100%; }

.row .offset-by-one { margin-left: 13.1%; }
.row .offset-by-two { margin-left: 21.8%; }
.row .offset-by-three { margin-left: 30.5%; }
.row .offset-by-four { margin-left: 39.2%; }
.row .offset-by-five { margin-left: 47.9%; }
.row .offset-by-six { margin-left: 56.6%; }
.row .offset-by-seven { margin-left: 65.3%; }
.row .offset-by-eight { margin-left: 74.0%; }
.row .offset-by-nine { margin-left: 82.7%; }
.row .offset-by-ten { margin-left: 91.4%; }
/*.row .offset-by-eleven { margin-left: 95.7%; }*/

.row .one.centered { margin-left: 47.9%; }
.row .two.centered { margin-left: 43.5%; }
.row .three.centered { margin-left: 39.2%; }
.row .four.centered { margin-left: 34.8%; }
.row .five.centered { margin-left: 30.5%; }
.row .six.centered { margin-left: 26.1%; }
.row .seven.centered { margin-left: 21.8%; }
.row .eight.centered { margin-left: 17.4%; }
.row .nine.centered { margin-left: 13.1%; }
.row .ten.centered { margin-left: 8.7%; }
.row .eleven.centered { margin-left: 4.3%; }

.row .offset-by-one:first-child { margin-left: 8.7%; }
.row .offset-by-two:first-child { margin-left: 17.4%; }
.row .offset-by-three:first-child { margin-left: 26.1%; }
.row .offset-by-four:first-child { margin-left: 34.8%; }
.row .offset-by-five:first-child { margin-left: 43.5%; }
.row .offset-by-six:first-child { margin-left: 52.2%; }
.row .offset-by-seven:first-child { margin-left: 60.9%; }
.row .offset-by-eight:first-child { margin-left: 69.6%; }
.row .offset-by-nine:first-child { margin-left: 78.3%; }
.row .offset-by-ten:first-child { margin-left: 87%; }
.row .offset-by-eleven:first-child { margin-left: 95.7%; }

img, object, embed { max-width: 100%; }
img { -ms-interpolation-mode: bicubic; }


/* Clear the columns automagically */
/*
.row:after, .clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
.row:last-child:after { content: ""; }
* html .row, * html .clearfix { height: 1%; }
.row, .clearfix { display: inline-block; }
.row, .clearfix { display: block; }
*/

/* Testing Nicolas Gallagher's micro clearfix */
.row:before, .row:after, .clearfix:before, .clearfix:after { content:""; display:table; }
.row:after, .clearfix:after { clear: both; }
.row, .clearfix { zoom: 1; }



/* --------------------------------------------------
:: Tables
Expand Down Expand Up @@ -272,30 +124,4 @@
.right { float: right; }
.hide { display: none; }
.highlight { background: #ff0; }



/* --------------------------------------------------
:: Block grids
These are 2-up, 3-up, 4-up and 5-up ULs, suited
for repeating blocks of content. Add 'mobile' to
them to switch them just like the layout grid
(one item per line) on phones
-------------------------------------------------- */

.block-grid { display: block; overflow: hidden; }
.block-grid>li { display: block; height: auto; float: left; }

.block-grid.two-up { margin-left: -4% }
.block-grid.two-up>li { margin-left: 4%; width: 46%; }

.block-grid.three-up { margin-left: -2% }
.block-grid.three-up>li { margin-left: 2%; width: 31.3%; }

.block-grid.four-up { margin-left: -2% }
.block-grid.four-up>li { margin-left: 2%; width: 23%; }

.block-grid.five-up { margin-left: -1.5% }
.block-grid.five-up>li { margin-left: 1.5%; width: 18.5%; }

0 comments on commit 096825c

Please sign in to comment.