diff options
| author | spiderr <spider@viovio.com> | 2010-08-06 13:43:27 -0400 |
|---|---|---|
| committer | spiderr <spider@viovio.com> | 2010-08-06 13:43:27 -0400 |
| commit | 2a9554c8d225fc0ddb30fe289fe8ada7f4b8c659 (patch) | |
| tree | 62f09d0512aa59e5e57aec2eb580bd1d16eca62a | |
| parent | 8b08bb12dc30a78c7654080cf3a7fb9e41c5629b (diff) | |
| download | themes-2a9554c8d225fc0ddb30fe289fe8ada7f4b8c659.tar.gz themes-2a9554c8d225fc0ddb30fe289fe8ada7f4b8c659.tar.bz2 themes-2a9554c8d225fc0ddb30fe289fe8ada7f4b8c659.zip | |
major refinement of gala layouts - layouts are still the same, however #content was removed from all positioning and #wrapper was used for main content, so now you can pad up #content like you can side columns. update all fixed sizes to use 960px multiples to conform to blueprintcss styling.
37 files changed, 266 insertions, 287 deletions
diff --git a/layouts/gala_01.css b/layouts/gala_01.css index 0b2d517..918068a 100644 --- a/layouts/gala_01.css +++ b/layouts/gala_01.css @@ -1,8 +1,8 @@ -div#wrapper {float:left;width:100%} -div.blocks3 #content {margin: 0 25% 0 25%;} -div.blocks2e #content {margin: 0 25% 0 0;} -div.blocks2n #content {margin: 0 0 0 25%;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:25%;margin-left:-100%} -div#extra {float:left;width:25%;margin-left:-25%} -div#footer {clear:left;width:100%} +#wrapper {float:left;width:100%;} +.blocks3 #wrapper {margin: 0 20% 0 20%;width:60%;} +.blocks2e #wrapper {margin: 0 20% 0 0;width:80%;} +.blocks2n #wrapper {margin: 0 0 0 20%;width:80%;} +.blocks1 #wrapper {margin: 0 0 0 0;width:100%;} +#navigation {float:left;width:20%;margin-left:-100%} +#extra {float:left;width:20%;margin-left:-20%} +#footer {clear:left;width:100%} diff --git a/layouts/gala_02.css b/layouts/gala_02.css index d3ed3b9..fe90740 100644 --- a/layouts/gala_02.css +++ b/layouts/gala_02.css @@ -1,8 +1,8 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin:0 25% 0 25%;} -div.blocks2e #content {margin:0 0 0 25%;} -div.blocks2n #content {margin:0 25% 0 0;} -div.blocks1 #content {margin:0 0 0 0;} -div#navigation {float:left;width:25%;margin-left:-25%} -div#extra {float:left;width:25%;margin-left:-100%} +div.blocks3 #wrapper {margin:0 20% 0 20%;width:60%;} +div.blocks2e #wrapper {margin:0 0 0 20%;width:80%;} +div.blocks2n #wrapper {margin:0 20% 0 0;width:80%;} +div.blocks1 #wrapper {margin:0 0 0 0;} +div#navigation {float:left;width:20%;margin-left:-20%} +div#extra {float:left;width:20%;margin-left:-100%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_03.css b/layouts/gala_03.css index eff6a56..36abefd 100644 --- a/layouts/gala_03.css +++ b/layouts/gala_03.css @@ -1,10 +1,10 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right: 50%;} -div.blocks2e #content {margin-right: 25%;} -div.blocks2n #content {margin-right: 25%;} -div.blocks1 #content {margin-right: 0%;} -div#navigation {float:left;width:25%;} -div.blocks3 #navigation {margin-left:-50%;} -div.blocks2n #navigation {margin-left:-25%;} -div#extra {float:left;width:25%;margin-left:-25%} +div.blocks3 #wrapper {margin-right: 40%;width:60%;} +div.blocks2e #wrapper {margin-right: 20%;width:80%;} +div.blocks2n #wrapper {margin-right: 20%;width:80%;} +div.blocks1 #wrapper {margin-right: 0%;} +div#navigation {float:left;width:20%;} +div.blocks3 #navigation {margin-left:-40%;} +div.blocks2n #navigation {margin-left:-20%;} +div#extra {float:left;width:20%;margin-left:-20%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_04.css b/layouts/gala_04.css index 4cca231..e02218d 100644 --- a/layouts/gala_04.css +++ b/layouts/gala_04.css @@ -1,10 +1,10 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right: 50%;} -div.blocks2e #content {margin-right: 25%;} -div.blocks2n #content {margin-right: 25%;} -div.blocks1 #content {margin-right: 0%;} -div#navigation {float:left;width:25%;margin-left:-25%} -div#extra {float:left;width:25%;} -div.blocks3 #extra {margin-left:-50%;} -div.blocks2e #extra {margin-left:-25%;} +div.blocks3 #wrapper {margin-right: 40%;width:60%;} +div.blocks2e #wrapper {margin-right: 20%;width:80%;} +div.blocks2n #wrapper {margin-right: 20%;width:80%;} +div.blocks1 #wrapper {margin-right: 0%;} +div#navigation {float:left;width:20%;margin-left:-20%} +div#extra {float:left;width:20%;} +div.blocks3 #extra {margin-left:-40%;} +div.blocks2e #extra {margin-left:-20%;} div#footer {clear:left;width:100%} diff --git a/layouts/gala_05.css b/layouts/gala_05.css index 31c4be4..e2f5203 100644 --- a/layouts/gala_05.css +++ b/layouts/gala_05.css @@ -1,10 +1,10 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-left: 50%;} -div.blocks2e #content {margin-left: 25%;} -div.blocks2n #content {margin-left: 25%;} -div.blocks1 #content {margin-left: 0%;} -div#navigation {float:left;width:25%;margin-left:-100%} -div#extra {float:left;width:25%;} -div.blocks3 #extra {margin-left: -75%;} +div.blocks3 #wrapper {margin-left: 40%;width:60%;} +div.blocks2e #wrapper {margin-left: 20%;width:80%;} +div.blocks2n #wrapper {margin-left: 20%;width:80%;} +div.blocks1 #wrapper {margin-left: 0%;} +div#navigation {float:left;width:20%;margin-left:-100%} +div#extra {float:left;width:20%;} +div.blocks3 #extra {margin-left: -80%;} div.blocks2e #extra {margin-left:-100%;} div#footer {clear:left;width:100%} diff --git a/layouts/gala_06.css b/layouts/gala_06.css index 038a60b..28cf778 100644 --- a/layouts/gala_06.css +++ b/layouts/gala_06.css @@ -1,10 +1,10 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-left: 50%;} -div.blocks2e #content {margin-left: 25%;} -div.blocks2n #content {margin-left: 25%;} -div.blocks1 #content {margin-left: 0%;} -div#navigation {float:left;width:25%;} -div.blocks3 #navigation {margin-left: -75%;} +div.blocks3 #wrapper {margin-left: 40%;width:60%;} +div.blocks2e #wrapper {margin-left: 20%;width:80%;} +div.blocks2n #wrapper {margin-left: 20%;width:80%;} +div.blocks1 #wrapper {margin-left: 0%;} +div#navigation {float:left;width:20%;} +div.blocks3 #navigation {margin-left: -80%;} div.blocks2n #navigation {margin-left:-100%;} -div#extra {float:left;width:25%;margin-left:-100%} +div#extra {float:left;width:20%;margin-left:-100%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_07.css b/layouts/gala_07.css index 43e8961..8a8e498 100644 --- a/layouts/gala_07.css +++ b/layouts/gala_07.css @@ -1,9 +1,8 @@ -div#container {width:900px;margin:0 auto} div#wrapper {float:left;width:100%} -div.blocks3 #content {margin: 0 220px 0 220px;} -div.blocks2e #content {margin: 0 220px 0 0;} -div.blocks2n #content {margin: 0 0 0 220px;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:220px;margin-left:-900px} -div#extra {float:left;width:220px;margin-left:-220px} +div.blocks3 #wrapper {margin: 0 200px 0 200px;width:560px;} +div.blocks2e #wrapper {margin: 0 200px 0 0;width:760px;} +div.blocks2n #wrapper {margin: 0 0 0 200px;width:760px;} +div.blocks1 #wrapper {margin: 0 0 0 0;} +div#navigation {float:left;width:200px;margin-left:-960px} +div#extra {float:left;width:200px;margin-left:-200px} div#footer {clear:left;width:100%} diff --git a/layouts/gala_08.css b/layouts/gala_08.css index d507818..0fee2a5 100644 --- a/layouts/gala_08.css +++ b/layouts/gala_08.css @@ -1,10 +1,8 @@ -div#container {width:900px;margin:0 auto} div#wrapper {float:left;width:100%} -div#content {margin: 0 220px} -div.blocks3 #content {margin: 0 220px 0 220px;} -div.blocks2e #content {margin: 0 0 0 220px;} -div.blocks2n #content {margin: 0 220px 0 0;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:220px;margin-left:-220px} -div#extra {float:left;width:220px;margin-left:-900px} +div.blocks3 #wrapper {margin: 0 200px 0 200px;width:560px;} +div.blocks2e #wrapper {margin: 0 0 0 200px;width:760px;} +div.blocks2n #wrapper {margin: 0 200px 0 0;width:760px;} +div.blocks1 #wrapper {margin: 0 0 0 0;} +div#navigation {float:left;width:200px;margin-left:-200px} +div#extra {float:left;width:200px;margin-left:-960px} div#footer {clear:left;width:100%} diff --git a/layouts/gala_09.css b/layouts/gala_09.css index 1e95e14..107d298 100644 --- a/layouts/gala_09.css +++ b/layouts/gala_09.css @@ -1,11 +1,10 @@ -div#container {width:900px;margin:0 auto} div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right: 440px;} -div.blocks2e #content {margin-right: 220px;} -div.blocks2n #content {margin-right: 220px;} -div.blocks1 #content {margin-right: 0;} -div#navigation {float:left;width:220px;} -div.blocks3 #navigation {margin-left:-440px;} -div.blocks2n #navigation {margin-left:-220px;} -div#extra {float:left;width:220px;margin-left:-220px} +div.blocks3 #wrapper {margin-right: 400px;width:560px;} +div.blocks2e #wrapper {margin-right: 200px;width:760px;} +div.blocks2n #wrapper {margin-right: 200px;width:760px;} +div.blocks1 #wrapper {margin-right: 0;} +div#navigation {float:left;width:200px;} +div.blocks3 #navigation {margin-left:-400px;} +div.blocks2n #navigation {margin-left:-200px;} +div#extra {float:left;width:200px;margin-left:-200px} div#footer {clear:left;width:100%} diff --git a/layouts/gala_10.css b/layouts/gala_10.css index 2875bf8..1cdb241 100644 --- a/layouts/gala_10.css +++ b/layouts/gala_10.css @@ -1,11 +1,10 @@ -div#container {width:900px;margin:0 auto} div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right: 440px;} -div.blocks2e #content {margin-right: 220px;} -div.blocks2n #content {margin-right: 220px;} -div.blocks1 #content {margin-right: 0;} -div#navigation {float:left;width:220px;margin-left:-220px} -div#extra {float:left;width:220px;} -div.blocks3 #extra {margin-left:-440px;} -div.blocks2e #extra {margin-left:-220px;} +div.blocks3 #wrapper {margin-right: 400px;width:560px;} +div.blocks2e #wrapper {margin-right: 200px;width:760px;} +div.blocks2n #wrapper {margin-right: 200px;width:760px;} +div.blocks1 #wrapper {margin-right: 0;} +div#navigation {float:left;width:200px;margin-left:-200px} +div#extra {float:left;width:200px;} +div.blocks3 #extra {margin-left:-400px;} +div.blocks2e #extra {margin-left:-200px;} div#footer {clear:left;width:100%} diff --git a/layouts/gala_11.css b/layouts/gala_11.css index f9ee5e8..38a7b28 100644 --- a/layouts/gala_11.css +++ b/layouts/gala_11.css @@ -1,11 +1,10 @@ -div#container {width:900px;margin:0 auto} div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-left: 440px;} -div.blocks2e #content {margin-left: 220px;} -div.blocks2n #content {margin-left: 220px;} -div.blocks1 #content {margin-left: 0;} -div#navigation {float:left;width:220px;margin-left:-900px} -div#extra {float:left;width:220px;} -div.blocks3 #extra {margin-left:-680px;} -div.blocks2e #extra {margin-left:-900px;} +div.blocks3 #wrapper {margin-left: 400px;width:560px;} +div.blocks2e #wrapper {margin-left: 200px;width:760px;} +div.blocks2n #wrapper {margin-left: 200px;width:760px;} +div.blocks1 #wrapper {margin-left: 0;} +div#navigation {float:left;width:200px;margin-left:-960px} +div#extra {float:left;width:200px;} +div.blocks3 #extra {margin-left:-760px;} +div.blocks2e #extra {margin-left:-960px;} div#footer {clear:left;width:100%} diff --git a/layouts/gala_12.css b/layouts/gala_12.css index 0d39102..3f964e0 100644 --- a/layouts/gala_12.css +++ b/layouts/gala_12.css @@ -1,11 +1,10 @@ -div#container {width:900px;margin:0 auto} div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-left: 440px;} -div.blocks2e #content {margin-left: 220px;} -div.blocks2n #content {margin-left: 220px;} -div.blocks1 #content {margin-left: 0;} -div#navigation {float:left;width:220px;} -div.blocks3 #navigation {margin-left:-680px;} -div.blocks2n #navigation {margin-left:-900px;} -div#extra {float:left;width:220px;margin-left:-900px} +div.blocks3 #wrapper {margin-left: 400px;width:560px;} +div.blocks2e #wrapper {margin-left: 200px;width:760px;} +div.blocks2n #wrapper {margin-left: 200px;width:760px;} +div.blocks1 #wrapper {margin-left: 0;} +div#navigation {float:left;width:200px;} +div.blocks3 #navigation {margin-left:-760px;} +div.blocks2n #navigation {margin-left:-960px;} +div#extra {float:left;width:200px;margin-left:-960px} div#footer {clear:left;width:100%} diff --git a/layouts/gala_13.css b/layouts/gala_13.css index dad2a5c..bb5eeab 100644 --- a/layouts/gala_13.css +++ b/layouts/gala_13.css @@ -1,8 +1,8 @@ -div#wrapper {float:left;width:100%} -div.blocks3 #content {margin: 0 260px 0 260px;} -div.blocks2e #content {margin: 0 260px 0 0;} -div.blocks2n #content {margin: 0 0 0 260px;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:260px;margin-left:-100%} -div#extra {float:left;width:260px;margin-left:-260px} +div#wrapper {float:left;} +div.blocks3 #wrapper {margin: 0 240px 0 240px;width:50%} +div.blocks2e #wrapper {margin: 0 240px 0 0;width:75%} +div.blocks2n #wrapper {margin: 0 0 0 240px;width:75%} +div.blocks1 #wrapper {margin: 0 0 0 0;} +div#navigation {float:left;width:240px;margin-left:-100%} +div#extra {float:left;width:240px;margin-left:-240px} div#footer {clear:left;width:100%} diff --git a/layouts/gala_14.css b/layouts/gala_14.css index 4c42618..114506a 100644 --- a/layouts/gala_14.css +++ b/layouts/gala_14.css @@ -1,8 +1,8 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin: 0 260px 0 260px;} -div.blocks2e #content {margin: 0 0 0 260px;} -div.blocks2n #content {margin: 0 260px 0 0;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:260px;margin-left:-260px} -div#extra {float:left;width:260px;margin-left:-100%} +div.blocks3 #wrapper {margin: 0 240px 0 240px;width:50%} +div.blocks2e #wrapper {margin: 0 0 0 240px;width:75%} +div.blocks2n #wrapper {margin: 0 240px 0 0;width:75%} +div.blocks1 #wrapper {margin: 0 0 0 0;} +div#navigation {float:left;width:240px;margin-left:-240px} +div#extra {float:left;width:240px;margin-left:-100%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_15.css b/layouts/gala_15.css index e066517..960aba3 100644 --- a/layouts/gala_15.css +++ b/layouts/gala_15.css @@ -1,12 +1,12 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right: 520px;} -div.blocks2e #content {margin-right: 260px;} -div.blocks2n #content {margin-right: 260px;} -div.blocks1 #content {margin-right: 0;} -div#navigation {float:left;width:260px;} -div.blocks3 #navigation {margin-left:-520px;} -div.blocks2e #navigation {margin-left:-260px;} -div.blocks2n #navigation {margin-left:-260px;} +div.blocks3 #wrapper {margin-right: 480px;width:50%} +div.blocks2e #wrapper {margin-right: 240px;width:75%} +div.blocks2n #wrapper {margin-right: 240px;width:75%} +div.blocks1 #wrapper {margin-right: 0;} +div#navigation {float:left;width:240px;} +div.blocks3 #navigation {margin-left:-480px;} +div.blocks2e #navigation {margin-left:-240px;} +div.blocks2n #navigation {margin-left:-240px;} div.blocks1 #navigation {margin-left: 0;} -div#extra {float:left;width:260px;margin-left:-260px} +div#extra {float:left;width:240px;margin-left:-240px} div#footer {clear:left;width:100%} diff --git a/layouts/gala_16.css b/layouts/gala_16.css index 6f226bd..b6cd73b 100644 --- a/layouts/gala_16.css +++ b/layouts/gala_16.css @@ -1,12 +1,12 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right: 520px;} -div.blocks2e #content {margin-right: 260px;} -div.blocks2n #content {margin-right: 260px;} -div.blocks1 #content {margin-right: 0;} -div#navigation {float:left;width:260px;margin-left:-260px} -div#extra {float:left;width:260px;} -div.blocks3 #extra {margin-left:-520px;} -div.blocks2e #extra {margin-left:-260px;} -div.blocks2n #extra {margin-left:-260px;} +div.blocks3 #wrapper {margin-right: 480px;width:50%} +div.blocks2e #wrapper {margin-right: 240px;width:75%} +div.blocks2n #wrapper {margin-right: 240px;width:75%} +div.blocks1 #wrapper {margin-right: 0;} +div#navigation {float:left;width:240px;margin-left:-240px} +div#extra {float:left;width:240px;} +div.blocks3 #extra {margin-left:-480px;} +div.blocks2e #extra {margin-left:-240px;} +div.blocks2n #extra {margin-left:-240px;} div.blocks1 #extra {margin-left: 0;} div#footer {clear:left;width:100%} diff --git a/layouts/gala_17.css b/layouts/gala_17.css index 0e623a8..3a9b6df 100644 --- a/layouts/gala_17.css +++ b/layouts/gala_17.css @@ -1,12 +1,10 @@ div#wrapper {float:right;width: 100%;} -div.blocks3 #wrapper {margin-left:-520px;} -div.blocks2e #wrapper {margin-left:-260px;} -div.blocks2n #wrapper {margin-left:-260px;} +div.blocks3 #wrapper {margin-left:-480px;width:50%} +div.blocks2e #wrapper {margin-left:-240px;width:75%} +div.blocks2n #wrapper {margin-left:-240px;width:75%} div.blocks1 #wrapper {margin-left: 0;} -div.blocks3 #content {margin-left: 520px;} -div.blocks2e #content {margin-left: 260px;} -div.blocks2n #content {margin-left: 260px;} -div.blocks1 #content {margin-left: 0;} -div#navigation {float:right;width:260px} -div#extra {float:right;width:260px} +div#navigation {float:right;width:240px} +div.blocks3 #navigation {margin-right:50%;} +div.blocks2n #navigation {margin-right:75%;} +div#extra {float:left;width:240px} div#footer {clear:right;width:100%} diff --git a/layouts/gala_18.css b/layouts/gala_18.css index 76814a2..43f6f1b 100644 --- a/layouts/gala_18.css +++ b/layouts/gala_18.css @@ -1,12 +1,8 @@ -div#wrapper {float:right;width:100%;} -div.blocks3 #wrapper {margin-left:-520px;} -div.blocks2e #wrapper {margin-left:-260px;} -div.blocks2n #wrapper {margin-left:-260px;} +div#wrapper {float:right;width: 100%;} +div.blocks3 #wrapper {margin-left:-480px;width:50%} +div.blocks2e #wrapper {margin-left:-240px;width:75%} +div.blocks2n #wrapper {margin-left:-240px;width:75%} div.blocks1 #wrapper {margin-left: 0;} -div.blocks3 #content {margin-left: 520px;} -div.blocks2e #content {margin-left: 260px;} -div.blocks2n #content {margin-left: 260px;} -div.blocks1 #content {margin-left: 0;} -div#navigation {float:left;width:260px} -div#extra {float:right;width:260px} -div#footer {clear:both;width:100%} +div#navigation {float:left;width:240px} +div#extra {float:left;width:240px} +div#footer {clear:right;width:100%} diff --git a/layouts/gala_19.css b/layouts/gala_19.css index d8498b6..72b3dbd 100644 --- a/layouts/gala_19.css +++ b/layouts/gala_19.css @@ -1,8 +1,8 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin: 0 33% 0 260px;} -div.blocks2e #content {margin: 0 33% 0 0;} -div.blocks2n #content {margin: 0 0 0 260px;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:260px;margin-left:-100%} -div#extra {float:left;width:33%;margin-left:-33%} +div.blocks3 #wrapper {margin: 0 25% 0 240px;width:50%} +div.blocks2e #wrapper {margin: 0 25% 0 0;width:75%} +div.blocks2n #wrapper {margin: 0 0 0 240px;width:75%} +div.blocks1 #wrapper {margin: 0 0 0 0;} +div#navigation {float:left;width:240px;margin-left:-100%} +div#extra {float:left;width:25%;margin-left:-25%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_20.css b/layouts/gala_20.css index a99e20b..959f518 100644 --- a/layouts/gala_20.css +++ b/layouts/gala_20.css @@ -1,8 +1,8 @@ div#wrapper {float:left;width:100%;} -div.blocks3 #content {margin: 0 260px 0 33%;} -div.blocks2e #content {margin: 0 260px 0 0;} -div.blocks2n #content {margin: 0 0 0 33%;} -div.blocks1 #content {margin: 0;} -div#navigation {float:left;width:33%;margin-left:-100%;} -div#extra {float:left;width:260px;margin-left:-260px;} +div.blocks3 #wrapper {margin: 0 240px 0 25%;width:50%} +div.blocks2e #wrapper {margin: 0 240px 0 0;width:75%} +div.blocks2n #wrapper {margin: 0 0 0 25%;width:75%} +div.blocks1 #wrapper {margin: 0;} +div#navigation {float:left;width:25%;margin-left:-100%;} +div#extra {float:left;width:240px;margin-left:-240px;} div#footer {clear:left;width:100%;} diff --git a/layouts/gala_21.css b/layouts/gala_21.css index 3611647..f66ee46 100644 --- a/layouts/gala_21.css +++ b/layouts/gala_21.css @@ -1,12 +1,8 @@ -div#wrapper {float:left;width:100%;margin-left:-25%} -div.blocks3 #wrapper {margin-left:-25%;} -div.blocks2e #wrapper {margin-left:-25%;} -div.blocks2n #wrapper {margin-left: 0;} -div.blocks1 #wrapper {margin-left: 0;} -div.blocks3 #content {margin: 0 260px 0 25%;} -div.blocks2e #content {margin: 0 0 0 25%;} -div.blocks2n #content {margin: 0 260px 0 0;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:260px;margin-left:-260px} -div#extra {float:left;width:25%} +div#wrapper {float:left;width:100%;} +div.blocks3 #wrapper {width:50%;} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;} +div.blocks1 #wrapper {} +div#navigation {float:left;width:240px;} +div#extra {float:right;width:25%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_22.css b/layouts/gala_22.css index d468140..6daad04 100644 --- a/layouts/gala_22.css +++ b/layouts/gala_22.css @@ -1,12 +1,8 @@ div#wrapper {float:left;width:100%;} -div.blocks3 #wrapper {margin-left:-260px;} -div.blocks2e #wrapper {margin-left:-260px;} -div.blocks2n #wrapper {margin-left: 0;} -div.blocks1 #wrapper {margin-left: 0;} -div.blocks3 #content {margin: 0 25% 0 260px;} -div.blocks2e #content {margin: 0 0 0 260px;} -div.blocks2n #content {margin: 0 25% 0 0;} -div.blocks1 #content {margin: 0 0 0 0;} -div#navigation {float:left;width:25%;margin-left:-25%} -div#extra {float:left;width:260px} +div.blocks3 #wrapper {width:50%;} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;} +div.blocks1 #wrapper {} +div#extra {float:left;width:240px;} +div#navigation {float:right;width:25%} div#footer {clear:left;width:100%} diff --git a/layouts/gala_23.css b/layouts/gala_23.css index 089e914..d949836 100644 --- a/layouts/gala_23.css +++ b/layouts/gala_23.css @@ -1,8 +1,8 @@ -div#wrapper {float:left;width:100%;margin-left:-260px} -div.blocks3 #content {margin-left:260px;} -div.blocks2e #content {margin-left:260px;} -div.blocks2n #content {margin-left:260px;} -div.blocks1 #content {} -div#navigation {float:right;width:260px} -div#extra {float:right;clear:right;width:260px} +div#wrapper {float:left;width:100%;} +div.blocks3 #wrapper {width:75%;} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;} +div.blocks1 #wrapper {} +div#navigation {float:right;width:240px} +div#extra {float:right;clear:right;width:240px} div#footer {clear:both;width:100%} diff --git a/layouts/gala_24.css b/layouts/gala_24.css index 5e51737..3ff4a50 100644 --- a/layouts/gala_24.css +++ b/layouts/gala_24.css @@ -1,8 +1,8 @@ -div#wrapper {float:right;width:100%;margin-left:-260px} -div.blocks3 #content {margin-left:260px;} -div.blocks2e #content {margin-left:260px;} -div.blocks2n #content {margin-left:260px;} -div.blocks1 #content {} -div#navigation {float:left;width:260px} -div#extra {float:left;clear:left;width:260px} +div#wrapper {float:right;width:100%;} +div.blocks3 #wrapper {width:75%;} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;} +div.blocks1 #wrapper {} +div#navigation {float:left;width:240px} +div#extra {float:left;clear:left;width:240px} div#footer {clear:both;width:100%} diff --git a/layouts/gala_25.css b/layouts/gala_25.css index b0b76ce..8448aeb 100644 --- a/layouts/gala_25.css +++ b/layouts/gala_25.css @@ -1,8 +1,8 @@ -div#wrapper {float:left;width:100%;margin-left:-33%} -div.blocks3 #content {margin-left:33%;} -div.blocks2e #content {margin-left:33%;} -div.blocks2n #content {margin-left:33%;} -div.blocks1 #content {} -div#navigation {float:right;width:32.9%} -div#extra {float:right;clear:right;width:32.9%} +div#wrapper {float:left;width:100%;} +div.blocks3 #wrapper {width:75%;} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;} +div.blocks1 #wrapper {} +div#navigation {float:right;width:25%} +div#extra {float:right;clear:right;width:25%} div#footer {clear:both;width:100%} diff --git a/layouts/gala_26.css b/layouts/gala_26.css index c55d0b4..0f83d25 100644 --- a/layouts/gala_26.css +++ b/layouts/gala_26.css @@ -1,8 +1,8 @@ -div#wrapper {float:right;width:100%;margin-right:-33%} -div.blocks3 #content {margin-right:33%;} -div.blocks2e #content {margin-right:33%;} -div.blocks2n #content {margin-right:33%;} -div.blocks1 #content {} -div#navigation {float:left;width:32.9%} -div#extra {float:left;clear:left;width:32.9%} +div#wrapper {float:right;width:100%;} +div.blocks3 #wrapper {width:75%;} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;} +div.blocks1 #wrapper {} +div#navigation {float:left;width:25%} +div#extra {float:left;clear:left;width:25%} div#footer {clear:both;width:100%} diff --git a/layouts/gala_31.css b/layouts/gala_31.css index c3c662d..be64e26 100644 --- a/layouts/gala_31.css +++ b/layouts/gala_31.css @@ -1,7 +1,7 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-left:260px} -div.blocks2e #content {} -div.blocks2n #content {margin-left:260px} -div.blocks1 #content {} -div#navigation {float:left;width:260px;margin-left:-100%} +div.blocks3 #wrapper {width:75%;margin-left:240px} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;margin-left:240px} +div.blocks1 #wrapper {} +div#navigation {float:left;width:240px;margin-left:-100%} div#extra {clear:left;width:100%} diff --git a/layouts/gala_32.css b/layouts/gala_32.css index 71b0f12..ac353c3 100644 --- a/layouts/gala_32.css +++ b/layouts/gala_32.css @@ -1,7 +1,7 @@ div#wrapper {float:left;width:100%} -div.blocks3 #content {margin-right:260px} -div.blocks2e #content {} -div.blocks2n #content {margin-right:260px} -div.blocks1 #content {} -div#navigation {float:left;width:260px;margin-left:-260px} +div.blocks3 #wrapper {width:75%;margin-right:240px} +div.blocks2e #wrapper {width:75%;} +div.blocks2n #wrapper {width:75%;margin-right:240px} +div.blocks1 #wrapper {} +div#navigation {float:left;width:240px;margin-left:-240px} div#extra {clear:left;width:100%} diff --git a/layouts/gala_33.css b/layouts/gala_33.css index df83d17..2b7091b 100644 --- a/layouts/gala_33.css +++ b/layouts/gala_33.css @@ -1,9 +1,9 @@ -div#container {width:900px;margin:0 auto} -div#content {float:left;} -div.blocks3 #content {width:640px;} -div.blocks2e #content {width:640px;} -div.blocks2n #content {width:640px;} -div.blocks1 #content {width:900px;} -div#navigation {float:right;width:260px} -div#extra {float:right;clear:right;width:260px} +div#container {width:960px;margin:0 auto} +div#wrapper {float:left;} +div.blocks3 #wrapper {width:720px;} +div.blocks2e #wrapper {width:720px;} +div.blocks2n #wrapper {width:720px;} +div.blocks1 #wrapper {width:960px;} +div#navigation {float:right;width:240px} +div#extra {float:right;clear:right;width:240px} div#footer {clear:both;width:100%} diff --git a/layouts/gala_34.css b/layouts/gala_34.css index 05decb2..fa8face 100644 --- a/layouts/gala_34.css +++ b/layouts/gala_34.css @@ -1,9 +1,9 @@ -div#container {width:900px;margin:0 auto} -div#content {float:right;width:640px} -div.blocks3 #content {width:640px;} -div.blocks2e #content {width:640px;} -div.blocks2n #content {width:640px;} -div.blocks1 #content {width:900px;} -div#navigation {float:left;width:260px} -div#extra {float:left;clear:left;width:260px} +div#container {width:960px;margin:0 auto} +div#wrapper {float:right;width:720px} +div.blocks3 #wrapper {width:720px;} +div.blocks2e #wrapper {width:720px;} +div.blocks2n #wrapper {width:720px;} +div.blocks1 #wrapper {width:960px;} +div#navigation {float:left;width:240px} +div#extra {float:left;clear:left;width:240px} div#footer {clear:both;width:100%} diff --git a/layouts/gala_35.css b/layouts/gala_35.css index fc036fb..39e33af 100644 --- a/layouts/gala_35.css +++ b/layouts/gala_35.css @@ -1,13 +1,13 @@ -div#container {width:900px;margin:0 auto} -div#content {float:left;} -div.blocks3 #content {width:640px;} -div.blocks2e #content {width:900px;} -div.blocks2n #content {width:640px;} -div.blocks1 #content {width:900px;} -div#navigation {float:right;width:260px} +div#container {width:960px;margin:0 auto} +div#wrapper {float:left;} +div.blocks3 #wrapper {width:720px;} +div.blocks2e #wrapper {width:960px;} +div.blocks2n #wrapper {width:720px;} +div.blocks1 #wrapper {width:960px;} +div#navigation {float:right;width:240px} div#extra {float:left;} -div.blocks3 #extra {width:640px;} -div.blocks2e #extra {width:900px;} -div.blocks2n #extra {width:640px;} -div.blocks1 #extra {width:900px;} +div.blocks3 #extra {width:720px;} +div.blocks2e #extra {width:960px;} +div.blocks2n #extra {width:720px;} +div.blocks1 #extra {width:960px;} div#footer {clear:both;width:100%} diff --git a/layouts/gala_36.css b/layouts/gala_36.css index ef6539f..b9ea83c 100644 --- a/layouts/gala_36.css +++ b/layouts/gala_36.css @@ -1,13 +1,13 @@ -div#container {width:900px;margin:0 auto} -div#content {float:right;} -div.blocks3 #content {width:640px;} -div.blocks2e #content {width:900px;} -div.blocks2n #content {width:640px;} -div.blocks1 #content {width:900px;} -div#navigation {float:left;width:260px} -div#extra {float:right;width:640px} -div.blocks3 #extra {width:640px;} -div.blocks2e #extra {width:900px;} -div.blocks2n #extra {width:640px;} -div.blocks1 #extra {width:900px;} +div#container {width:960px;margin:0 auto} +div#wrapper {float:right;} +div.blocks3 #wrapper {width:720px;} +div.blocks2e #wrapper {width:960px;} +div.blocks2n #wrapper {width:720px;} +div.blocks1 #wrapper {width:960px;} +div#navigation {float:left;width:240px} +div#extra {float:right;width:720px} +div.blocks3 #extra {width:720px;} +div.blocks2e #extra {width:960px;} +div.blocks2n #extra {width:720px;} +div.blocks1 #extra {width:960px;} div#footer {clear:both;width:100%} diff --git a/layouts/gala_37.css b/layouts/gala_37.css index ee16699..e7e0ca7 100644 --- a/layouts/gala_37.css +++ b/layouts/gala_37.css @@ -1,8 +1,8 @@ -div#container {width:900px;margin:0 auto} -div#content {float:left;} -div.blocks3 #content {width:640px;} -div.blocks2e #content {width:900px;} -div.blocks2n #content {width:640px;} -div.blocks1 #content {width:900px;} -div#navigation {float:right;width:260px} +div#container {width:960px;margin:0 auto} +div#wrapper {float:left;} +div.blocks3 #wrapper {width:720px;} +div.blocks2e #wrapper {width:960px;} +div.blocks2n #wrapper {width:720px;} +div.blocks1 #wrapper {width:960px;} +div#navigation {float:right;width:240px} div#extra {clear:both;width:100%} diff --git a/layouts/gala_38.css b/layouts/gala_38.css index b14f40f..8e3e049 100644 --- a/layouts/gala_38.css +++ b/layouts/gala_38.css @@ -1,8 +1,8 @@ -div#container {width:900px;margin:0 auto} -div#content {float:right;} -div.blocks3 #content {width:640px;} -div.blocks2e #content {width:900px;} -div.blocks2n #content {width:640px;} -div.blocks1 #content {width:900px;} -div#navigation {float:left;width:260px} +div#container {width:960px;margin:0 auto} +div#wrapper {float:right;} +div.blocks3 #wrapper {width:720px;} +div.blocks2e #wrapper {width:960px;} +div.blocks2n #wrapper {width:720px;} +div.blocks1 #wrapper {width:960px;} +div#navigation {float:left;width:240px} div#extra {clear:both;width:100%} diff --git a/layouts/gala_39.css b/layouts/gala_39.css index f9dd3de..b5c5f3a 100644 --- a/layouts/gala_39.css +++ b/layouts/gala_39.css @@ -1,4 +1,4 @@ -div#container {width:900px;margin:0 auto} -div#navigation {float:left;width:450px} -div#extra {float:right;width:450px} +div#container {width:960px;margin:0 auto} +div#navigation {float:left;width:480px} +div#extra {float:right;width:480px} div#footer {clear:both;width:100%} diff --git a/layouts/gala_40.css b/layouts/gala_40.css index 709e88c..7c2406f 100644 --- a/layouts/gala_40.css +++ b/layouts/gala_40.css @@ -1,4 +1,4 @@ -div#container {width:900px;margin:0 auto} -div#navigation {float:right;width:450px} -div#extra {float:left;width:450px} +div#container {width:960px;margin:0 auto} +div#navigation {float:right;width:480px} +div#extra {float:left;width:480px} div#footer {clear:both;width:100%} diff --git a/layouts/resize.sh b/layouts/resize.sh index 075223f..c29a649 100755 --- a/layouts/resize.sh +++ b/layouts/resize.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "This script will resize statically sized layouts to whatever size you want. If you have not modified the script manually, it will resize pixel values to work -with a total width of 900px instead of the original 700px. If this is not what +with a total width of 960px instead of the original 700px. If this is not what you want, please edit this file manually to suit your needs." echo @@ -32,30 +32,30 @@ echo 1; sleep 1 echo echo "Executing substitutions." -# This sample script will resize all statically set dimensions to work with 900px instead of 800px +# This sample script will resize all statically set dimensions to work with 960px instead of 800px # total width -find . -name "*.css" -exec perl -i -wpe 's/700px/900px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/900px/960px/g' {} \; # half the total width -find . -name "*.css" -exec perl -i -wpe 's/350px/450px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/450px/480px/g' {} \; # one side column -find . -name "*.css" -exec perl -i -wpe 's/200px/260px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/260px/240px/g' {} \; # two side columns -find . -name "*.css" -exec perl -i -wpe 's/400px/520px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/520px/480px/g' {} \; # remainder of total width - one side column -find . -name "*.css" -exec perl -i -wpe 's/500px/640px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/540px/720px/g' {} \; # narrow side column (used when there are 2 side columns in a static layout) -find . -name "*.css" -exec perl -i -wpe 's/150px/220px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/220px/200px/g' {} \; # two narrow side columns -find . -name "*.css" -exec perl -i -wpe 's/300px/440px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/440px/400px/g' {} \; # remainder of total width - one narrow side column -find . -name "*.css" -exec perl -i -wpe 's/550px/680px/g' {} \; +find . -name "*.css" -exec perl -i -wpe 's/680px/560px/g' {} \; ## Use the replacements below to generate a very small layout that works with the layout_style.tar.gz -## This sample script will resize all statically set dimensions to work with 900px instead of 800px +## This sample script will resize all statically set dimensions to work with 960px instead of 800px ## total width #find . -name "*.css" -exec perl -i -wpe 's/700px/100px/g' {} \; ## half the total width |
