From f07d51cddf85a01fe27231b95b6123e4d8dbb34e Mon Sep 17 00:00:00 2001 From: Jesse Hofmann-Smith Date: Sat, 15 Mar 2014 15:59:21 -0700 Subject: [PATCH] fixing jerusalem marble layout --- .../jerusalem_marble/admin.jerusalem_marble.css | 43 +++++++- .../jerusalem_marble/jerusalem-marble.tpl.php | 100 ++++++++++++++++++ .../layouts/jerusalem_marble/jerusalem_marble.inc | 16 +-- .../layouts/jerusalem_marble/jerusalem_marble.png | Bin 1008 -> 1082 bytes .../sass/partials/_jerusalem_marble.scss | 114 ++++++++++++--------- 5 files changed, 213 insertions(+), 60 deletions(-) create mode 100644 plugins/layouts/jerusalem_marble/jerusalem-marble.tpl.php diff --git a/plugins/layouts/jerusalem_marble/admin.jerusalem_marble.css b/plugins/layouts/jerusalem_marble/admin.jerusalem_marble.css index ce31d67..0e04ed4 100644 --- a/plugins/layouts/jerusalem_marble/admin.jerusalem_marble.css +++ b/plugins/layouts/jerusalem_marble/admin.jerusalem_marble.css @@ -3,17 +3,52 @@ * Bedrock Jerusalem Marble panels layout Admin CSS. */ -.jerusalem_marble-content-header { +.jerusalem-marble-column-container { margin-bottom: 1%; } -.jerusalem_marble-column { +.jerusalem-marble-content-header { + margin-bottom: 1%; +} + +.jerusalem-marble-column { + float: left; + margin-right: 1%; + width: 24%; +} +.jerusalem-marble-column-two { + margin-right: 1%; + width: 24%; +} +.jerusalem-marble-column-three { + margin-right: 1%; + width: 24%; +} +.jerusalem-marble-column-four { + margin-right: 0; + width: 25%; +} + +.jerusalem-marble-column-mid-left { float: left; margin-right: 1%; width: 49%; } +.jerusalem-marble-column-mid-right { + margin-right: 0; + width: 50%; +} -.jerusalem_marble-column-right { +.jerusalem-marble-column-lower-left { + float: left; + margin-right: 1%; + width: 49%; +} +.jerusalem-marble-column-lower-right { margin-right: 0; - width: 25%; + width: 50%; } + +.jerusalem-marble-content-footer { + margin-top: 1%; +} \ No newline at end of file diff --git a/plugins/layouts/jerusalem_marble/jerusalem-marble.tpl.php b/plugins/layouts/jerusalem_marble/jerusalem-marble.tpl.php new file mode 100644 index 0000000..a52f697 --- /dev/null +++ b/plugins/layouts/jerusalem_marble/jerusalem-marble.tpl.php @@ -0,0 +1,100 @@ + + +
> + +
+ + +
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+ + +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ +
+ + +
+ +
diff --git a/plugins/layouts/jerusalem_marble/jerusalem_marble.inc b/plugins/layouts/jerusalem_marble/jerusalem_marble.inc index 971fd4c..0011bc1 100644 --- a/plugins/layouts/jerusalem_marble/jerusalem_marble.inc +++ b/plugins/layouts/jerusalem_marble/jerusalem_marble.inc @@ -2,7 +2,7 @@ /** * @file - * Bedrock Granite panels layout plugin. + * Bedrock Jerusalem Marble panels layout plugin. */ // Plugin definition @@ -14,10 +14,14 @@ $plugin = array( 'admin css' => 'admin.jerusalem_marble.css', 'regions' => array( 'content_header' => t('Content Header'), - 'column_left' => t('Column Left'), - 'column_inner_left' => t('Column Inner Left'), - 'column_inner_right' => t('Column Inner Right'), - 'column_right' => t('Column Right'), - 'content_full' => t('Column Full-Width'), + 'column_one' => t('Column One'), + 'column_two' => t('Column Two'), + 'column_three' => t('Column Three'), + 'column_four' => t('Column Four'), + 'column_mid_left' => t('Column Mid-Left'), + 'column_mid_right' => t('Column Mid-Right'), + 'column_lower_left' => t('Column Lower-Left'), + 'column_lower_right' => t('Column Lower-Right'), + 'content_footer' => t('Content Footer'), ), ); diff --git a/plugins/layouts/jerusalem_marble/jerusalem_marble.png b/plugins/layouts/jerusalem_marble/jerusalem_marble.png index 0e5b66ef529505584d92cf4a4c3b411935544f03..d2c769f00d50b594b5648cbd1772c6faf16ae81a 100644 GIT binary patch literal 1082 zcmaJ=Uq}=|7~f1myd*^u6pC@RH}Ce({qr`j5`m-D zu4=5JD5^TqDJIFxldr3?jQkhP*e;nGa6FBB(E!fM7Nnvo%0Q6N#G9oK2uZOc?~7PrdI)1vV3=$+ z>&bdO$Qoq0P$=YR@VuKK-1eA(<(%8Fn+pmev=vJ;v4#xbD9RZ$io-OCbUy{%EXo>o z{+h^zF*(^}I1lTjQ~*lS|Dn2GMB6wC590l&u$>w+A(MnQ8nqNsxPfNJl_|t5C}U)$ z5E?1mV$Tr5$R0u_i1qq`BrBTX*n4y2AYUd_K7zI8i%Y?pt_teE0tRJ86FX zjr45U84FJ`I~$2Qae>|VcJt??>-mw@)CVE+@~yJ%Zf$M7x72^~eO>d%=-P|A+10+^ z?W=S+5IAo1(Wi7PrA zje(hgfq{X6Au+kQz%d}ehk=2CAum5Kl>rqnGBA9*#=ywHz<L4HwU zNoooM0|V3!27d+y240u^5(W3f%sd4n162kpgNVo|1qcffJ_s=cNG>fZg9jx8g8+j9 zg8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCGm^qSpA@ds+OO_6nTdaDl zt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JbzL=Q+b7WC-DjMP2-p0Uo4;_ zutU&Q@QP5X&=28W5fzcWqT!-n#3qRwiC>YZkd%`=CY3KOEqy|!Ojcd?mRz5_i~Jvj zt%`+8dP;AV*Qyk#nyCI%JE-2J5vr-A`9bS|_9UHDT`N67y;u523>FyH8pRmfn#h|n zo4z!=V1K^TVu|Ght2*mkn>gD*J6C&a2V+MaCpBj!7X?>&HwAZP4|PvnFB5MYA9vqi zzXbpMfcn6RK}&;ognhg9Nrj-K4POhLkm_H`6&XEHX2* z=4M~aWzVzEuPE45_^w#HB&&2)*_#Ue%95&GHGhn?UUgIJA2#YW)ij@Nm1`?(KiVnX zRn&dDSGBLP|L#PaNwX*aof<#w@C=Qa{jz2$~&n@l!u*=n+F`wpv}`**wUIlC`x|AT`$hkhPuKPG;B#YyW^=guUb{dIoQ zMStx}N3SGa{daxNO`BVH@6_K@zJKCj-ea*R`=4dL5P5mg$5< z;Xeg_o%+-I&+-3%01W^SH2RkDT>t<8AY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQAR zU;qF*m;eA5Z<1fdMgRZ+Qb|NXRCwC#)?P6R03i%S(adRcCQm!t+sG&gD?e45R|sE- zT5O$Q_cGeD+_w-lw;;mwQ7Xd1I6ep=3&iyizjPIONB7ays7ta;BdU T9EDVb00000NkvXXu0mjf|B|WO diff --git a/plugins/layouts/jerusalem_marble/sass/partials/_jerusalem_marble.scss b/plugins/layouts/jerusalem_marble/sass/partials/_jerusalem_marble.scss index 7bf5fd8..28acffd 100644 --- a/plugins/layouts/jerusalem_marble/sass/partials/_jerusalem_marble.scss +++ b/plugins/layouts/jerusalem_marble/sass/partials/_jerusalem_marble.scss @@ -11,25 +11,26 @@ // - $grids, set at global breakpoints // - $gutters, set at global breakpoints // Optional Variables -// - $jerusalem_marble-grid-height +// - $jerusalem-marble-grid-height //////////////////////// -@mixin jerusalem_marble-grid-height { - $jerusalem_marble-grid-height: false !default; +@mixin jerusalem-marble-grid-height { + $jerusalem-marble-grid-height: false !default; - @if $jerusalem_marble-grid-height { - max-height: $jerusalem_marble-grid-height; - min-height: $jerusalem_marble-grid-height; + @if $jerusalem-marble-grid-height { + max-height: $jerusalem-marble-grid-height; + min-height: $jerusalem-marble-grid-height; } } /* * Jerusalem Marble Layout */ -.jerusalem_marble { +.jerusalem-marble { //@include background-grid; - .jerusalem_marble-content-header { + .jerusalem-marble-content-header, + .jerusalem-marble-content-footer { @include grid-span(3, 1); @include breakpoint($small) { @@ -59,7 +60,7 @@ } } - .jerusalem_marble-column-container { + .jerusalem-marble-column-container { @include grid-span(3, 1); @include breakpoint($small) { @@ -78,7 +79,7 @@ @include grid-span(30, 1); } - .jerusalem_marble-column-left { + .jerusalem-marble-column-one { @include grid-span(3, 1); @include breakpoint($small) { @@ -90,15 +91,15 @@ } @include breakpoint($large) { - @include grid-span(15, 1); + @include grid-span(7.5, 1); } @include breakpoint($xlarge) { - @include grid-span(15, 1); + @include grid-span(7.5, 1); } } - .jerusalem_marble-column-inner-left { + .jerusalem-marble-column-two { @include grid-span(3, 1); @include breakpoint($small) { @@ -106,19 +107,19 @@ } @include breakpoint($medium) { - @include grid-span(9, 1); + @include grid-span(9, 10); } @include breakpoint($large) { - @include grid-span(15, 1); + @include grid-span(7.5, 8); } @include breakpoint($xlarge) { - @include grid-span(15, 1); + @include grid-span(7.5, 8); } } - .jerusalem_marble-column-inner-right { + .jerusalem-marble-column-three { @include grid-span(3, 1); @include breakpoint($small) { @@ -126,19 +127,19 @@ } @include breakpoint($medium) { - @include grid-span(9, 10); + @include grid-span(9, 1); } @include breakpoint($large) { - @include grid-span(15, 16); + @include grid-span(7.5, 16); } @include breakpoint($xlarge) { - @include grid-span(15, 16); + @include grid-span(7.5, 16); } } - .jerusalem_marble-column-right { + .jerusalem-marble-column-four { @include grid-span(3, 1); @include breakpoint($small) { @@ -150,52 +151,65 @@ } @include breakpoint($large) { - @include grid-span(15, 16); + @include grid-span(7.5, 23); } @include breakpoint($xlarge) { - @include grid-span(15, 16); + @include grid-span(7.5, 23); } } - .jerusalem_marble-column { - .panel-pane { - @include jerusalem_marble-grid-height; - margin-bottom: 1em; + .jerusalem-marble-column-mid-left, + .jerusalem-marble-column-lower-left { + @include grid-span(3, 1); - &:last-child { - margin-bottom: 0; - } + @include breakpoint($small) { + @include grid-span(6, 1); } - } - .jerusalem_marble-content-full-width { - @include grid-span(3, 1); - @include breakpoint($small) { - @include grid-span(6, 1); - } + @include breakpoint($medium) { + @include grid-span(18, 1); + } - @include breakpoint($medium) { - @include grid-span(18, 1); - } + @include breakpoint($large) { + @include grid-span(15, 1); + } - @include breakpoint($large) { - @include grid-span(30, 1); + @include breakpoint($xlarge) { + @include grid-span(15, 1); + } } - @include breakpoint($xlarge) { - @include grid-span(30, 1); - } + .jerusalem-marble-column-mid-right, + .jerusalem-marble-column-lower-right { + @include grid-span(3, 1); - margin-bottom: 1em; + @include breakpoint($small) { + @include grid-span(6, 1); + } - .panel-pane { - margin-bottom: 1em; + @include breakpoint($medium) { + @include grid-span(18, 1); + } - &:last-child { - margin-bottom: 0; + @include breakpoint($large) { + @include grid-span(15, 16); + } + + @include breakpoint($xlarge) { + @include grid-span(15, 16); + } + } + + .jerusalem-marble-column { + .panel-pane { + @include jerusalem-marble-grid-height; + margin-bottom: 1em; + + &:last-child { + margin-bottom: 0; + } } } - } } } -- 1.8.3.4 (Apple Git-47)