Merge pull request #28 from denisjacquemin/master

Offset values fix for Tablet (Portrait) and better indenting!
This commit is contained in:
Dave Gamache 2011-07-25 22:32:50 -07:00
commit cc6c5090c0

View File

@ -10,228 +10,228 @@
/* Table of Contents /* Table of Contents
================================================== ==================================================
#Base 960 Grid #Base 960 Grid
#Tablet (Portrait) #Tablet (Portrait)
#Mobile (Portrait) #Mobile (Portrait)
#Mobile (Landscape) #Mobile (Landscape)
#Clearing */ #Clearing */
/* #Base 960 Grid /* #Base 960 Grid
================================================== */ ================================================== */
.container { position: relative; width: 960px; margin: 0 auto; padding: 0; } .container { position: relative; width: 960px; margin: 0 auto; padding: 0; }
.column, .columns { float: left; display: inline; margin-left: 10px; margin-right: 10px; } .column, .columns { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
.row { margin-bottom: 20px; } .row { margin-bottom: 20px; }
/* Nested Column Classes */ /* Nested Column Classes */
.column.alpha, .columns.alpha { margin-left: 0; } .column.alpha, .columns.alpha { margin-left: 0; }
.column.omega, .columns.omega { margin-right: 0; } .column.omega, .columns.omega { margin-right: 0; }
/* Base Grid */ /* Base Grid */
.container .one.column { width: 40px; } .container .one.column { width: 40px; }
.container .two.columns { width: 100px; } .container .two.columns { width: 100px; }
.container .three.columns { width: 160px; } .container .three.columns { width: 160px; }
.container .four.columns { width: 220px; } .container .four.columns { width: 220px; }
.container .five.columns { width: 280px; } .container .five.columns { width: 280px; }
.container .six.columns { width: 340px; } .container .six.columns { width: 340px; }
.container .seven.columns { width: 400px; } .container .seven.columns { width: 400px; }
.container .eight.columns { width: 460px; } .container .eight.columns { width: 460px; }
.container .nine.columns { width: 520px; } .container .nine.columns { width: 520px; }
.container .ten.columns { width: 580px; } .container .ten.columns { width: 580px; }
.container .eleven.columns { width: 640px; } .container .eleven.columns { width: 640px; }
.container .twelve.columns { width: 700px; } .container .twelve.columns { width: 700px; }
.container .thirteen.columns { width: 760px; } .container .thirteen.columns { width: 760px; }
.container .fourteen.columns { width: 820px; } .container .fourteen.columns { width: 820px; }
.container .fifteen.columns { width: 880px; } .container .fifteen.columns { width: 880px; }
.container .sixteen.columns { width: 940px; } .container .sixteen.columns { width: 940px; }
.container .one-third.column { width: 300px; } .container .one-third.column { width: 300px; }
.container .two-thirds.column { width: 620px; } .container .two-thirds.column { width: 620px; }
/* Offsets */ /* Offsets */
.container .offset-by-one { padding-left: 60px; } .container .offset-by-one { padding-left: 60px; }
.container .offset-by-two { padding-left: 120px; } .container .offset-by-two { padding-left: 120px; }
.container .offset-by-three { padding-left: 180px; } .container .offset-by-three { padding-left: 180px; }
.container .offset-by-four { padding-left: 240px; } .container .offset-by-four { padding-left: 240px; }
.container .offset-by-five { padding-left: 300px; } .container .offset-by-five { padding-left: 300px; }
.container .offset-by-six { padding-left: 360px; } .container .offset-by-six { padding-left: 360px; }
.container .offset-by-seven { padding-left: 420px; } .container .offset-by-seven { padding-left: 420px; }
.container .offset-by-eight { padding-left: 480px; } .container .offset-by-eight { padding-left: 480px; }
.container .offset-by-nine { padding-left: 540px; } .container .offset-by-nine { padding-left: 540px; }
.container .offset-by-ten { padding-left: 600px; } .container .offset-by-ten { padding-left: 600px; }
.container .offset-by-eleven { padding-left: 660px; } .container .offset-by-eleven { padding-left: 660px; }
.container .offset-by-twelve { padding-left: 720px; } .container .offset-by-twelve { padding-left: 720px; }
.container .offset-by-thirteen { padding-left: 780px; } .container .offset-by-thirteen { padding-left: 780px; }
.container .offset-by-fourteen { padding-left: 840px; } .container .offset-by-fourteen { padding-left: 840px; }
.container .offset-by-fifteen { padding-left: 900px; } .container .offset-by-fifteen { padding-left: 900px; }
/* #Tablet (Portrait) /* #Tablet (Portrait)
================================================== */ ================================================== */
/* Note: Design for a width of 768px */ /* Note: Design for a width of 768px */
@media only screen and (min-width: 768px) and (max-width: 959px) { @media only screen and (min-width: 768px) and (max-width: 959px) {
.container { width: 768px; } .container { width: 768px; }
.container .column, .container .column,
.container .columns { margin-left: 10px; margin-right: 10px; } .container .columns { margin-left: 10px; margin-right: 10px; }
.column.alpha, .columns.alpha { margin-left: 0; margin-right: 10px; } .column.alpha, .columns.alpha { margin-left: 0; margin-right: 10px; }
.column.omega, .columns.omega { margin-right: 0; margin-left: 10px; } .column.omega, .columns.omega { margin-right: 0; margin-left: 10px; }
.container .one.column { width: 28px; } .container .one.column { width: 28px; }
.container .two.columns { width: 76px; } .container .two.columns { width: 76px; }
.container .three.columns { width: 124px; } .container .three.columns { width: 124px; }
.container .four.columns { width: 172px; } .container .four.columns { width: 172px; }
.container .five.columns { width: 220px; } .container .five.columns { width: 220px; }
.container .six.columns { width: 268px; } .container .six.columns { width: 268px; }
.container .seven.columns { width: 316px; } .container .seven.columns { width: 316px; }
.container .eight.columns { width: 364px; } .container .eight.columns { width: 364px; }
.container .nine.columns { width: 412px; } .container .nine.columns { width: 412px; }
.container .ten.columns { width: 460px; } .container .ten.columns { width: 460px; }
.container .eleven.columns { width: 508px; } .container .eleven.columns { width: 508px; }
.container .twelve.columns { width: 556px; } .container .twelve.columns { width: 556px; }
.container .thirteen.columns { width: 604px; } .container .thirteen.columns { width: 604px; }
.container .fourteen.columns { width: 652px; } .container .fourteen.columns { width: 652px; }
.container .fifteen.columns { width: 700px; } .container .fifteen.columns { width: 700px; }
.container .sixteen.columns { width: 748px; } .container .sixteen.columns { width: 748px; }
.container .one-third.column { width: 236px; } .container .one-third.column { width: 236px; }
.container .two-thirds.column { width: 492px; } .container .two-thirds.column { width: 492px; }
/* Offsets */ /* Offsets */
.container .offset-by-one { padding-left: 48px; } .container .offset-by-one { padding-left: 48px; }
.container .offset-by-two { padding-left: 96px; } .container .offset-by-two { padding-left: 96px; }
.container .offset-by-three { padding-left: 144px; } .container .offset-by-three { padding-left: 144px; }
.container .offset-by-four { padding-left: 192px; } .container .offset-by-four { padding-left: 192px; }
.container .offset-by-five { padding-left: 288px; } .container .offset-by-five { padding-left: 240px; }
.container .offset-by-six { padding-left: 336px; } .container .offset-by-six { padding-left: 288px; }
.container .offset-by-seven { padding-left: 348px; } .container .offset-by-seven { padding-left: 336px; }
.container .offset-by-eight { padding-left: 432px; } .container .offset-by-eight { padding-left: 348px; }
.container .offset-by-nine { padding-left: 480px; } .container .offset-by-nine { padding-left: 432px; }
.container .offset-by-ten { padding-left: 528px; } .container .offset-by-ten { padding-left: 480px; }
.container .offset-by-eleven { padding-left: 576px; } .container .offset-by-eleven { padding-left: 528px; }
.container .offset-by-twelve { padding-left: 624px; } .container .offset-by-twelve { padding-left: 576px; }
.container .offset-by-thirteen { padding-left: 672px; } .container .offset-by-thirteen { padding-left: 624px; }
.container .offset-by-fourteen { padding-left: 720px; } .container .offset-by-fourteen { padding-left: 672px; }
.container .offset-by-fifteen { padding-left: 900px; } .container .offset-by-fifteen { padding-left: 720px; }
} }
/* #Mobile (Portrait) /* #Mobile (Portrait)
================================================== */ ================================================== */
/* Note: Design for a width of 320px */ /* Note: Design for a width of 320px */
@media only screen and (max-width: 767px) { @media only screen and (max-width: 767px) {
.container { width: 300px; } .container { width: 300px; }
.columns, .column { margin: 0; } .columns, .column { margin: 0; }
.container .one.column, .container .one.column,
.container .two.columns, .container .two.columns,
.container .three.columns, .container .three.columns,
.container .four.columns, .container .four.columns,
.container .five.columns, .container .five.columns,
.container .six.columns, .container .six.columns,
.container .seven.columns, .container .seven.columns,
.container .eight.columns, .container .eight.columns,
.container .nine.columns, .container .nine.columns,
.container .ten.columns, .container .ten.columns,
.container .eleven.columns, .container .eleven.columns,
.container .twelve.columns, .container .twelve.columns,
.container .thirteen.columns, .container .thirteen.columns,
.container .fourteen.columns, .container .fourteen.columns,
.container .fifteen.columns, .container .fifteen.columns,
.container .sixteen.columns, .container .sixteen.columns,
.container .one-third.column, .container .one-third.column,
.container .two-thirds.column { width: 300px; } .container .two-thirds.column { width: 300px; }
/* Offsets */ /* Offsets */
.container .offset-by-one, .container .offset-by-one,
.container .offset-by-two, .container .offset-by-two,
.container .offset-by-three, .container .offset-by-three,
.container .offset-by-four, .container .offset-by-four,
.container .offset-by-five, .container .offset-by-five,
.container .offset-by-six, .container .offset-by-six,
.container .offset-by-seven, .container .offset-by-seven,
.container .offset-by-eight, .container .offset-by-eight,
.container .offset-by-nine, .container .offset-by-nine,
.container .offset-by-ten, .container .offset-by-ten,
.container .offset-by-eleven, .container .offset-by-eleven,
.container .offset-by-twelve, .container .offset-by-twelve,
.container .offset-by-thirteen, .container .offset-by-thirteen,
.container .offset-by-fourteen, .container .offset-by-fourteen,
.container .offset-by-fifteen { padding-left: 0; } .container .offset-by-fifteen { padding-left: 0; }
} }
/* #Mobile (Landscape) /* #Mobile (Landscape)
================================================== */ ================================================== */
/* Note: Design for a width of 480px */ /* Note: Design for a width of 480px */
@media only screen and (min-width: 480px) and (max-width: 767px) { @media only screen and (min-width: 480px) and (max-width: 767px) {
.container { width: 420px; } .container { width: 420px; }
.columns, .column { margin: 0; } .columns, .column { margin: 0; }
.container .one.column, .container .one.column,
.container .two.columns, .container .two.columns,
.container .three.columns, .container .three.columns,
.container .four.columns, .container .four.columns,
.container .five.columns, .container .five.columns,
.container .six.columns, .container .six.columns,
.container .seven.columns, .container .seven.columns,
.container .eight.columns, .container .eight.columns,
.container .nine.columns, .container .nine.columns,
.container .ten.columns, .container .ten.columns,
.container .eleven.columns, .container .eleven.columns,
.container .twelve.columns, .container .twelve.columns,
.container .thirteen.columns, .container .thirteen.columns,
.container .fourteen.columns, .container .fourteen.columns,
.container .fifteen.columns, .container .fifteen.columns,
.container .sixteen.columns, .container .sixteen.columns,
.container .one-third.column, .container .one-third.column,
.container .two-thirds.column { width: 420px; } .container .two-thirds.column { width: 420px; }
} }
/* #Clearing /* #Clearing
================================================== */ ================================================== */
/* Self Clearing Goodness */ /* Self Clearing Goodness */
.container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; } .container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
/* Use clearfix class on parent to clear nested columns, /* Use clearfix class on parent to clear nested columns,
or wrap each row of columns in a <div class="row"> */ or wrap each row of columns in a <div class="row"> */
.clearfix:before, .clearfix:before,
.clearfix:after, .clearfix:after,
.row:before, .row:before,
.row:after { .row:after {
content: '\0020'; content: '\0020';
display: block; display: block;
overflow: hidden; overflow: hidden;
visibility: hidden; visibility: hidden;
width: 0; width: 0;
height: 0; } height: 0; }
.row:after, .row:after,
.clearfix:after { .clearfix:after {
clear: both; } clear: both; }
.row, .row,
.clearfix { .clearfix {
zoom: 1; } zoom: 1; }
/* You can also use a <br class="clear" /> to clear columns */ /* You can also use a <br class="clear" /> to clear columns */
.clear { .clear {
clear: both; clear: both;
display: block; display: block;
overflow: hidden; overflow: hidden;
visibility: hidden; visibility: hidden;
width: 0; width: 0;
height: 0; height: 0;
} }