From 25ffc989bfd1bee2d682f96346334984235a07c2 Mon Sep 17 00:00:00 2001 From: Scott Warren Date: Fri, 28 Sep 2012 17:53:00 -0400 Subject: [PATCH] Change to .container-fluid Per @thejameskyle's suggestion I changed it so the full width option behave more like the Twitter Bootstrap. I also fixed it so it works on all devices. --- stylesheets/skeleton.css | 175 ++++++++++++++++++++++++++++----------- 1 file changed, 126 insertions(+), 49 deletions(-) diff --git a/stylesheets/skeleton.css b/stylesheets/skeleton.css index 288c0ef..34edd6c 100644 --- a/stylesheets/skeleton.css +++ b/stylesheets/skeleton.css @@ -68,58 +68,50 @@ .container .offset-by-thirteen { padding-left: 780px; } .container .offset-by-fourteen { padding-left: 840px; } .container .offset-by-fifteen { padding-left: 900px; } + + /* Use the full width of the screen */ + .container-fluid { position: relative; width: 100%; margin: 0 auto; padding: 0; } + .container-fluid .column, + .container-fluid .columns { float: left; display: inline; margin-left: 1%; margin-right: 1%; } - /* #Full screen width (100%) - add .fullwidth to your container's parent for support - ================================================== */ - @media only screen and (min-width:767px){ - .fullwidth .container { position: relative; width: 100%; margin: 0 auto; padding: 0; } - .fullwidth .container .column, - .fullwidth .container .columns { float: left; display: inline; margin-left: 1%; margin-right: 1%; } - .fullwidth .row { margin-bottom: 20px; } + /* Base Grid */ + .container-fluid .one.column, + .container-fluid .one.columns { width: 4.25%; } + .container-fluid .two.columns { width: 10.5%; } + .container-fluid .three.columns { width: 16.75%; } + .container-fluid .four.columns { width: 23%; } + .container-fluid .five.columns { width: 29.25%; } + .container-fluid .six.columns { width: 35.5%; } + .container-fluid .seven.columns { width: 41.75%; } + .container-fluid .eight.columns { width: 48%; } + .container-fluid .nine.columns { width: 54.25%; } + .container-fluid .ten.columns { width: 60.5%; } + .container-fluid .eleven.columns { width: 66.75%; } + .container-fluid .twelve.columns { width: 73%; } + .container-fluid .thirteen.columns { width: 79.25%; } + .container-fluid .fourteen.columns { width: 85.5%; } + .container-fluid .fifteen.columns { width: 91.75%; } + .container-fluid .sixteen.columns { width: 98%; } - /* Nested Column Classes */ - .column.alpha, .columns.alpha { margin-left: 0; } - .column.omega, .columns.omega { margin-right: 0; } + .container-fluid .one-third.column { width: 31%; } + .container-fluid .two-thirds.column { width: 64%; } - /* Base Grid */ - .fullwidth .container .one.column, - .fullwidth .container .one.columns { width: 4.25%; } - .fullwidth .container .two.columns { width: 10.5%; } - .fullwidth .container .three.columns { width: 16.75%; } - .fullwidth .container .four.columns { width: 23%; } - .fullwidth .container .five.columns { width: 29.25%; } - .fullwidth .container .six.columns { width: 35.5%; } - .fullwidth .container .seven.columns { width: 41.75%; } - .fullwidth .container .eight.columns { width: 48%; } - .fullwidth .container .nine.columns { width: 54.25%; } - .fullwidth .container .ten.columns { width: 60.5%; } - .fullwidth .container .eleven.columns { width: 66.75%; } - .fullwidth .container .twelve.columns { width: 73%; } - .fullwidth .container .thirteen.columns { width: 79.25%; } - .fullwidth .container .fourteen.columns { width: 85.5%; } - .fullwidth .container .fifteen.columns { width: 91.75%; } - .fullwidth .container .sixteen.columns { width: 98%; } - - .fullwidth .container .one-third.column { width: 31%; } - .fullwidth .container .two-thirds.column { width: 64%; } - - /* Offsets */ - .fullwidth .container .offset-by-one { padding-left: 6.25%; } - .fullwidth .container .offset-by-two { padding-left: 12.5%; } - .fullwidth .container .offset-by-three { padding-left: 18.75%; } - .fullwidth .container .offset-by-four { padding-left: 25%; } - .fullwidth .container .offset-by-five { padding-left: 31.25%; } - .fullwidth .container .offset-by-six { padding-left: 37.5%; } - .fullwidth .container .offset-by-seven { padding-left: 43.75%; } - .fullwidth .container .offset-by-eight { padding-left: 50%; } - .fullwidth .container .offset-by-nine { padding-left: 56.25%; } - .fullwidth .container .offset-by-ten { padding-left: 62.5%; } - .fullwidth .container .offset-by-eleven { padding-left: 68.75%; } - .fullwidth .container .offset-by-twelve { padding-left: 75%; } - .fullwidth .container .offset-by-thirteen { padding-left: 81.25%; } - .fullwidth .container .offset-by-fourteen { padding-left: 87.5%; } - .fullwidth .container .offset-by-fifteen { padding-left: 93.75%; } - } + /* Offsets */ + .container-fluid .offset-by-one { padding-left: 6.25%; } + .container-fluid .offset-by-two { padding-left: 12.5%; } + .container-fluid .offset-by-three { padding-left: 18.75%; } + .container-fluid .offset-by-four { padding-left: 25%; } + .container-fluid .offset-by-five { padding-left: 31.25%; } + .container-fluid .offset-by-six { padding-left: 37.5%; } + .container-fluid .offset-by-seven { padding-left: 43.75%; } + .container-fluid .offset-by-eight { padding-left: 50%; } + .container-fluid .offset-by-nine { padding-left: 56.25%; } + .container-fluid .offset-by-ten { padding-left: 62.5%; } + .container-fluid .offset-by-eleven { padding-left: 68.75%; } + .container-fluid .offset-by-twelve { padding-left: 75%; } + .container-fluid .offset-by-thirteen { padding-left: 81.25%; } + .container-fluid .offset-by-fourteen { padding-left: 87.5%; } + .container-fluid .offset-by-fifteen { padding-left: 93.75%; } /* #Tablet (Portrait) @@ -221,7 +213,50 @@ .container .offset-by-thirteen, .container .offset-by-fourteen, .container .offset-by-fifteen { padding-left: 0; } + + /* Use the full width of the screen */ + .container-fluid .columns, + .container-fluid .column { margin: 0; } + .container-fluid .one.column, + .container-fluid .one.columns, + .container-fluid .two.columns, + .container-fluid .three.columns, + .container-fluid .four.columns, + .container-fluid .five.columns, + .container-fluid .six.columns, + .container-fluid .seven.columns, + .container-fluid .eight.columns, + .container-fluid .nine.columns, + .container-fluid .ten.columns, + .container-fluid .eleven.columns, + .container-fluid .twelve.columns, + .container-fluid .thirteen.columns, + .container-fluid .fourteen.columns, + .container-fluid .fifteen.columns, + .container-fluid .sixteen.columns, + .container-fluid .one-third.column, + .container-fluid .two-thirds.column { width: 100%; } + + /* Offsets */ + .container-fluid .offset-by-one, + .container-fluid .offset-by-two, + .container-fluid .offset-by-three, + .container-fluid .offset-by-four, + .container-fluid .offset-by-five, + .container-fluid .offset-by-six, + .container-fluid .offset-by-seven, + .container-fluid .offset-by-eight, + .container-fluid .offset-by-nine, + .container-fluid .offset-by-ten, + .container-fluid .offset-by-eleven, + .container-fluid .offset-by-twelve, + .container-fluid .offset-by-thirteen, + .container-fluid .offset-by-fourteen, + .container-fluid .offset-by-fifteen { padding-left: 0; } + + + } @@ -254,6 +289,48 @@ .container .sixteen.columns, .container .one-third.column, .container .two-thirds.column { width: 420px; } + + /* Use the full width of the screen */ + .container-fluid .columns, + .container-fluid .column { margin: 0; } + + .container-fluid .one.column, + .container-fluid .one.columns, + .container-fluid .two.columns, + .container-fluid .three.columns, + .container-fluid .four.columns, + .container-fluid .five.columns, + .container-fluid .six.columns, + .container-fluid .seven.columns, + .container-fluid .eight.columns, + .container-fluid .nine.columns, + .container-fluid .ten.columns, + .container-fluid .eleven.columns, + .container-fluid .twelve.columns, + .container-fluid .thirteen.columns, + .container-fluid .fourteen.columns, + .container-fluid .fifteen.columns, + .container-fluid .sixteen.columns, + .container-fluid .one-third.column, + .container-fluid .two-thirds.column { width: 100%; } + + /* Offsets */ + .container-fluid .offset-by-one, + .container-fluid .offset-by-two, + .container-fluid .offset-by-three, + .container-fluid .offset-by-four, + .container-fluid .offset-by-five, + .container-fluid .offset-by-six, + .container-fluid .offset-by-seven, + .container-fluid .offset-by-eight, + .container-fluid .offset-by-nine, + .container-fluid .offset-by-ten, + .container-fluid .offset-by-eleven, + .container-fluid .offset-by-twelve, + .container-fluid .offset-by-thirteen, + .container-fluid .offset-by-fourteen, + .container-fluid .offset-by-fifteen { padding-left: 0; } + }