commit 88aecc78f1f3342d48b10d8aa9c878819123b206 Author: jwilson3 Date: Wed Feb 22 09:45:11 2012 -0500 Issue #1277886 by jwilson3: Coding standards for EOF and EOL. diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 040351d..3dfeea0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -15,8 +15,8 @@ Project Page: http://drupal.org/project/omega Issue Queue: http://drupal.org/project/issues/omega Usage Stats: http://drupal.org/project/usage/omega Twitter: http://twitter.com/Omeglicon -Maintainer(s): - Jake Strawn +Maintainer(s): + Jake Strawn http://himerus.com http://developmentgeeks.com http://facebook.com/developmentgeeks @@ -34,7 +34,7 @@ CHANGELOG.txt to track changes to the Omega theme. ########################################################################################## ##### Current Release: 7.x-3.0-rc2 ##### Pending changes for Next Release -########################################################################################## +########################################################################################## 7/31/11 ========= @@ -42,14 +42,14 @@ CHANGELOG.txt to track changes to the Omega theme. 7/29/11 ========= -#983758 - Panels Integration #1. This might not yet cover mini panels. +#983758 - Panels Integration #1. This might not yet cover mini panels. #1233550 - Fixed a bug that caused zones to be incorrectly described as "empty" in the theme settings. ########################################################################################## ##### Changes in: 7.x-3.0-rc1 -########################################################################################## +########################################################################################## 7/27/11 ========= @@ -64,7 +64,7 @@ no unassigned regions" message when there are unassigned regions. ########################################################################################## ##### Changes in: 7.x-3.0-beta2 -########################################################################################## +########################################################################################## 7/25/11 ========= @@ -104,7 +104,7 @@ by default. ########################################################################################## ##### Changes in: 7.x-3.0-beta2 -########################################################################################## +########################################################################################## 6/29/11 ========= @@ -116,7 +116,7 @@ by default. ########################################################################################## ##### Changes in: 7.x-3.0-beta1 -########################################################################################## +########################################################################################## 6/27/11 ========= @@ -134,7 +134,7 @@ CSS classes. This is now fixed. 6/17/11 ========= -#1191764 - We are no longer use unset() on regions if they are not enabled. Instead move +#1191764 - We are no longer use unset() on regions if they are not enabled. Instead move them to #excluded so that subthemes can use them later (in hook_page_alter). #1191762 - Added a JavaScript "Library" to check if a media query / grid layout applies. @@ -180,4 +180,4 @@ to override the built-in Omega and Alpha stylesheets. Also setting the Alpha sty to a weight of -20. #1184006 - Replaced the debugging blocks with simple markup elements. They have the same -functionality but come with less problems. \ No newline at end of file +functionality but come with less problems. diff --git a/README.txt b/README.txt index a3e04e4..303c6a8 100644 --- a/README.txt +++ b/README.txt @@ -16,8 +16,8 @@ Project Page: http://drupal.org/project/omega Issue Queue: http://drupal.org/project/issues/omega Usage Stats: http://drupal.org/project/usage/omega Twitter: http://twitter.com/Omeglicon -Maintainer(s): - Jake Strawn +Maintainer(s): + Jake Strawn http://himerus.com http://developmentgeeks.com http://facebook.com/developmentgeeks @@ -31,12 +31,12 @@ Maintainer(s): Omega Theme Information ======================= The Omega theme is the most powerful and flexible base theme available for Drupal 7. -Omega includes HTML5, CSS3 responsive layouts, customizable grids based on 960.gs, advanced -preprocess functionality, and integration with Delta/Context modules to provide different +Omega includes HTML5, CSS3 responsive layouts, customizable grids based on 960.gs, advanced +preprocess functionality, and integration with Delta/Context modules to provide different layouts based on context. -Omega 3.x has been completely rewritten for performance enhancements and a host of new -features. Every region/zone is now fully configurable in the theme settings UI, and can be +Omega 3.x has been completely rewritten for performance enhancements and a host of new +features. Every region/zone is now fully configurable in the theme settings UI, and can be placed anywhere you like on a page without having to edit/manipulate templates. Additional 960gs/Omega Resources @@ -73,8 +73,7 @@ Creating your Omega Sub Theme (Manually) * visit /admin/appearance * Click “Enable and set default” on the appropriate subtheme you’ve created. - Contributors ============ - himerus (Jake Strawn) -- fubhy (Sebastian Siemssen) \ No newline at end of file +- fubhy (Sebastian Siemssen) diff --git a/UPGRADE.txt b/UPGRADE.txt index 4dfe4ce..3e5ca33 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -16,8 +16,8 @@ Project Page: http://drupal.org/project/omega Issue Queue: http://drupal.org/project/issues/omega Usage Stats: http://drupal.org/project/usage/omega Twitter: http://twitter.com/Omeglicon -Maintainer(s): - Jake Strawn +Maintainer(s): + Jake Strawn http://himerus.com http://developmentgeeks.com http://facebook.com/developmentgeeks @@ -32,4 +32,4 @@ Maintainer(s): This document will provide an outline of upgrading Omega 2.x subthemes to Omega 3.x -@todo \ No newline at end of file +@todo diff --git a/alpha/alpha.info b/alpha/alpha.info index 537a9b6..bb19397 100644 --- a/alpha/alpha.info +++ b/alpha/alpha.info @@ -211,4 +211,4 @@ settings[alpha_region_footer_prefix] = '' settings[alpha_region_footer_columns] = '12' settings[alpha_region_footer_suffix] = '' settings[alpha_region_footer_weight] = '' -settings[alpha_region_footer_css] = '' \ No newline at end of file +settings[alpha_region_footer_css] = '' diff --git a/alpha/css/alpha-debug.css b/alpha/css/alpha-debug.css index ad752f5..5855070 100644 --- a/alpha/css/alpha-debug.css +++ b/alpha/css/alpha-debug.css @@ -1,14 +1,14 @@ -.alpha-grid-debug .grid-1:hover, .alpha-grid-debug .grid-2:hover, +.alpha-grid-debug .grid-1:hover, .alpha-grid-debug .grid-2:hover, .alpha-grid-debug .grid-3:hover, .alpha-grid-debug .grid-4:hover, -.alpha-grid-debug .grid-5:hover, .alpha-grid-debug .grid-6:hover, +.alpha-grid-debug .grid-5:hover, .alpha-grid-debug .grid-6:hover, .alpha-grid-debug .grid-7:hover, .alpha-grid-debug .grid-8:hover, -.alpha-grid-debug .grid-9:hover, .alpha-grid-debug .grid-10:hover, +.alpha-grid-debug .grid-9:hover, .alpha-grid-debug .grid-10:hover, .alpha-grid-debug .grid-11:hover, .alpha-grid-debug .grid-12:hover, -.alpha-grid-debug .grid-13:hover, .alpha-grid-debug .grid-14:hover, +.alpha-grid-debug .grid-13:hover, .alpha-grid-debug .grid-14:hover, .alpha-grid-debug .grid-15:hover, .alpha-grid-debug .grid-16:hover, -.alpha-grid-debug .grid-17:hover, .alpha-grid-debug .grid-18:hover, +.alpha-grid-debug .grid-17:hover, .alpha-grid-debug .grid-18:hover, .alpha-grid-debug .grid-19:hover, .alpha-grid-debug .grid-21:hover, -.alpha-grid-debug .grid-21:hover, .alpha-grid-debug .grid-22:hover, +.alpha-grid-debug .grid-21:hover, .alpha-grid-debug .grid-22:hover, .alpha-grid-debug .grid-23:hover, .alpha-grid-debug .grid-24:hover { background-color: rgba(0, 115, 186, .2); } @@ -25,7 +25,7 @@ display: block; margin: 0 0 10px 0; padding: 9px 12px; - border: 1px solid #ccc; + border: 1px solid #ccc; background-color: rgba(255, 255, 255, .25); } @@ -38,7 +38,7 @@ font-weight: normal; } -.alpha-region-debug .alpha-debug-block h2 { +.alpha-region-debug .alpha-debug-block h2 { color: #888; } @@ -104,4 +104,4 @@ .alpha-block-toggle:focus, .alpha-block-toggle:active { width: 72px; -} \ No newline at end of file +} diff --git a/alpha/css/alpha-mobile.css b/alpha/css/alpha-mobile.css index 2bc138b..335ffd6 100644 --- a/alpha/css/alpha-mobile.css +++ b/alpha/css/alpha-mobile.css @@ -1,6 +1,6 @@ /** - * This will display them grid elements as block rather than inline for mobile browsers - * (essentially anything smaller than the narrow grid size, and media query declares. + * This will display them grid elements as block rather than inline for mobile browsers + * (essentially anything smaller than the narrow grid size, and media query declares. */ .grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, diff --git a/alpha/css/alpha-reset.css b/alpha/css/alpha-reset.css index d67a751..f4c13ea 100644 --- a/alpha/css/alpha-reset.css +++ b/alpha/css/alpha-reset.css @@ -1,78 +1,78 @@ html, body, div { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; font: inherit; } h1, h2, h3, h4, h5, h6 { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - font: inherit; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; + font: inherit; font-weight: bold; } a, p, ul, ol, li, img, span, strong, em { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; font: inherit; } table, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; font: inherit; } applet, object, iframe, blockquote, pre, abbr, acronym, address, big, cite, code, del, dfn, font, ins, kbd, q, s, samp, small, strike, sub, sup, tt, var, b, u, i, center, dl, dt, dd, caption, fieldset, form, label, legend { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; font: inherit; } article, aside, figure, footer, header, hgroup, section { - margin: 0; - padding: 0; - border: 0; + margin: 0; + padding: 0; + border: 0; outline: 0; - font-size: 100%; - vertical-align: baseline; + font-size: 100%; + vertical-align: baseline; font: inherit; } canvas, details, embed, figcaption, menu, nav, output, ruby, summary, time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; font: inherit; } /* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; } @@ -123,4 +123,4 @@ del { table { border-collapse: collapse; border-spacing: 0; -} \ No newline at end of file +} diff --git a/alpha/css/alpha-theme-settings.css b/alpha/css/alpha-theme-settings.css index 7b59720..13b0742 100644 --- a/alpha/css/alpha-theme-settings.css +++ b/alpha/css/alpha-theme-settings.css @@ -4,7 +4,7 @@ padding: 10px; color: #884400; } - + div.vertical-tabs .vertical-tabs-panes .vertical-tabs-pane fieldset { border: 1px solid #ccc; margin: 1em 0; @@ -48,4 +48,4 @@ fieldset fieldset fieldset { fieldset fieldset fieldset fieldset { background-color: #F6F6F6; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css index f47cc56..d993634 100644 --- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css +++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { float: right; } @@ -33,7 +33,7 @@ .container-12 .prefix-1 { padding-left: 0; - padding-right: 8.333%; + padding-right: 8.333%; } .container-12 .prefix-2 { @@ -245,4 +245,4 @@ .container-12 .pull-11 { right: -91.667%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12.css index 4b3cee4..6b3055b 100644 --- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12.css +++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-12.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { display: inline; float: left; @@ -285,4 +285,4 @@ .container-12 .pull-11 { left: -91.667%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css index 010dba4..7cd1b56 100644 --- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css +++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { float: right; } @@ -317,4 +317,4 @@ .container-16 .pull-15 { right: -93.75%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16.css index 605013c..5efc963 100644 --- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16.css +++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-16.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { display: inline; float: left; @@ -366,4 +366,4 @@ .container-16 .pull-15 { left: -93.75%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css index add2bba..ecb46e9 100644 --- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css +++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24-rtl.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { float: right; } @@ -462,4 +462,4 @@ .container-24 .pull-23 { right: -95.833%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24.css b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24.css index 22ffe6e..de7bf47 100644 --- a/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24.css +++ b/alpha/css/grid/alpha_default/fluid/alpha-default-fluid-24.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { display: inline; float: left; @@ -529,4 +529,4 @@ .container-24 .pull-23 { left: -95.833%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12-rtl.css b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12-rtl.css index f916704..8a6daf1 100644 --- a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12-rtl.css +++ b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { float: right; } @@ -245,4 +245,4 @@ .container-12 .pull-11 { right: -660px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.css b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.css index 8dede8e..6fb0a8d 100644 --- a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.css +++ b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { display: inline; float: left; @@ -301,4 +301,4 @@ body { .container-12 .pull-11 { left: -660px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.png b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.png index d6e204e..37fb990 100644 Binary files a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.png and b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-12.png differ diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16-rtl.css b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16-rtl.css index 673941f..00b362c 100644 --- a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16-rtl.css +++ b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { float: right; } @@ -317,4 +317,4 @@ .container-16 .pull-15 { right: -675px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.css b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.css index 143b67c..e1a9be4 100644 --- a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.css +++ b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { display: inline; float: left; @@ -382,4 +382,4 @@ body { .container-16 .pull-15 { left: -675px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.png b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.png index e60e268..b6c7ff4 100644 Binary files a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.png and b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-16.png differ diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24-rtl.css b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24-rtl.css index c6881f1..c21771d 100644 --- a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24-rtl.css +++ b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24-rtl.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { float: right; } @@ -462,4 +462,4 @@ .container-24 .pull-23 { right: -690px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.css b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.css index cc14e6a..24912fe 100644 --- a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.css +++ b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { display: inline; float: left; @@ -545,4 +545,4 @@ body { .container-24 .pull-23 { left: -690px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.png b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.png index 1690e12..3608e1b 100644 Binary files a/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.png and b/alpha/css/grid/alpha_default/narrow/alpha-default-narrow-24.png differ diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-12-rtl.css b/alpha/css/grid/alpha_default/normal/alpha-default-normal-12-rtl.css index 6dc01e3..a5f6780 100644 --- a/alpha/css/grid/alpha_default/normal/alpha-default-normal-12-rtl.css +++ b/alpha/css/grid/alpha_default/normal/alpha-default-normal-12-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { float: right; } @@ -92,57 +92,57 @@ * ========================================================== */ -.container-12 .suffix-1 { +.container-12 .suffix-1 { padding-right: 0; padding-left: 80px; } -.container-12 .suffix-2 { +.container-12 .suffix-2 { padding-right: 0; padding-left: 160px; } -.container-12 .suffix-3 { +.container-12 .suffix-3 { padding-right: 0; padding-left: 240px; } -.container-12 .suffix-4 { +.container-12 .suffix-4 { padding-right: 0; padding-left: 320px; } -.container-12 .suffix-5 { +.container-12 .suffix-5 { padding-right: 0; padding-left: 400px; } -.container-12 .suffix-6 { +.container-12 .suffix-6 { padding-right: 0; padding-left: 480px; } -.container-12 .suffix-7 { +.container-12 .suffix-7 { padding-right: 0; padding-left: 560px; } -.container-12 .suffix-8 { +.container-12 .suffix-8 { padding-right: 0; padding-left: 640px; } -.container-12 .suffix-9 { +.container-12 .suffix-9 { padding-right: 0; padding-left: 720px; } -.container-12 .suffix-10 { +.container-12 .suffix-10 { padding-right: 0; padding-left: 800px; } -.container-12 .suffix-11 { +.container-12 .suffix-11 { padding-right: 0; padding-left: 880px; } @@ -245,4 +245,4 @@ .container-12 .pull-11 { right: -880px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.css b/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.css index 2d26880..b9153e2 100644 --- a/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.css +++ b/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { display: inline; float: left; @@ -301,4 +301,4 @@ body { .container-12 .pull-11 { left: -880px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.png b/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.png index 7439915..bd72e13 100644 Binary files a/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.png and b/alpha/css/grid/alpha_default/normal/alpha-default-normal-12.png differ diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-16-rtl.css b/alpha/css/grid/alpha_default/normal/alpha-default-normal-16-rtl.css index 0aa83cf..db20e6b 100644 --- a/alpha/css/grid/alpha_default/normal/alpha-default-normal-16-rtl.css +++ b/alpha/css/grid/alpha_default/normal/alpha-default-normal-16-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { float: right; } @@ -317,4 +317,4 @@ .container-16 .pull-15 { right: -900px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.css b/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.css index a7197e2..51bd8cf 100644 --- a/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.css +++ b/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { display: inline; float: left; @@ -382,4 +382,4 @@ body { .container-16 .pull-15 { left: -900px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.png b/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.png index d6e204e..37fb990 100644 Binary files a/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.png and b/alpha/css/grid/alpha_default/normal/alpha-default-normal-16.png differ diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-24-rtl.css b/alpha/css/grid/alpha_default/normal/alpha-default-normal-24-rtl.css index 25649c5..cd6b49e 100644 --- a/alpha/css/grid/alpha_default/normal/alpha-default-normal-24-rtl.css +++ b/alpha/css/grid/alpha_default/normal/alpha-default-normal-24-rtl.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { float: right; } @@ -462,4 +462,4 @@ .container-24 .pull-23 { right: -920px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.css b/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.css index c0b72bf..a2ec1cf 100644 --- a/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.css +++ b/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { display: inline; float: left; @@ -545,4 +545,4 @@ body { .container-24 .pull-23 { left: -920px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.png b/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.png index 86dfeb5..9332b25 100644 Binary files a/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.png and b/alpha/css/grid/alpha_default/normal/alpha-default-normal-24.png differ diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-12-rtl.css b/alpha/css/grid/alpha_default/wide/alpha-default-wide-12-rtl.css index 596c23e..27cafec 100644 --- a/alpha/css/grid/alpha_default/wide/alpha-default-wide-12-rtl.css +++ b/alpha/css/grid/alpha_default/wide/alpha-default-wide-12-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { float: right; } @@ -245,4 +245,4 @@ .container-12 .pull-11 { right: -1100px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.css b/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.css index c0acca7..9734096 100644 --- a/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.css +++ b/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { display: inline; float: left; @@ -301,4 +301,4 @@ body { .container-12 .pull-11 { left: -1100px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.png b/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.png index bad7c03..21aa8b0 100644 Binary files a/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.png and b/alpha/css/grid/alpha_default/wide/alpha-default-wide-12.png differ diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-16-rtl.css b/alpha/css/grid/alpha_default/wide/alpha-default-wide-16-rtl.css index d582a28..1867832 100644 --- a/alpha/css/grid/alpha_default/wide/alpha-default-wide-16-rtl.css +++ b/alpha/css/grid/alpha_default/wide/alpha-default-wide-16-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { float: right; } @@ -317,4 +317,4 @@ .container-16 .pull-15 { right: -1125px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.css b/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.css index a696344..3796213 100644 --- a/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.css +++ b/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { display: inline; float: left; @@ -382,4 +382,4 @@ body { .container-16 .pull-15 { left: -1125px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.png b/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.png index f47482d..af1c326 100644 Binary files a/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.png and b/alpha/css/grid/alpha_default/wide/alpha-default-wide-16.png differ diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-24-rtl.css b/alpha/css/grid/alpha_default/wide/alpha-default-wide-24-rtl.css index 68b2e9c..0174b7b 100644 --- a/alpha/css/grid/alpha_default/wide/alpha-default-wide-24-rtl.css +++ b/alpha/css/grid/alpha_default/wide/alpha-default-wide-24-rtl.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { float: right; } @@ -462,4 +462,4 @@ .container-24 .pull-23 { right: -1150px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.css b/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.css index 988deb6..754e42c 100644 --- a/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.css +++ b/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { display: inline; float: left; @@ -545,4 +545,4 @@ body { .container-24 .pull-23 { left: -1150px; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.png b/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.png index f4d8aeb..d0c6323 100644 Binary files a/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.png and b/alpha/css/grid/alpha_default/wide/alpha-default-wide-24.png differ diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css index f47cc56..d993634 100644 --- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css +++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { float: right; } @@ -33,7 +33,7 @@ .container-12 .prefix-1 { padding-left: 0; - padding-right: 8.333%; + padding-right: 8.333%; } .container-12 .prefix-2 { @@ -245,4 +245,4 @@ .container-12 .pull-11 { right: -91.667%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12.css index 6c97a63..e6d3185 100644 --- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12.css +++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-12.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { display: inline; float: left; @@ -297,4 +297,4 @@ .container-12 .pull-11 { left: -91.667%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css index 010dba4..7cd1b56 100644 --- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css +++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16-rtl.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { float: right; } @@ -317,4 +317,4 @@ .container-16 .pull-15 { right: -93.75%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16.css index 4d16ca9..30fdce1 100644 --- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16.css +++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-16.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { display: inline; float: left; @@ -378,4 +378,4 @@ .container-16 .pull-15 { left: -93.75%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css index add2bba..ecb46e9 100644 --- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css +++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24-rtl.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { float: right; } @@ -462,4 +462,4 @@ .container-24 .pull-23 { right: -95.833%; -} \ No newline at end of file +} diff --git a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24.css b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24.css index 8adbb74..4af78b6 100644 --- a/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24.css +++ b/alpha/css/grid/alpha_fluid/normal/alpha-fluid-normal-24.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { display: inline; float: left; @@ -541,4 +541,4 @@ .container-24 .pull-23 { left: -95.833%; -} \ No newline at end of file +} diff --git a/alpha/images/block-toggle.png b/alpha/images/block-toggle.png index b9bc0bf..029fca1 100644 Binary files a/alpha/images/block-toggle.png and b/alpha/images/block-toggle.png differ diff --git a/alpha/images/grid-toggle.png b/alpha/images/grid-toggle.png index 88efcef..e95b917 100644 Binary files a/alpha/images/grid-toggle.png and b/alpha/images/grid-toggle.png differ diff --git a/alpha/images/resize-handle.png b/alpha/images/resize-handle.png index b395d15..f4d4045 100644 Binary files a/alpha/images/resize-handle.png and b/alpha/images/resize-handle.png differ diff --git a/alpha/includes/alpha.inc b/alpha/includes/alpha.inc index bf04b4e..2dc0dd0 100644 --- a/alpha/includes/alpha.inc +++ b/alpha/includes/alpha.inc @@ -7,106 +7,106 @@ /** * A wrapper function for theme_get_settings(). - * + * * @param $name - * The name of the setting that you want to retrieve. + * The name of the setting that you want to retrieve. * @param $default (optional) * The name (key) of the theme that you want to fetch the - * setting for. Defaults to NULL. + * setting for. Defaults to NULL. * @param $theme (optional) * The key (machin-readable name) of a theme. Defaults to the key of the * current theme if not defined. - * - * @see + * + * @see * theme_get_setting(). */ function alpha_theme_get_setting($name, $default = NULL, $theme = NULL) { $setting = theme_get_setting($name, $theme); - - return isset($setting) ? $setting : $default; + + return isset($setting) ? $setting : $default; } /** * A helper function for retrieving zone settings. - * + * * @param $name - * The name of the setting that you want to retrieve. + * The name of the setting that you want to retrieve. * @param $zone - * The zone that you want to fetch the setting for. + * The zone that you want to fetch the setting for. * @param $default (optional) * The name (key) of the theme that you want to fetch the - * setting for. Defaults to NULL. + * setting for. Defaults to NULL. * @param $theme (optional) * The key (machin-readable name) of a theme. Defaults to the key of the * current theme if not defined. - * - * @see + * + * @see * alpha_theme_get_setting(). - * + * * @see * theme_get_setting(). */ function alpha_zone_get_setting($name, $zone, $default = NULL, $theme = NULL) { $setting = theme_get_setting('alpha_zone_' . $zone . '_' . $name, $theme); - + return isset($setting) ? $setting : $default; } /** * A helper function for retrieving region settings. - * + * * @param $name - * The name of the setting that you want to retrieve. + * The name of the setting that you want to retrieve. * @param $region - * The region that you want to fetch the setting for. + * The region that you want to fetch the setting for. * @param $default (optional) * The name (key) of the theme that you want to fetch the - * setting for. Defaults to NULL. + * setting for. Defaults to NULL. * @param $theme (optional) * The key (machin-readable name) of a theme. Defaults to the key of the * current theme if not defined. - * - * @see + * + * @see * alpha_theme_get_setting(). - * + * * @see * theme_get_setting(). */ function alpha_region_get_setting($name, $region, $default = NULL, $theme = NULL) { $setting = theme_get_setting('alpha_region_' . $region . '_' . $name, $theme); - + return isset($setting) ? $setting : $default; } /** - * Invokes a preprocess or process hook in all base themes aswell - * as the subtheme (in that order) by including the corresponding + * Invokes a preprocess or process hook in all base themes aswell + * as the subtheme (in that order) by including the corresponding * .inc file and calling the associated function. - * + * * @param $type - * The type of the hook. Can be preprocess or process. + * The type of the hook. Can be preprocess or process. * @param $hook - * The name of the hook. + * The name of the hook. * @param &$vars * An array of variables belonging to the (pre)process hook. * Handed by reference. */ function alpha_invoke($type, $hook, &$vars) { $theme = alpha_get_theme(); - + // If one of the themes in the theme trail implements this hook // include the corresponding .inc file and call the associated function. foreach (alpha_theme_trail($theme->theme) as $key => $name) { $function = $key . '_alpha_' . $type . '_' . $hook; - + if (!function_exists($function)) { $file = drupal_get_path('theme', $key) . '/' . $type . '/' . $type . '-' . str_replace('_', '-', $hook) . '.inc'; - + if (is_file($file)) { include $file; } } - + if (function_exists($function)) { $function($vars); } @@ -114,18 +114,18 @@ function alpha_invoke($type, $hook, &$vars) { } /** - * This function "fixes" drupal_alter so it also works in the theme-settings and anywhere else + * This function "fixes" drupal_alter so it also works in the theme-settings and anywhere else * where you want to be 100% certain that drupal_alter uses the proper global $theme. - * + * * The problem with drupal_alter is, that it always relies on the global $theme while * the theme-settings page relies (and "overrides") the global $theme_key variable while * building its form. - * + * * @param $type * @param $data * @param $context1 * @param $context2 - * + * * @see * See drupal_alter() for more information about how this works. */ @@ -134,19 +134,19 @@ function alpha_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) { if ($theme != $context1) { $themes = list_themes(); - + if (!empty($themes[$context1])) { $theme_original = $theme; $base_theme_info_original = $base_theme_info; - + foreach (alpha_theme_trail($context1) as $key => $title) { if (isset($themes[$key])) { $base_theme_info[$key] = $themes[$key]; } } - + $functions = &drupal_static('drupal_alter'); - + if (!empty($base_theme_info)) { foreach ($base_theme_info as $item) { if (is_file(drupal_get_path('theme', $item->name) . '/template.php')) { @@ -154,16 +154,16 @@ function alpha_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) { } } } - + array_pop($base_theme_info); - + $theme = $context1; - - drupal_alter($type, $data, $context1, $context2); - + + drupal_alter($type, $data, $context1, $context2); + $theme = $theme_original; $base_theme_info = $base_theme_info_original; - + unset($functions[$type]); } } @@ -175,7 +175,7 @@ function alpha_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) { /** * Builds the full theme trail (deepest base theme first, subtheme last) * for a theme. - * + * * @param $theme * The key (machin-readable name) of a theme. * @@ -184,10 +184,10 @@ function alpha_alter($type, &$data, &$context1 = NULL, &$context2 = NULL) { */ function alpha_theme_trail($theme) { $static = &drupal_static(__FUNCTION__); - + if (!isset($static)) { $themes = list_themes(); - + if (isset($themes[$theme]->info['base theme'])) { foreach (system_find_base_themes($themes, $theme) as $base => $name) { if ($name && isset($themes[$base])) { @@ -215,26 +215,26 @@ function alpha_theme_trail($theme) { */ function alpha_get_theme() { $container = &drupal_static(__FUNCTION__); - + $key = $theme = $GLOBALS['theme_key']; $delta = NULL; - + if (module_exists('delta') && $delta = delta_get_current($theme)) { $key .= ':' . $delta; } - - if (!isset($container[$key])) { + + if (!isset($container[$key])) { foreach (array_keys(alpha_theme_trail($theme)) as $item) { if (class_exists($item . '_theme_container')) { $class = $item . '_theme_container'; } } - + if (isset($class)) { $container[$key] = new $class($theme, $delta); } } - + return $container[$key]; } @@ -243,7 +243,7 @@ function alpha_get_theme() { */ function alpha_libraries_include() { $theme = alpha_get_theme(); - + foreach (array_filter($theme->settings['libraries']) as $item => $status) { if (alpha_library_active($item)) { if (!empty($theme->libraries[$item]['js'])) { @@ -266,7 +266,7 @@ function alpha_libraries_include() { */ function alpha_css_include() { $theme = alpha_get_theme(); - + foreach (array_filter($theme->settings['css']) as $item => $status) { if (alpha_css_active($item)) { drupal_add_css($theme->css[$item]['path'], $theme->css[$item]['options']); @@ -285,11 +285,11 @@ function alpha_css_include() { */ function alpha_library_active($library) { $theme = alpha_get_theme(); - + if (isset($theme->libraries[$library], $theme->settings['libraries'][$library]) && $theme->settings['libraries'][$library] === $library) { return TRUE; } - + return FALSE; } @@ -304,7 +304,7 @@ function alpha_library_active($library) { */ function alpha_css_active($css) { $theme = alpha_get_theme(); - + if (isset($theme->css[$css], $theme->settings['css'][$css]) && $theme->settings['css'][$css] === $css) { return TRUE; } @@ -333,7 +333,6 @@ function alpha_sections() { return alpha_get_theme()->sections(); } - /** * @deprecated */ @@ -352,11 +351,11 @@ function alpha_settings() { */ function alpha_grid_include($columns) { $processed = &drupal_static(__FUNCTION__); - + if (empty($processed[$columns])) { $processed[$columns] = TRUE; $theme = alpha_get_theme(); - + if (!empty($theme->grid)) { foreach ($theme->grid as &$item) { if (empty($item['processed']) && (empty($item['columns']) || $item['columns'] == $columns)) { @@ -366,7 +365,7 @@ function alpha_grid_include($columns) { } } } - + if ($theme->settings['debug']['access'] && $theme->settings['debug']['grid']) { if (isset($theme->grids[$theme->settings['grid']])) { alpha_grid_debug($theme->grids[$theme->settings['grid']], $theme->settings['responsive'], $columns); @@ -389,7 +388,7 @@ function alpha_grid_include($columns) { */ function alpha_grid_debug($grid, $responsive, $columns) { if (isset($grid['columns'][$columns])) { - if ($responsive) { + if ($responsive) { $browsers = array('IE' => 'gte IE 9', '!IE' => TRUE); $layouts = array_keys($grid['layouts']); } @@ -409,15 +408,15 @@ function alpha_grid_debug($grid, $responsive, $columns) { if ($responsive && $layout == $grid['primary']) { drupal_add_css($overlay, array( 'type' => 'inline', - 'media' => 'all', - 'browsers' => array('IE' => '(lt IE 9)&(!IEMobile)', '!IE' => FALSE), + 'media' => 'all', + 'browsers' => array('IE' => '(lt IE 9)&(!IEMobile)', '!IE' => FALSE), 'group' => -2000, 'weight' => $weight, )); } drupal_add_css($overlay, array( - 'type' => 'inline', + 'type' => 'inline', 'browsers' => $browsers, 'group' => -1000, 'weight' => $weight, @@ -430,7 +429,7 @@ function alpha_grid_debug($grid, $responsive, $columns) { /** * Builds an array of grid CSS information. - * + * * @param $theme * The key (machin-readable name) of a theme. * @param $grid @@ -438,14 +437,14 @@ function alpha_grid_debug($grid, $responsive, $columns) { * @param $responsive * A boolean indicating wether the grid CSS should be generated in * responsive or non-responsive mode. - * + * * @return * An array of CSS files related to a grid. */ function alpha_grid_css($theme, $grid, $responsive) { $columns = array_keys($grid['columns']); - - if ($responsive) { + + if ($responsive) { $browsers = array('IE' => 'gte IE 9', '!IE' => TRUE); $layouts = array_keys($grid['layouts']); } @@ -453,19 +452,19 @@ function alpha_grid_css($theme, $grid, $responsive) { $browsers = array('IE' => TRUE, '!IE' => TRUE); $layouts = isset($grid['layouts'][$grid['primary']]) ? array($grid['primary']) : array(); } - + $output = array(); - + if (!empty($layouts)) { $trail = array_keys(alpha_theme_trail($theme)); - + foreach ($layouts as $layout) { $enabled = $grid['layouts'][$layout]['enabled']; - + if (!$responsive || $enabled) { $media = $responsive ? $grid['layouts'][$layout]['media'] : 'all'; $weight = $grid['layouts'][$layout]['weight']; - $sanitized = $grid['layouts'][$layout]['sanitized']; + $sanitized = $grid['layouts'][$layout]['sanitized']; $attached = array(); foreach ($trail as $item) { @@ -488,9 +487,9 @@ function alpha_grid_css($theme, $grid, $responsive) { $output[$basename]['item'] = $basename; $output[$basename]['options'] = array( 'group' => 2000, - 'weight' => $weight, - 'data' => $item, - 'basename' => $basename, + 'weight' => $weight, + 'data' => $item, + 'basename' => $basename, 'media' => $media, 'browsers' => $browsers, 'preprocess_media' => TRUE, @@ -504,7 +503,7 @@ function alpha_grid_css($theme, $grid, $responsive) { $output[$basename]['options'] = array( 'group' => 1000, 'weight' => $weight, - 'data' => $item, + 'data' => $item, 'basename' => $basename, 'browsers' => array('IE' => '(lt IE 9)&(!IEMobile)', '!IE' => FALSE), ); @@ -523,11 +522,11 @@ function alpha_grid_css($theme, $grid, $responsive) { 'group' => 2000, 'weight' => $weight, 'media' => $media, - 'browsers' => $browsers, + 'browsers' => $browsers, 'preprocess_media' => TRUE, ); - if ($responsive && $grid['primary'] == $layout) { + if ($responsive && $grid['primary'] == $layout) { $basename = 'ie::' . $layout . '::' . $path . '-' . $count . '.css'; $output[$basename]['processed'] = FALSE; @@ -538,18 +537,17 @@ function alpha_grid_css($theme, $grid, $responsive) { 'weight' => $weight, 'data' => $file, 'basename' => $basename, - 'browsers' => array('IE' => '(lt IE 9)&(!IEMobile)', '!IE' => FALSE), + 'browsers' => array('IE' => '(lt IE 9)&(!IEMobile)', '!IE' => FALSE), ); } } } } } - + return $output; } - /** * Preprocesses CSS files so that CSS files that have 'preprocess_media' * set to TRUE are set to media="all" while having their former media query @@ -667,13 +665,13 @@ function alpha_cache_clear($theme, $delta = NULL) { */ function alpha_cache_set($theme) { $cache = new stdClass(); - + foreach (array_keys($theme->cacheable()) as $item) { if (isset($theme->$item)) { $cache->$item = $theme->$item; } } - + if (isset($theme->delta)) { return cache_set('alpha:' . $theme->theme . ':' . $theme->delta, $cache); } @@ -707,18 +705,18 @@ function alpha_cache_get($theme, $delta = NULL) { * * @param $theme * The key (machin-readable name) of a theme. - * + * * @return * An array of module and theme defined CSS files. */ function alpha_retrieve_excludes($theme) { - $themes = list_themes(); + $themes = list_themes(); $styles = array(); - + foreach (system_rebuild_module_data() as $module => $data) { if ($data->status && !empty($data->info['stylesheets'])) { - foreach ($data->info['stylesheets'] as $media => $content) { - foreach ($content as $file) { + foreach ($data->info['stylesheets'] as $media => $content) { + foreach ($content as $file) { $styles[$file] = array( 'type' => 'module', 'source' => $module, @@ -731,7 +729,7 @@ function alpha_retrieve_excludes($theme) { } } } - + foreach (alpha_info_trail('stylesheets', $theme) as $item => $data) { foreach ($data as $media => $content) { foreach ($content as $file) { @@ -746,7 +744,7 @@ function alpha_retrieve_excludes($theme) { } } } - + foreach (alpha_info_trail('exclude', $theme) as $item => $data) { foreach ($data as $file => $description) { $styles[$file] = array( @@ -759,7 +757,7 @@ function alpha_retrieve_excludes($theme) { ); } } - + return $styles; } @@ -783,7 +781,7 @@ function alpha_retrieve_grids($theme) { 'name' => $info['name'], 'sanitized' => str_replace('_', '-', $grid), 'layouts' => $info['layouts'], - 'columns' => $info['columns'], + 'columns' => $info['columns'], 'path' => drupal_get_path('theme', $key) . '/css/grid/' . $grid, ); @@ -803,9 +801,9 @@ function alpha_retrieve_grids($theme) { uasort($output[$grid]['layouts'], 'alpha_sort_layouts'); } } - + alpha_alter('alpha_grids', $output, $theme); - + return $output; } @@ -820,7 +818,7 @@ function alpha_retrieve_grids($theme) { */ function alpha_retrieve_css($theme) { $output = array(); - + foreach (alpha_info_trail('css', $theme) as $key => $data) { foreach ($data as $name => $info) { $output[$name] = array( @@ -835,7 +833,7 @@ function alpha_retrieve_css($theme) { } alpha_alter('alpha_css', $output, $theme); - + return $output; } @@ -871,9 +869,9 @@ function alpha_retrieve_libraries($theme) { } } } - + alpha_alter('alpha_libraries', $output, $theme); - + return $output; } @@ -913,7 +911,7 @@ function alpha_calculate_primary(&$items, $primary, $container) { function alpha_calculate_position(&$items) { if (!empty($items)) { $children = element_children($items, TRUE); - + foreach ($children as $a => $item) { foreach ($children as $b => $inner) { if ($item != $inner) { @@ -945,7 +943,7 @@ function alpha_calculate_position(&$items) { /** * A helper function for retrieving the content of theme .info files * in the theme trail of $key. - * + * * @param $item * The name of the variable that you want to fetch. * @param $theme @@ -955,7 +953,7 @@ function alpha_calculate_position(&$items) { */ function alpha_info($item, $theme) { $themes = list_themes(); - + if (!empty($themes[$theme]->info[$item])) { return $themes[$theme]->info[$item]; } @@ -975,7 +973,7 @@ function alpha_info($item, $theme) { */ function alpha_info_trail($item, $theme) { $output = array(); - + if ($trail = alpha_theme_trail($theme)) { $themes = list_themes(); @@ -985,7 +983,7 @@ function alpha_info_trail($item, $theme) { } } } - + return $output; } @@ -1002,19 +1000,19 @@ function alpha_info_trail($item, $theme) { function alpha_find_stylesheet($path, $name) { foreach (array('css', 'css.less', 'sass', 'scss') as $extension) { $file = $path . '/' . $name . '.' . $extension; - + if (is_file($file)) { return $file; } } - + return FALSE; } /** * A helper function to check wether the user defined by $user * matches one of the roles defined by $roles. - * + * * @param $user * A Drupal user as returned by user_load(). * @param $roles @@ -1027,9 +1025,9 @@ function alpha_debug_access($user, $roles) { foreach ($roles as $role) { if (isset($user->roles[$role])) { return TRUE; - } + } } - + return FALSE; } @@ -1057,11 +1055,11 @@ function alpha_sort_layouts($a, $b) { */ function alpha_toggle() { return array( - 'messages' => t('Messages'), - 'action_links' => t('Action links'), - 'tabs' => t('Tabs'), - 'breadcrumb' => t('Breadcrumb'), - 'page_title' => t('Page title'), + 'messages' => t('Messages'), + 'action_links' => t('Action links'), + 'tabs' => t('Tabs'), + 'breadcrumb' => t('Breadcrumb'), + 'page_title' => t('Page title'), 'feed_icons' => t('Feed icons'), ); } @@ -1072,9 +1070,9 @@ function alpha_toggle() { */ function alpha_visibility() { return array( - 'title' => t('Page title'), - 'site_name' => t('Site name'), - 'site_slogan' => t('Site slogan'), + 'title' => t('Page title'), + 'site_name' => t('Site name'), + 'site_slogan' => t('Site slogan'), ); } @@ -1083,4 +1081,4 @@ function alpha_visibility() { */ function alpha_regions_exclude() { return array('page_top', 'page_bottom'); -} \ No newline at end of file +} diff --git a/alpha/includes/base.inc b/alpha/includes/base.inc index 57878b5..20da66a 100644 --- a/alpha/includes/base.inc +++ b/alpha/includes/base.inc @@ -16,58 +16,58 @@ class alpha_theme_container { var $zones; var $regions; var $page; - + /** * @todo */ function __construct($theme, $delta = NULL) { $this->theme = $theme; $this->delta = $delta; - + if ($cache = alpha_cache_get($theme, $delta)) { foreach ($cache->data as $key => $item) { $this->$key = $item; } } - + foreach ($this->cacheable() as $item => $required) { if ($required && !isset($this->$item)) { $this->init(); - + alpha_alter('alpha_pre_cache', $this, $theme, $delta); alpha_cache_set($this); - + return; } } - + alpha_alter('alpha', $this, $theme, $delta); } - + /** * @todo */ function init() { $this->settings(); $this->sections(); - $this->zones(); + $this->zones(); $this->regions(); $this->grids(); $this->grid(); $this->css(); $this->libraries(); } - + /** * @todo */ function settings() { - if (!isset($this->settings)) { + if (!isset($this->settings)) { $this->settings = array( 'grid' => alpha_theme_get_setting('alpha_grid', 'default', $this->theme), 'css' => alpha_theme_get_setting('alpha_css', array(), $this->theme), 'libraries' => alpha_theme_get_setting('alpha_libraries', array(), $this->theme), - 'exclude' => alpha_theme_get_setting('alpha_exclude', array(), $this->theme), + 'exclude' => alpha_theme_get_setting('alpha_exclude', array(), $this->theme), 'responsive' => alpha_theme_get_setting('alpha_responsive', FALSE, $this->theme), 'toggle' => array(), 'hidden' => array(), @@ -97,10 +97,10 @@ class alpha_theme_container { alpha_alter('alpha_settings', $this->settings, $this->theme); } - + return $this->settings; } - + /** * @todo */ @@ -109,17 +109,17 @@ class alpha_theme_container { $this->settings(); $this->grids = alpha_retrieve_grids($this->theme); } - + return $this->grids; } - + /** * @todo */ function grid() { - if (!isset($this->grid)) { - $this->grids(); - + if (!isset($this->grid)) { + $this->grids(); + if (isset($this->grids[$this->settings['grid']])) { $this->grid = alpha_grid_css($this->theme, $this->grids[$this->settings['grid']], $this->settings['responsive']); } @@ -130,7 +130,7 @@ class alpha_theme_container { return $this->grid; } - + /** * @todo */ @@ -138,10 +138,10 @@ class alpha_theme_container { if (!isset($this->css)) { $this->css = alpha_retrieve_css($this->theme); } - + return $this->css; } - + /** * @todo */ @@ -149,10 +149,10 @@ class alpha_theme_container { if (!isset($this->libraries)) { $this->libraries = alpha_retrieve_libraries($this->theme); } - + return $this->libraries; } - + /** * @todo */ @@ -164,10 +164,10 @@ class alpha_theme_container { 'footer' => t('Footer'), ); } - + return $this->sections; } - + /** * @todo */ @@ -180,7 +180,7 @@ class alpha_theme_container { foreach ($zones as $zone => $title) { $section = alpha_zone_get_setting('section', $zone, NULL, $this->theme); $section = isset($this->sections[$section]) ? $section : NULL; - + $this->zones[$zone] = array( 'zone' => $zone, 'name' => $title, @@ -198,13 +198,13 @@ class alpha_theme_container { } } - uasort($this->zones, 'drupal_sort_weight'); + uasort($this->zones, 'drupal_sort_weight'); alpha_alter('alpha_zones', $this->zones, $this->theme); } return $this->zones; } - + /** * @todo */ @@ -212,7 +212,7 @@ class alpha_theme_container { if (!isset($this->regions)) { $this->zones(); $this->sections(); - $this->regions = array(); + $this->regions = array(); $exclude = alpha_regions_exclude(); foreach (system_region_list($this->theme) as $region => $title) { @@ -221,10 +221,10 @@ class alpha_theme_container { $prefix = alpha_region_get_setting('prefix', $region, 0, $this->theme); $columns = alpha_region_get_setting('columns', $region, 1, $this->theme); $suffix = alpha_region_get_setting('suffix', $region, 0, $this->theme); - + $zone = isset($zone) && isset($this->zones[$zone]) ? $zone : NULL; $section = isset($zone) && isset($this->zones[$zone]['section']) ? $this->zones[$zone]['section'] : NULL; - + $this->regions[$region] = array( 'region' => $region, 'name' => $title, @@ -252,15 +252,15 @@ class alpha_theme_container { return $this->regions; } - + /** * @todo */ function cacheable() { $cacheable = array_fill_keys(array('settings', 'libraries', 'css', 'grids', 'grid', 'regions', 'zones', 'sections'), TRUE); - + alpha_alter('alpha_cacheable', $cacheable, $this->theme); - + return $cacheable; } -} \ No newline at end of file +} diff --git a/alpha/includes/theme-settings-general.inc b/alpha/includes/theme-settings-general.inc index 1428e15..63eed9b 100644 --- a/alpha/includes/theme-settings-general.inc +++ b/alpha/includes/theme-settings-general.inc @@ -10,12 +10,12 @@ */ function alpha_theme_settings_general(&$form, &$form_state) { $theme = alpha_get_theme(); - $scales = alpha_scale_options(1, 10, 0.5); + $scales = alpha_scale_options(1, 10, 0.5); $optional = alpha_css_options($theme->css); $libraries = alpha_library_options($theme->libraries); $exclude = alpha_exclude_options($theme->theme); $toggle = alpha_toggle(); - + $form['alpha_settings']['layout'] = array( '#type' => 'fieldset', '#weight' => -10, @@ -29,19 +29,19 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#default_value' => $theme->settings['grid'], '#options' => alpha_grid_options($theme->grids), ); - + $form['alpha_settings']['layout']['responsive_settings'] = array( '#type' => 'fieldset', '#title' => t('Responsive settings'), ); - + $form['alpha_settings']['layout']['responsive_settings']['alpha_responsive'] = array( '#type' => 'checkbox', '#title' => t('Enable the responsive grid'), '#description' => t('Enabling this will unleash the responsive layout features that come with Alpha & Omega. It also helps you to clean your appartment and wash your dishes.'), '#default_value' => $theme->settings['responsive'], ); - + $form['alpha_settings']['layout']['responsive_settings']['alpha_viewport'] = array( '#type' => 'checkbox', '#title' => t('Allow customizing viewport meta properties on iOS and Android devices'), @@ -53,7 +53,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { ), ), ); - + $form['alpha_settings']['layout']['responsive_settings']['viewport_settings'] = array( '#type' => 'fieldset', '#title' => t('Viewport settings'), @@ -64,7 +64,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { ), ), ); - + $form['alpha_settings']['layout']['responsive_settings']['viewport_settings']['alpha_viewport_initial_scale'] = array( '#type' => 'select', '#title' => t('Initial scale'), @@ -95,7 +95,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#description' => t('

Determine if a user can resize the screen. This is usually accomplished via multi-touch gestures on iOS and Android devices. If your mobile theme is very customized and presented with good typography and graphics for a reduced mobile size, it is recommended to leave this setting unchecked. If it is left unchecked, the min-scale and max-scale properties will be ignored.

HTC Android devices do NOT (currently) respect the viewport meta tag for user-scalable. It will render at the appropriate initial-scale set above, but a user can still zoom in/out.

'), '#default_value' => $theme->settings['viewport']['user'], ); - + foreach ($theme->grids as $grid => $info) { $form['alpha_settings']['layout']['grid_layouts'][$grid] = array( '#type' => 'fieldset', @@ -106,7 +106,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { ), ), ); - + $form['alpha_settings']['layout']['grid_layouts'][$grid]['alpha_primary_' . $grid] = array( '#type' => 'select', '#title' => t('Primary layout'), @@ -114,7 +114,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#options' => alpha_grid_layouts_options($theme->grids[$grid]), '#description' => t('The primary layout will be used in case you disable the "responsive grid" option aswell as for older versions of Internet Explorer.'), ); - + foreach ($info['layouts'] as $layout => $data) { $form['alpha_settings']['layout']['grid_layouts'][$grid][$layout] = array( '#type' => 'fieldset', @@ -131,7 +131,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#title' => t('Use this layout with the responsive grid'), '#default_value' => $data['enabled'], ); - + $form['alpha_settings']['layout']['grid_layouts'][$grid][$layout]['alpha_layouts_' . $grid . '_' . $layout . '_weight'] = array( '#type' => 'weight', '#title' => t('Weight'), @@ -141,9 +141,9 @@ function alpha_theme_settings_general(&$form, &$form_state) { 'visible' => array( ':input[name="alpha_layouts_' . $grid . '_' . $layout . '_responsive"]' => array('checked' => TRUE), ), - ), + ), ); - + $form['alpha_settings']['layout']['grid_layouts'][$grid][$layout]['alpha_layouts_' . $grid . '_' . $layout . '_media'] = array( '#type' => 'textfield', '#title' => t('Media query'), @@ -159,15 +159,15 @@ function alpha_theme_settings_general(&$form, &$form_state) { ); } } - - if (!empty($libraries)) { + + if (!empty($libraries)) { $form['alpha_settings']['alpha_libraries'] = array( '#type' => 'fieldset', '#title' => t('Toggle libraries'), '#collapsible' => TRUE, '#collapsed' => FALSE, ); - + $form['alpha_settings']['alpha_libraries']['alpha_libraries'] = array( '#title' => t('Enable optional libraries'), '#description' => t('You can choose from this list to enable optional libraries.'), @@ -175,16 +175,16 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#options' => $libraries, '#default_value' => $theme->settings['libraries'], ); - } - + } + $form['alpha_settings']['alpha_styles'] = array( '#type' => 'fieldset', '#title' => t('Toggle styles'), '#collapsible' => TRUE, '#collapsed' => FALSE, ); - - if (!empty($optional)) { + + if (!empty($optional)) { $form['alpha_settings']['alpha_styles']['alpha_css'] = array( '#title' => t('Enable optional stylesheets'), '#description' => t('You can choose from this list to enable optional stylesheets.'), @@ -193,7 +193,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#default_value' => $theme->settings['css'], ); } - + if (!empty($exclude)) { $form['alpha_settings']['alpha_styles']['alpha_exclude'] = array( '#title' => t('Disable module and theme stylesheets'), @@ -203,7 +203,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#default_value' => $theme->settings['exclude'], ); } - + $form['alpha_settings']['alpha_debug'] = array( '#type' => 'fieldset', '#weight' => -6, @@ -254,13 +254,13 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#default_value' => $theme->settings['debug']['roles'], '#options' => array_map('check_plain', user_roles()), ); - + $form['alpha_settings']['alpha_toggle'] = array( '#type' => 'fieldset', '#title' => t('Toggle advanced elements'), '#description' => t('Enable or disable the display of certain page elements.'), ); - + foreach ($toggle as $item => $title) { $form['alpha_settings']['alpha_toggle']['alpha_toggle_' . $item] = array( '#type' => 'checkbox', @@ -274,7 +274,7 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#title' => t('Choose from the elements below to hide them via CSS'), '#description' => t('This will make the element invisible to normal users while not removing it from the HTML (e.g. for screenreaders).'), ); - + foreach (alpha_visibility() as $item => $title) { $form['alpha_settings']['alpha_toggle']['alpha_hidden']['alpha_hidden_' . $item] = array( '#type' => 'checkbox', @@ -282,4 +282,4 @@ function alpha_theme_settings_general(&$form, &$form_state) { '#default_value' => $theme->settings['hidden'][$item], ); } -} \ No newline at end of file +} diff --git a/alpha/includes/theme-settings-structure.inc b/alpha/includes/theme-settings-structure.inc index 66693c3..a8670c7 100644 --- a/alpha/includes/theme-settings-structure.inc +++ b/alpha/includes/theme-settings-structure.inc @@ -12,17 +12,17 @@ function alpha_theme_settings_structure(&$form, &$form_state) { $theme = alpha_get_theme(); $containers = isset($theme->grids[$theme->settings['grid']]) ? alpha_container_options($theme->grids[$theme->settings['grid']]) : array(); $options = alpha_zone_options($theme->zones); - $columns = $spacing = !empty($containers) ? alpha_column_options(max(array_keys($containers))) : array(); - + $columns = $spacing = !empty($containers) ? alpha_column_options(max(array_keys($containers))) : array(); + unset($columns[0]); array_pop($spacing); - + $form['alpha_settings']['structure'] = array( '#type' => 'fieldset', '#title' => t('Zone and region configuration'), '#weight' => -8, ); - + $form['alpha_settings']['structure']['__unassigned__'] = array( '#type' => 'fieldset', '#title' => t('Unassigned zones'), @@ -32,7 +32,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { 'class' => array('alpha-unassigned'), ), ); - + $form['alpha_settings']['structure']['__unassigned__']['__unassigned__']['regions'] = array( '#type' => 'fieldset', '#title' => t('Unassigned regions'), @@ -42,7 +42,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { 'class' => array('alpha-unassigned'), ), ); - + foreach ($theme->sections as $section => $name) { $form['alpha_settings']['structure'][$section] = array( '#type' => 'fieldset', @@ -50,12 +50,12 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#description' => t('This section is empty.'), ); } - + foreach ($theme->zones as $zone => $item) { $section = $item['enabled'] ? $item['section'] : '__unassigned__'; - + unset($form['alpha_settings']['structure'][$section]['#description']); - + $form['alpha_settings']['structure'][$section][$zone] = array( '#type' => 'fieldset', '#title' => $item['name'] . ' ' . t('Zone'), @@ -63,7 +63,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#collapsible' => TRUE, '#collapsed' => TRUE, ); - + $form['alpha_settings']['structure'][$section][$zone]['zone'] = array( '#type' => 'fieldset', '#title' => t('Configuration'), @@ -74,7 +74,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { 'class' => array('alpha-inline'), ), ); - + // Provide a full width wrapper around the zone (allowing for design elements outside the grid) $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_wrapper'] = array( '#type' => 'checkbox', @@ -82,14 +82,14 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#description' => t('Enabling this feature will give a <div> wrapper around the zone itself, allowing you to theme in elements that appear outside the 960 pixel container zone.'), '#default_value' => $item['wrapper'], ); - + $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_force'] = array( '#type' => 'checkbox', '#title' => t('Force this zone to be rendered'), '#description' => t('Enabling this will always render this zone, even if it is empty.'), '#default_value' => $item['force'], ); - + $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_order'] = array( '#type' => 'checkbox', '#title' => t('Customize the region positioning'), @@ -98,7 +98,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#element_validate' => array('alpha_theme_settings_validate_order'), '#zone' => $zone, ); - + $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_section'] = array( '#type' => 'select', '#title' => t('Section'), @@ -106,13 +106,13 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#element_validate' => array('alpha_theme_settings_validate_not_empty'), '#options' => array('_none' => '- None -') + $theme->sections, ); - + $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_weight'] = array( '#type' => 'weight', '#title' => t('Weight'), '#default_value' => $item['weight'], ); - + // Create a container width selection menu for EACH zone $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_columns'] = array( '#type' => 'select', @@ -120,7 +120,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#default_value' => $item['columns'], '#options' => $containers, ); - + // Decide which region is the primary item. // The primary region is the one that will absorb the size of empty regions that are related in the same zone. $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_primary'] = array( @@ -131,7 +131,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#element_validate' => array('alpha_theme_settings_validate_not_empty', 'alpha_theme_settings_validate_primary'), '#zone' => $zone, ); - + // Allow for zone classes $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_css'] = array( '#type' => 'textfield', @@ -152,7 +152,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { ), ), ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'] = array( '#type' => 'fieldset', '#title' => t('Regions'), @@ -162,11 +162,11 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#collapsed' => TRUE, ); } - + foreach($theme->regions as $region => $item) { $zone = $item['enabled'] ? $item['zone'] : '__unassigned__'; $section = $item['enabled'] && $theme->zones[$item['zone']]['enabled'] ? $item['section'] : '__unassigned__'; - + unset($form['alpha_settings']['structure'][$section][$zone]['regions']['#description']); $form['alpha_settings']['structure'][$section][$zone]['regions'][$region] = array( @@ -179,14 +179,14 @@ function alpha_theme_settings_structure(&$form, &$form_state) { 'class' => array('alpha-inline'), ), ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_force'] = array( '#type' => 'checkbox', '#title' => t('Force this region to be rendered'), '#description' => t('Enabling this will always render this region, even if it is empty.'), '#default_value' => $item['force'], ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_zone'] = array( '#type' => 'select', '#title' => t('Zone'), @@ -194,35 +194,35 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#element_validate' => array('alpha_theme_settings_validate_not_empty'), '#options' => array('_none' => '- None -') + $options, ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_prefix'] = array( '#type' => 'select', '#title' => t('Prefix'), '#default_value' => $item['prefix'], '#options' => $spacing, ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_columns'] = array( '#type' => 'select', '#title' => t('Width'), '#default_value' => $item['columns'], '#options' => $columns, ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_suffix'] = array( '#type' => 'select', '#title' => t('Suffix'), '#default_value' => $item['suffix'], '#options' => $spacing, ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_weight'] = array( '#type' => 'weight', '#delta' => 50, '#title' => t('Weight'), '#default_value' => $item['weight'], ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_position'] = array( '#type' => 'weight', '#delta' => 50, @@ -234,7 +234,7 @@ function alpha_theme_settings_structure(&$form, &$form_state) { ), ), ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_css'] = array( '#type' => 'textfield', '#title' => t('Additional region classes'), @@ -242,4 +242,4 @@ function alpha_theme_settings_structure(&$form, &$form_state) { '#default_value' => $item['wrapper_css'], ); } -} \ No newline at end of file +} diff --git a/alpha/js/alpha-debug.js b/alpha/js/alpha-debug.js index 0465aad..15ff4ee 100644 --- a/alpha/js/alpha-debug.js +++ b/alpha/js/alpha-debug.js @@ -16,4 +16,4 @@ }); } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/alpha/screenshot.png b/alpha/screenshot.png index 6e614af..c5d8b78 100644 Binary files a/alpha/screenshot.png and b/alpha/screenshot.png differ diff --git a/alpha/template.php b/alpha/template.php index 2e94310..1729d23 100644 --- a/alpha/template.php +++ b/alpha/template.php @@ -14,13 +14,13 @@ function alpha_theme($existing, $type, $theme, $path) { 'render element' => 'elements', 'pattern' => 'section__', 'preprocess functions' => array( - 'template_preprocess', + 'template_preprocess', 'template_preprocess_section', 'alpha_preprocess', 'alpha_preprocess_section', ), 'process functions' => array( - 'template_process', + 'template_process', 'template_process_section', 'alpha_process', 'alpha_process_section' @@ -32,13 +32,13 @@ function alpha_theme($existing, $type, $theme, $path) { 'render element' => 'elements', 'pattern' => 'zone__', 'preprocess functions' => array( - 'template_preprocess', + 'template_preprocess', 'template_preprocess_zone', 'alpha_preprocess', 'alpha_preprocess_zone', ), 'process functions' => array( - 'template_process', + 'template_process', 'template_process_zone', 'alpha_process', 'alpha_process_zone' @@ -52,7 +52,7 @@ function alpha_theme($existing, $type, $theme, $path) { */ function alpha_preprocess(&$vars, $hook) { $vars['attributes_array']['class'] = $vars['classes_array']; - + alpha_invoke('preprocess', $hook, $vars); } @@ -70,13 +70,13 @@ function alpha_process(&$vars, $hook) { array_unshift($vars['attributes_array']['class'], 'grid-' . $vars['elements']['#grid']['columns']); } - + if (!empty($vars['elements']['#data']['wrapper_css'])) { foreach (array_map('drupal_html_class', explode(' ', $vars['elements']['#data']['wrapper_css'])) as $class) { $vars['attributes_array']['class'][] = $class; } } - + $vars['attributes'] = $vars['attributes_array'] ? drupal_attributes($vars['attributes_array']) : ''; } @@ -93,7 +93,7 @@ function alpha_process(&$vars, $hook) { $vars['content_attributes'] = $vars['content_attributes_array'] ? drupal_attributes($vars['content_attributes_array']) : ''; } - + alpha_invoke('process', $hook, $vars); } @@ -111,19 +111,19 @@ function alpha_element_info_alter(&$elements) { */ function alpha_css_alter(&$css) { global $language; - - $theme = alpha_get_theme(); - + + $theme = alpha_get_theme(); + if ($theme->settings['exclude']) { if ($exclude = array_filter($theme->settings['exclude'])) { - + if ($language->direction == LANGUAGE_LTR) { foreach ($exclude as $basename) { $rtl = str_replace('.css', '-rtl.css', $basename); $exclude[$rtl] = $rtl; } } - + foreach($css as $key => $item) { if (isset($exclude[$key])) { unset($css[$key]); @@ -139,19 +139,19 @@ function alpha_css_alter(&$css) { function alpha_page_alter(&$vars) { $theme = alpha_get_theme(); $theme->settings['debug']['access'] = alpha_debug_access($GLOBALS['user'], $theme->settings['debug']['roles']); - + // If no module has taken care of the main content, add it to the page now. // This allows the site to still be usable even if no modules that // control page regions (for example, the Block module) are enabled. if (!drupal_static('system_main_content_added', FALSE)) { $vars['content']['system_main'] = drupal_set_page_content(); } - + if (($theme->settings['debug']['access'] || $GLOBALS['user']->uid == 1) && ($theme->settings['debug']['grid'] || $theme->settings['debug']['block'])) { - drupal_add_css(drupal_get_path('theme', 'alpha') . '/css/alpha-debug.css', array('group' => CSS_THEME, 'weight' => -5)); + drupal_add_css(drupal_get_path('theme', 'alpha') . '/css/alpha-debug.css', array('group' => CSS_THEME, 'weight' => -5)); drupal_add_js(drupal_get_path('theme', 'alpha') . '/js/alpha-debug.js', array('group' => JS_THEME, 'weight' => -5)); - - if ($theme->settings['responsive']) { + + if ($theme->settings['responsive']) { $vars['page_bottom']['alpha_resize_indicator'] = array( '#type' => 'markup', '#markup' => '
', @@ -171,14 +171,14 @@ function alpha_page_alter(&$vars) { ); foreach ($theme->regions as $region => $item) { - if ($item['enabled']) { + if ($item['enabled']) { if (empty($vars[$region])) { $vars[$region]['#region'] = $region; $vars[$region]['#theme_wrappers'] = array('region'); } if (isset($vars[$region]['#theme_wrappers']) && array_search('region', $vars[$region]['#theme_wrappers']) !== FALSE) { - $vars[$region] = array('alpha_debug_' . $region => array( + $vars[$region] = array('alpha_debug_' . $region => array( '#type' => 'markup', '#markup' => '

' . $item['name'] . '

' . t('This is a debugging block') . '

', '#weight' => -999, @@ -188,7 +188,7 @@ function alpha_page_alter(&$vars) { } } } - + if (!module_implements('alpha_page_structure_alter')) { alpha_alter('alpha_page_structure', $vars, $theme->theme); } @@ -203,7 +203,7 @@ function alpha_page_alter(&$vars) { function alpha_alpha_page_structure_alter(&$vars) { $theme = alpha_get_theme(); $temporary = array(); - + foreach ($theme->regions as $region => $item) { if ($item['enabled'] && $theme->zones[$item['zone']]['enabled'] && ($item['force'] || !empty($vars[$region]))) { $temporary[$item['section']][$item['zone']][$region] = !empty($vars[$region]) ? $vars[$region] : array(); @@ -217,9 +217,9 @@ function alpha_alpha_page_structure_alter(&$vars) { 'pull' => $item['pull'], 'columns' => $item['columns'], ); - + $theme->regions[$region]['grid'] = &$temporary[$item['section']][$item['zone']][$region]['#grid']; - + if (empty($vars[$region])) { $temporary[$item['section']][$item['zone']][$region]['#region'] = $region; $temporary[$item['section']][$item['zone']][$region]['#theme_wrappers'] = array('region'); @@ -237,11 +237,11 @@ function alpha_alpha_page_structure_alter(&$vars) { 'columns' => $item['columns'], ); } - + unset($vars[$region]); } - - foreach ($theme->zones as $zone => $item) { + + foreach ($theme->zones as $zone => $item) { if ($item['enabled'] && ($item['force'] || !empty($temporary[$item['section']][$zone]))) { if (isset($item['primary']) && isset($temporary[$item['section']][$zone][$item['primary']])) { alpha_calculate_primary($temporary[$item['section']][$zone], $item['primary'], $item['columns']); @@ -250,8 +250,8 @@ function alpha_alpha_page_structure_alter(&$vars) { if ($item['order']) { alpha_calculate_position($temporary[$item['section']][$zone]); } - - $temporary[$item['section']][$zone]['#theme_wrappers'] = array('zone'); + + $temporary[$item['section']][$zone]['#theme_wrappers'] = array('zone'); $temporary[$item['section']][$zone]['#zone'] = $zone; $temporary[$item['section']][$zone]['#weight'] = (int) $item['weight']; $temporary[$item['section']][$zone]['#data'] = $item; @@ -260,12 +260,12 @@ function alpha_alpha_page_structure_alter(&$vars) { } foreach ($theme->sections as $section => $item) { - if (isset($temporary[$section])) { + if (isset($temporary[$section])) { $temporary[$section]['#theme_wrappers'] = array('section'); $temporary[$section]['#section'] = $section; } } - + $vars = array_merge($vars, $temporary); } @@ -273,8 +273,8 @@ function alpha_alpha_page_structure_alter(&$vars) { * Implements hook_preprocess_section(). */ function template_preprocess_section(&$vars) { - $vars['theme_hook_suggestions'][] = 'section__' . $vars['elements']['#section']; - $vars['section'] = $vars['elements']['#section']; + $vars['theme_hook_suggestions'][] = 'section__' . $vars['elements']['#section']; + $vars['section'] = $vars['elements']['#section']; $vars['content'] = $vars['elements']['#children']; $vars['attributes_array']['id'] = drupal_html_id('section-' . $vars['section']); $vars['classes_array'] = array('section', $vars['attributes_array']['id']); @@ -289,15 +289,15 @@ function template_preprocess_zone(&$vars) { $vars['content'] = $vars['elements']['#children']; $vars['wrapper'] = $vars['elements']['#data']['wrapper']; $vars['columns'] = $vars['elements']['#data']['columns']; - + $vars['content_attributes_array']['id'] = drupal_html_id('zone-' . $vars['zone']); $vars['content_attributes_array']['class'] = array('zone', $vars['content_attributes_array']['id'], 'clearfix'); - + if ($vars['wrapper']) { $vars['attributes_array']['id'] = drupal_html_id($vars['content_attributes_array']['id'] . '-wrapper'); $vars['classes_array'] = array('zone-wrapper', $vars['attributes_array']['id'], 'clearfix'); - } - + } + alpha_grid_include($vars['columns']); } @@ -308,7 +308,7 @@ function alpha_alpha_preprocess_block(&$vars) { $vars['content_attributes_array']['class'][] = 'content'; $vars['content_attributes_array']['class'][] = 'clearfix'; $vars['attributes_array']['id'] = $vars['block_html_id']; - $vars['attributes_array']['class'][] = drupal_html_class('block-' . $vars['block']->delta); + $vars['attributes_array']['class'][] = drupal_html_class('block-' . $vars['block']->delta); $vars['attributes_array']['class'][] = $vars['block_html_id']; } @@ -317,33 +317,33 @@ function alpha_alpha_preprocess_block(&$vars) { */ function alpha_alpha_preprocess_html(&$vars) { $theme = alpha_get_theme(); - + foreach (array('two-sidebars', 'one-sidebar sidebar-first', 'one-sidebar sidebar-second', 'no-sidebars') as $exclude) { - if ($index = array_search($exclude, $vars['attributes_array']['class'])) { + if ($index = array_search($exclude, $vars['attributes_array']['class'])) { unset($vars['attributes_array']['class'][$index]); } } - + // Add a CSS class based on the current page context. if (!drupal_is_front_page()) { $context = explode('/', drupal_get_path_alias()); $context = reset($context); - + if (!empty($context)) { $vars['attributes_array']['class'][] = drupal_html_class('context-' . $context); } } - + if (($theme->settings['debug']['grid'] || $theme->settings['debug']['block']) && $theme->settings['debug']['access']) { if ($theme->settings['debug']['grid'] && $theme->settings['debug']['grid_active']) { $vars['attributes_array']['class'][] = 'alpha-grid-debug'; } - + if ($theme->settings['debug']['block'] && $theme->settings['debug']['block_active']) { $vars['attributes_array']['class'][] = 'alpha-region-debug'; } } - + if($theme->settings['responsive'] && $theme->settings['viewport']['enabled']) { $meta = array( '#tag' => 'meta', @@ -355,7 +355,7 @@ function alpha_alpha_preprocess_html(&$vars) { drupal_add_html_head($meta, 'alpha-viewport'); } - + alpha_css_include(); alpha_libraries_include(); } @@ -366,14 +366,14 @@ function alpha_alpha_preprocess_html(&$vars) { function alpha_alpha_preprocess_page(&$vars) { $theme = alpha_get_theme(); $theme->page = &$vars; - + $vars['feed_icons'] = $theme->settings['toggle']['feed_icons'] ? $vars['feed_icons'] : NULL; $vars['tabs'] = $theme->settings['toggle']['tabs'] ? $vars['tabs'] : NULL; $vars['action_links'] = $theme->settings['toggle']['action_links'] ? $vars['action_links'] : NULL; - $vars['show_messages'] = $theme->settings['toggle']['messages'] ? $vars['show_messages'] : FALSE; + $vars['show_messages'] = $theme->settings['toggle']['messages'] ? $vars['show_messages'] : FALSE; $vars['site_name_hidden'] = $theme->settings['hidden']['site_name']; $vars['site_slogan_hidden'] = $theme->settings['hidden']['site_slogan']; - $vars['title_hidden'] = $theme->settings['hidden']['title']; + $vars['title_hidden'] = $theme->settings['hidden']['title']; $vars['attributes_array']['id'] = 'page'; $vars['attributes_array']['class'][] = 'clearfix'; } @@ -392,7 +392,7 @@ function alpha_alpha_preprocess_region(&$vars) { */ function alpha_alpha_process_page(&$vars) { $theme = alpha_get_theme(); - + $vars['title'] = $theme->settings['toggle']['page_title'] ? $vars['title'] : NULL; $vars['breadcrumb'] = $theme->settings['toggle']['breadcrumb'] ? $vars['breadcrumb'] : NULL; -} \ No newline at end of file +} diff --git a/alpha/templates/block.tpl.php b/alpha/templates/block.tpl.php index 84c613b..5b9ec46 100644 --- a/alpha/templates/block.tpl.php +++ b/alpha/templates/block.tpl.php @@ -1,4 +1,4 @@ ->subject; ?> - + > - \ No newline at end of file + diff --git a/alpha/templates/html.tpl.php b/alpha/templates/html.tpl.php index 796e10c..b7a7151 100644 --- a/alpha/templates/html.tpl.php +++ b/alpha/templates/html.tpl.php @@ -1,4 +1,4 @@ - - \ No newline at end of file + diff --git a/alpha/templates/page.tpl.php b/alpha/templates/page.tpl.php index 8a4a327..b6b38f2 100644 --- a/alpha/templates/page.tpl.php +++ b/alpha/templates/page.tpl.php @@ -1,4 +1,4 @@ - - + - - + + - \ No newline at end of file + diff --git a/alpha/templates/region.tpl.php b/alpha/templates/region.tpl.php index ac7a835..3741d17 100644 --- a/alpha/templates/region.tpl.php +++ b/alpha/templates/region.tpl.php @@ -1,4 +1,4 @@ -> - \ No newline at end of file + diff --git a/alpha/templates/section.tpl.php b/alpha/templates/section.tpl.php index f457512..3a5dc29 100644 --- a/alpha/templates/section.tpl.php +++ b/alpha/templates/section.tpl.php @@ -1,4 +1,4 @@ - > - \ No newline at end of file + diff --git a/alpha/templates/zone.tpl.php b/alpha/templates/zone.tpl.php index 00ba65a..17032ca 100644 --- a/alpha/templates/zone.tpl.php +++ b/alpha/templates/zone.tpl.php @@ -1,11 +1,11 @@ - -> +> > - \ No newline at end of file + diff --git a/alpha/theme-settings.php b/alpha/theme-settings.php index 43284f3..fe8e498 100644 --- a/alpha/theme-settings.php +++ b/alpha/theme-settings.php @@ -4,38 +4,38 @@ require_once dirname(__FILE__) . '/includes/alpha.inc'; require_once dirname(__FILE__) . '/includes/base.inc'; require_once dirname(__FILE__) . '/includes/theme-settings-general.inc'; require_once dirname(__FILE__) . '/includes/theme-settings-structure.inc'; - + /** * Implements hook_form_system_theme_settings_alter() */ function alpha_form_system_theme_settings_alter(&$form, &$form_state) { drupal_add_css(drupal_get_path('theme', 'alpha') . '/css/alpha-theme-settings.css', array('group' => CSS_THEME, 'weight' => 100)); - + $theme = alpha_get_theme(); $form_state['theme'] = $theme->theme; $form_state['regions'] = $theme->regions; $form_state['zones'] = $theme->zones; - + $form['alpha_settings'] = array( '#type' => 'vertical_tabs', '#weight' => -10, '#prefix' => t('

Layout configuration

'), ); - + alpha_theme_settings_general($form, $form_state); alpha_theme_settings_structure($form, $form_state); - + $form['#validate'][] = 'alpha_theme_settings_form_validate'; $form['#submit'][] = 'alpha_theme_settings_form_submit'; } /** - * Form element validation handler for replacing the value "_none" with NULL. + * Form element validation handler for replacing the value "_none" with NULL. */ function alpha_theme_settings_validate_not_empty(&$element, &$form_state) { if ($element['#value'] == '_none') { form_set_value($element, NULL, $form_state); - } + } } /** @@ -44,13 +44,13 @@ function alpha_theme_settings_validate_not_empty(&$element, &$form_state) { function alpha_theme_settings_validate_primary(&$element, &$form_state) { if ($element['#value'] != '_none') { $values = $form_state['values']; - + if ($values['alpha_region_' . $element['#value'] . '_zone'] != $element['#zone']) { form_set_value($element, NULL, $form_state); } else { $sum = 0; - + foreach ($form_state['regions'] as $region => $item) { if ($values['alpha_region_' . $region . '_zone'] == $element['#zone']) { $sum += $values['alpha_region_' . $region . '_columns']; @@ -58,7 +58,7 @@ function alpha_theme_settings_validate_primary(&$element, &$form_state) { $sum += $values['alpha_region_' . $region . '_suffix']; } } - + if ($sum > $values['alpha_zone_' . $element['#zone'] . '_columns']) { form_error($element, t('You have specified the %region region as the primary region for the %zone zone but the summed region width is greater than the number of available columns for that zone.', array('%region' => $form_state['regions'][$element['#value']]['name'], '%zone' => $form_state['zones'][$element['#zone']]['name']))); } @@ -105,33 +105,33 @@ function alpha_theme_settings_form_submit($form, &$form_state) { /** * A helper function to return a proper options array for a form. - * + * * @param $start * The number to start with. - * + * * @param $end * The number to end with. - * + * * @param $step * The size of a step. - * - * @return + * + * @return * An array of scale options. */ function alpha_scale_options($start, $end, $step) { - $options = array(); + $options = array(); foreach (range($start, $end, $step) as $number) { // Format the value to display with one decimal. $options[(string) $number] = number_format($number, 1); } - + return $options; } /** * A helper function to return a proper options array for a form. - * - * @return + * + * @return * An array of optional or responsive stylesheet options. */ function alpha_css_options($css) { @@ -139,25 +139,25 @@ function alpha_css_options($css) { foreach ($css as $key => $info) { $output[$key] = '' . check_plain($info['name']) . ' (' . (isset($info['options']['media']) ? $info['options']['media'] : 'all') . ') - ' . $info['file'] . '
' . $info['description'] . '
'; } - + return $output; } /** * A helper function to return a proper options array for a form. - * + * * @param $theme * The key (machin-readable name) of a theme. - * + * * @see * hook_css_alter(). - * - * @return + * + * @return * An array of stylesheets that can be disabled / excluded with * hook_css_alter(). */ function alpha_exclude_options($theme) { - $output = array(); + $output = array(); foreach (alpha_retrieve_excludes($theme) as $key => $info) { if ($info['type'] == 'exclude') { $output[$key] = '' . basename($key) . ' - ' . t('Defined by') . ' ' . $info['name'] . '
' . $info['description'] . '
'; @@ -166,14 +166,14 @@ function alpha_exclude_options($theme) { $output[$key] = '' . basename($key) . ' (' . $info['media'] . ') - ' . t('Belongs to') . ' ' . $info['name'] . '
' . $info['description'] . '
'; } } - + return $output; } /** * A helper function to return a proper options array for a form. - * - * @return + * + * @return * An array of available grids. */ function alpha_grid_options($grids) { @@ -181,17 +181,17 @@ function alpha_grid_options($grids) { foreach ($grids as $key => $info) { $output[$key] = check_plain($info['name']); } - + return $output; } /** * A helper function to return a proper options array for a form. - * + * * @param $grid * The name of a grid. - * - * @return + * + * @return * An array of available layouts. */ function alpha_grid_layouts_options($grid) { @@ -201,32 +201,32 @@ function alpha_grid_layouts_options($grid) { $output[$key] = check_plain($info['name']); } } - + return $output; } /** * A helper function to return a proper options array for a form. - * - * @return + * + * @return * An array of available libraries. */ -function alpha_library_options($libraries) { +function alpha_library_options($libraries) { $output = array(); foreach ($libraries as $key => $info) { $output[$key] = check_plain($info['name']) . '
' . $info['description'] . '
'; } - + return $output; } /** * A helper function to return a proper options array for a form. - * + * * @param $grid * The grid that you want to fetch the available containers for. - * - * @return + * + * @return * An array of available containers. */ function alpha_container_options($grid) { @@ -236,34 +236,34 @@ function alpha_container_options($grid) { $output[$count] = t('@count Columns', array('@count' => $count)); } } - + return $output; } /** * A helper function to return a proper options array for a form. - * + * * @param $max * The maximum number of columns that you want to cover. - * - * @return + * + * @return * An array of available columns counts. */ function alpha_column_options($max = NULL) { - $output = array(); + $output = array(); if (isset($max)) { foreach (range(0, $max) as $width) { $output[$width] = t('@width Columns', array('@width' => $width)); } } - + return $output; } /** * A helper function to return a proper options array for a form. - * - * @return + * + * @return * An array of available zones. */ function alpha_zone_options($zones) { @@ -271,14 +271,14 @@ function alpha_zone_options($zones) { foreach ($zones as $key => $info) { $output[$key] = check_plain($info['name']); } - + return $output; } /** * A helper function to return a proper options array for a form. - * - * @return + * + * @return * An array of available regions. */ function alpha_region_options($regions) { @@ -286,7 +286,7 @@ function alpha_region_options($regions) { foreach ($regions as $region => $item) { $output[$region] = $item['name']; } - + return $output; } @@ -303,6 +303,6 @@ function alpha_zone_regions($zone, $regions) { $matches[$region] = $info; } } - + return alpha_region_options($matches); -} \ No newline at end of file +} diff --git a/omega/css/formalize.css b/omega/css/formalize.css index bf24187..904c5f6 100644 --- a/omega/css/formalize.css +++ b/omega/css/formalize.css @@ -238,4 +238,4 @@ optgroup { .ie6-input-disabled { background: #eee; -} \ No newline at end of file +} diff --git a/omega/css/omega-branding.css b/omega/css/omega-branding.css index 70fd3ba..5b92d28 100644 --- a/omega/css/omega-branding.css +++ b/omega/css/omega-branding.css @@ -23,4 +23,4 @@ .site-slogan { font-weight: normal; -} \ No newline at end of file +} diff --git a/omega/css/omega-forms.css b/omega/css/omega-forms.css index aba036f..2996bef 100644 --- a/omega/css/omega-forms.css +++ b/omega/css/omega-forms.css @@ -8,4 +8,4 @@ label { font-weight: bold; -} \ No newline at end of file +} diff --git a/omega/css/omega-menu.css b/omega/css/omega-menu.css index 42bab84..32e97b3 100644 --- a/omega/css/omega-menu.css +++ b/omega/css/omega-menu.css @@ -4,5 +4,5 @@ } .menu li { - list-style: none; -} \ No newline at end of file + list-style: none; +} diff --git a/omega/css/omega-text.css b/omega/css/omega-text.css index e169dd5..632f6dc 100644 --- a/omega/css/omega-text.css +++ b/omega/css/omega-text.css @@ -109,4 +109,4 @@ dd { font-size: 0.9em; font-style: italic; margin-bottom: 20px; -} \ No newline at end of file +} diff --git a/omega/css/omega-visuals.css b/omega/css/omega-visuals.css index 2152890..6f057e0 100644 --- a/omega/css/omega-visuals.css +++ b/omega/css/omega-visuals.css @@ -233,4 +233,4 @@ td ul.links { .description { font-size: 10px; color: #6a6a6a; -} \ No newline at end of file +} diff --git a/omega/images/button.png b/omega/images/button.png index c465162..e842396 100644 Binary files a/omega/images/button.png and b/omega/images/button.png differ diff --git a/omega/images/select-arrow.gif b/omega/images/select-arrow.gif index 004c3bf..f76a4ac 100644 Binary files a/omega/images/select-arrow.gif and b/omega/images/select-arrow.gif differ diff --git a/omega/includes/omega.inc b/omega/includes/omega.inc index 85af615..315f9e9 100644 --- a/omega/includes/omega.inc +++ b/omega/includes/omega.inc @@ -7,21 +7,21 @@ /** * A wrapper function for theme_get_settings(). - * + * * @param $name * The name of the setting that you want to retrieve. - * + * * @param $theme (optional) * The name (key) of the theme that you want to fetch the * setting for. Defaults to the global variable $theme_key. - * + * * @param $default (optional) * The name (key) of the theme that you want to fetch the * setting for. Defaults to NULL. - * - * @see + * + * @see * theme_get_setting(). - * + * * @deprecated */ function omega_theme_get_setting($name, $default = NULL, $theme = NULL) { @@ -30,27 +30,27 @@ function omega_theme_get_setting($name, $default = NULL, $theme = NULL) { /** * A helper function for retrieving zone settings. - * + * * @param $name * The name of the setting that you want to retrieve. - * + * * @param $zone * The zone that you want to fetch the setting for. - * + * * @param $theme (optional) * The name (key) of the theme that you want to fetch the * setting for. Defaults to the global variable $theme_key. - * + * * @param $default (optional) * The name (key) of the theme that you want to fetch the * setting for. Defaults to NULL. - * - * @see + * + * @see * alpha_theme_get_setting(). - * + * * @see * theme_get_setting(). - * + * * @deprecated */ function omega_zone_get_setting($name, $zone, $default = NULL, $theme = NULL) { @@ -59,27 +59,27 @@ function omega_zone_get_setting($name, $zone, $default = NULL, $theme = NULL) { /** * A helper function for retrieving region settings. - * + * * @param $name * The name of the setting that you want to retrieve. - * + * * @param $region * The region that you want to fetch the setting for. - * + * * @param $theme (optional) * The name (key) of the theme that you want to fetch the * setting for. Defaults to the global variable $theme_key. - * + * * @param $default (optional) * The name (key) of the theme that you want to fetch the * setting for. Defaults to NULL. - * - * @see + * + * @see * alpha_theme_get_setting(). - * + * * @see * theme_get_setting(). - * + * * @deprecated */ function omega_region_get_setting($name, $region, $default = NULL, $theme = NULL) { @@ -92,4 +92,4 @@ function omega_region_get_setting($name, $region, $default = NULL, $theme = NULL */ function omega_settings() { return alpha_settings(); -} \ No newline at end of file +} diff --git a/omega/includes/omega.theme.inc b/omega/includes/omega.theme.inc index 0ea7c4d..93ab1dc 100644 --- a/omega/includes/omega.theme.inc +++ b/omega/includes/omega.theme.inc @@ -20,7 +20,7 @@ */ function omega_pager($vars) { global $pager_page_array, $pager_total; - + $tags = $vars['tags']; $element = $vars['element']; $parameters = $vars['parameters']; @@ -46,7 +46,7 @@ function omega_pager($vars) { $i = $i + ($pager_max - $pager_last); $pager_last = $pager_max; } - + if ($i <= 0) { // Adjust "center" if at start of query. $pager_last = $pager_last + (1 - $i); @@ -66,7 +66,7 @@ function omega_pager($vars) { 'data' => $li_first, ); } - + if ($li_previous) { $items[] = array( 'class' => array('pager-previous'), @@ -82,7 +82,7 @@ function omega_pager($vars) { 'data' => '…', ); } - + // Now generate the actual pager piece. for (; $i <= $pager_last && $i <= $pager_max; $i++) { if ($i < $pager_current) { @@ -91,14 +91,14 @@ function omega_pager($vars) { 'data' => theme('pager_previous', array('text' => $i, 'element' => $element, 'interval' => ($pager_current - $i), 'parameters' => $parameters)), ); } - + if ($i == $pager_current) { $items[] = array( 'class' => array('pager-current'), 'data' => $i, ); } - + if ($i > $pager_current) { $items[] = array( 'class' => array('pager-item'), @@ -106,7 +106,7 @@ function omega_pager($vars) { ); } } - + if ($i < $pager_max) { $items[] = array( 'class' => array('pager-ellipsis'), @@ -114,7 +114,7 @@ function omega_pager($vars) { ); } } - + // End generation. if ($li_next) { $items[] = array( @@ -128,7 +128,7 @@ function omega_pager($vars) { 'data' => $li_last, ); } - + return '

' . t('Pages') . '

' . theme('item_list', array( 'items' => $items, 'attributes' => array('class' => array('pager', 'clearfix')), @@ -153,7 +153,7 @@ function omega_item_list($vars) { if (!empty($items)) { $output .= "<$type" . drupal_attributes($attributes) . '>'; $num_items = count($items); - + foreach ($items as $i => $item) { $attributes = array(); $children = array(); @@ -173,34 +173,34 @@ function omega_item_list($vars) { else { $data = $item; } - + if (count($children) > 0) { // Render nested list. $data .= theme_item_list(array('items' => $children, 'title' => NULL, 'type' => $type, 'attributes' => $attributes)); } - + if ($i == 0) { $attributes['class'][] = 'first'; } - + if ($i == $num_items - 1) { $attributes['class'][] = 'last'; } - + $output .= '' . $data . ""; } - + $output .= ""; } - + $output .= ''; - + return $output; } /** * Implements hook_views_mini_pager(). - * + * * This custom theming for views_mini_pager changes the previous/next * links to remove theme completely when not present to avoid the *   messing up the spacing/theming in the list. @@ -230,7 +230,7 @@ function omega_views_mini_pager($vars) { 'parameters' => $parameters, ) ); - + if (empty($li_previous)) { $li_previous = ""; } @@ -243,7 +243,7 @@ function omega_views_mini_pager($vars) { 'parameters' => $parameters, ) ); - + if (empty($li_next)) { $li_next = ""; } @@ -263,7 +263,7 @@ function omega_views_mini_pager($vars) { 'class' => array('pager-next'), 'data' => $li_next, ); - + return theme('item_list', array( 'items' => $items, @@ -280,11 +280,11 @@ function omega_views_mini_pager($vars) { */ function omega_links($vars) { global $language_url; - + $links = $vars['links']; $attributes = $vars['attributes']; $heading = $vars['heading']; - + $output = ''; if (count($links) > 0) { @@ -298,12 +298,12 @@ function omega_links($vars) { 'level' => 'h2', ); } - + $output .= '<' . $heading['level']; if (!empty($heading['class'])) { $output .= drupal_attributes(array('class' => $heading['class'])); } - + $output .= '>' . check_plain($heading['text']) . ''; } @@ -319,20 +319,20 @@ function omega_links($vars) { if ($i == 1) { $class[] = 'first'; } - + if ($i == $num_links) { $class[] = 'last'; } - + if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '' && drupal_is_front_page())) && (empty($link['language']) || $link['language']->language == $language_url->language)) { $class[] = 'active'; } - + // Add a class for has a sub-menu if(isset($link['below'])) { $class[] = 'has-subitems'; } - + $output .= ' $class)) . '>'; if (isset($link['href'])) { @@ -344,15 +344,15 @@ function omega_links($vars) { if (empty($link['html'])) { $link['title'] = check_plain($link['title']); } - + $span_attributes = ''; if (isset($link['attributes'])) { $span_attributes = drupal_attributes($link['attributes']); } - + $output .= '' . $link['title'] . ''; } - + // Theme in nested links in the UL if(isset($link['below'])) { $output .= theme('links', array( @@ -362,7 +362,7 @@ function omega_links($vars) { ), )); } - + $i++; $output .= ""; } @@ -411,7 +411,7 @@ function omega_menu_local_task($vars) { if (empty($link['localized_options']['html'])) { $link['title'] = check_plain($link['title']); } - + $link['localized_options']['html'] = TRUE; $link_text = t('!local-task-title!active', array('!local-task-title' => $link['title'], '!active' => $active)); } diff --git a/omega/js/jquery.formalize.js b/omega/js/jquery.formalize.js index d5bafb6..ba5e491 100644 --- a/omega/js/jquery.formalize.js +++ b/omega/js/jquery.formalize.js @@ -137,4 +137,4 @@ var FORMALIZE = (function($, window, document, undefined) { // Automatically calls all functions in FORMALIZE.init jQuery(document).ready(function() { FORMALIZE.go(); -}); \ No newline at end of file +}); diff --git a/omega/js/omega-equalheights.js b/omega/js/omega-equalheights.js index a96df00..e6313c8 100644 --- a/omega/js/omega-equalheights.js +++ b/omega/js/omega-equalheights.js @@ -12,11 +12,11 @@ $(window).bind('resize.omegaequalheights', function () { $($('.equal-height-container').get().reverse()).each(function () { var elements = $(this).children('.equal-height-element').css('height', ''); - + if (!Drupal.behaviors.hasOwnProperty('omegaMediaQueries') || Drupal.omega.getCurrentLayout() != 'mobile') { var tallest = 0; - elements.each(function () { + elements.each(function () { if ($(this).height() > tallest) { tallest = $(this).height(); } @@ -33,4 +33,4 @@ }); } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/omega/js/omega-mediaqueries.js b/omega/js/omega-mediaqueries.js index 35d14a1..05d0cdd 100644 --- a/omega/js/omega-mediaqueries.js +++ b/omega/js/omega-mediaqueries.js @@ -10,7 +10,7 @@ Drupal.omega = Drupal.omega || {}; */ var current; var previous; - + /** * @todo */ @@ -19,73 +19,73 @@ Drupal.omega = Drupal.omega || {}; previous = current; current = Drupal.settings.omega.layouts.order.hasOwnProperty(index) ? Drupal.settings.omega.layouts.order[index] : 'mobile'; - if (previous != current) { - $('body').removeClass('responsive-layout-' + previous).addClass('responsive-layout-' + current); + if (previous != current) { + $('body').removeClass('responsive-layout-' + previous).addClass('responsive-layout-' + current); $.event.trigger('responsivelayout', {from: previous, to: current}); } }; - + /** * @todo */ Drupal.omega.getCurrentLayout = function () { return current; }; - + /** * @todo */ Drupal.omega.getPreviousLayout = function () { return previous; }; - + /** * @todo */ Drupal.omega.crappyBrowser = function () { return $.browser.msie && parseInt($.browser.version, 10) < 9; }; - + /** * @todo */ Drupal.omega.checkLayout = function (layout) { if (Drupal.settings.omega.layouts.queries.hasOwnProperty(layout) && Drupal.settings.omega.layouts.queries[layout]) { var output = Drupal.omega.checkQuery(Drupal.settings.omega.layouts.queries[layout]); - + if (!output && layout == Drupal.settings.omega.layouts.primary) { - var dummy = $('
').prependTo('body'); + var dummy = $('
').prependTo('body'); dummy.append(''); dummy.append(''); - + output = parseInt(dummy.css('z-index')) == 100; dummy.remove(); } - + return output; } return false; }; - + /** * @todo */ Drupal.omega.checkQuery = function (query) { - var dummy = $('
').prependTo('body'); - + var dummy = $('
').prependTo('body'); + dummy.append(''); dummy.append(''); var output = parseInt(dummy.css('z-index')) == 100; - + dummy.remove(); return output; }; - + /** * @todo */ @@ -110,4 +110,4 @@ Drupal.omega = Drupal.omega || {}; }); } }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/omega/logo.png b/omega/logo.png index 439e6bf..0b6fd28 100644 Binary files a/omega/logo.png and b/omega/logo.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc index 63824e4..e09dfc9 100644 --- a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc +++ b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.inc @@ -15,4 +15,3 @@ function omega_omega_12_onecol_panels_layouts() { return $items; } - diff --git a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png index 176ed69..f79a400 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png and b/omega/panels/layouts/omega_12/omega_12_onecol/omega_12_onecol.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png index 468f8bb..73c3a28 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png and b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4/omega_12_threecol_4_4_4.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png index ffd1351..85cc372 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png and b/omega/panels/layouts/omega_12/omega_12_threecol_4_4_4_stacked/omega_12_threecol_4_4_4_stacked.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png index efa3577..e34d9ac 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png and b/omega/panels/layouts/omega_12/omega_12_twocol_3_9/omega_12_twocol_3_9.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png index 9d2965e..5d11db5 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6/omega_12_twocol_6_6.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png index 450395c..575951a 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_bricks/omega_12_twocol_6_6_bricks.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png index 30ab8b6..df2e137 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_6_6_stacked.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_8_4_stacked.png b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_8_4_stacked.png index 9940de3..609ed05 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_8_4_stacked.png and b/omega/panels/layouts/omega_12/omega_12_twocol_6_6_stacked/omega_12_twocol_8_4_stacked.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_10_2.png b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_10_2.png index 27de760..772f0dc 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_10_2.png and b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_10_2.png differ diff --git a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png index 27de760..772f0dc 100644 Binary files a/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png and b/omega/panels/layouts/omega_12/omega_12_twocol_9_3/omega_12_twocol_9_3.png differ diff --git a/omega/panels/layouts/omega_12/omega_panels_admin_12.css b/omega/panels/layouts/omega_12/omega_panels_admin_12.css index a838741..b6b140f 100644 --- a/omega/panels/layouts/omega_12/omega_panels_admin_12.css +++ b/omega/panels/layouts/omega_12/omega_panels_admin_12.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12 { display: inline; float: left; diff --git a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc index 608b2ad..affd148 100644 --- a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc +++ b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.inc @@ -15,4 +15,3 @@ function omega_omega_16_onecol_panels_layouts() { return $items; } - diff --git a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png index 176ed69..f79a400 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png and b/omega/panels/layouts/omega_16/omega_16_onecol/omega_16_onecol.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png index 468f8bb..73c3a28 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png and b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5/omega_16_threecol_5_6_5.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png index ffd1351..85cc372 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png and b/omega/panels/layouts/omega_16/omega_16_threecol_5_6_5_stacked/omega_16_threecol_5_6_5_stacked.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png index 27de760..772f0dc 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png and b/omega/panels/layouts/omega_16/omega_16_twocol_12_4/omega_16_twocol_12_4.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png index efa3577..e34d9ac 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png and b/omega/panels/layouts/omega_16/omega_16_twocol_4_12/omega_16_twocol_4_12.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png index 9d2965e..5d11db5 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png and b/omega/panels/layouts/omega_16/omega_16_twocol_8_8/omega_16_twocol_8_8.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png index 450395c..575951a 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png and b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_bricks/omega_16_twocol_8_8_bricks.png differ diff --git a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png index 30ab8b6..df2e137 100644 Binary files a/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png and b/omega/panels/layouts/omega_16/omega_16_twocol_8_8_stacked/omega_16_twocol_8_8_stacked.png differ diff --git a/omega/panels/layouts/omega_16/omega_panels_admin_16.css b/omega/panels/layouts/omega_16/omega_panels_admin_16.css index 4d892ef..505575f 100644 --- a/omega/panels/layouts/omega_16/omega_panels_admin_16.css +++ b/omega/panels/layouts/omega_16/omega_panels_admin_16.css @@ -4,7 +4,7 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16 { display: inline; float: left; diff --git a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc index f48cdde..99c975a 100644 --- a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc +++ b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.inc @@ -15,4 +15,3 @@ function omega_omega_24_onecol_panels_layouts() { return $items; } - diff --git a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png index 176ed69..f79a400 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png and b/omega/panels/layouts/omega_24/omega_24_onecol/omega_24_onecol.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png index 468f8bb..73c3a28 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png and b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8/omega_24_threecol_8_8_8.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png index ffd1351..85cc372 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png and b/omega/panels/layouts/omega_24/omega_24_threecol_8_8_8_stacked/omega_24_threecol_8_8_8_stacked.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png index 9d2965e..5d11db5 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png and b/omega/panels/layouts/omega_24/omega_24_twocol_12_12/omega_24_twocol_12_12.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png index 450395c..575951a 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png and b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_bricks/omega_24_twocol_12_12_bricks.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png index 30ab8b6..df2e137 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png and b/omega/panels/layouts/omega_24/omega_24_twocol_12_12_stacked/omega_24_twocol_12_12_stacked.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png index 27de760..772f0dc 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png and b/omega/panels/layouts/omega_24/omega_24_twocol_18_6/omega_24_twocol_18_6.png differ diff --git a/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png index efa3577..e34d9ac 100644 Binary files a/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png and b/omega/panels/layouts/omega_24/omega_24_twocol_6_18/omega_24_twocol_6_18.png differ diff --git a/omega/panels/layouts/omega_24/omega_panels_admin_24.css b/omega/panels/layouts/omega_24/omega_panels_admin_24.css index 7481171..5015282 100644 --- a/omega/panels/layouts/omega_24/omega_panels_admin_24.css +++ b/omega/panels/layouts/omega_24/omega_panels_admin_24.css @@ -4,8 +4,8 @@ * ========================================================== */ -.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, -.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, +.grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, +.grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 { display: inline; float: left; diff --git a/omega/screenshot.png b/omega/screenshot.png index d8b3218..dfd3d23 100644 Binary files a/omega/screenshot.png and b/omega/screenshot.png differ diff --git a/omega/templates/block.tpl.php b/omega/templates/block.tpl.php index 91f7bd1..f357261 100644 --- a/omega/templates/block.tpl.php +++ b/omega/templates/block.tpl.php @@ -6,9 +6,9 @@ >subject; ?> - + > -> \ No newline at end of file +> diff --git a/omega/templates/html.tpl.php b/omega/templates/html.tpl.php index d08b2a3..9f4ef38 100644 --- a/omega/templates/html.tpl.php +++ b/omega/templates/html.tpl.php @@ -2,7 +2,7 @@ version . $rdf->namespaces; ?>> profile; ?>> - <?php print $head_title; ?> + <?php print $head_title; ?> @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/omega/templates/node.tpl.php b/omega/templates/node.tpl.php index 3a25bd1..fae8079 100644 --- a/omega/templates/node.tpl.php +++ b/omega/templates/node.tpl.php @@ -9,8 +9,8 @@
--
- - + + > - +
@@ -27,4 +27,4 @@
- \ No newline at end of file + diff --git a/omega/templates/region--branding.tpl.php b/omega/templates/region--branding.tpl.php index ab0cc16..06204e6 100644 --- a/omega/templates/region--branding.tpl.php +++ b/omega/templates/region--branding.tpl.php @@ -9,10 +9,10 @@ -
+
- +

@@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/omega/templates/region--content.tpl.php b/omega/templates/region--content.tpl.php index 5c3f164..34d9fbb 100644 --- a/omega/templates/region--content.tpl.php +++ b/omega/templates/region--content.tpl.php @@ -13,4 +13,4 @@
- \ No newline at end of file + diff --git a/omega/templates/region--sidebar_first.tpl.php b/omega/templates/region--sidebar_first.tpl.php index a823ad7..4362562 100644 --- a/omega/templates/region--sidebar_first.tpl.php +++ b/omega/templates/region--sidebar_first.tpl.php @@ -2,4 +2,4 @@ > - \ No newline at end of file + diff --git a/omega/templates/region--sidebar_second.tpl.php b/omega/templates/region--sidebar_second.tpl.php index a823ad7..4362562 100644 --- a/omega/templates/region--sidebar_second.tpl.php +++ b/omega/templates/region--sidebar_second.tpl.php @@ -2,4 +2,4 @@ > - \ No newline at end of file + diff --git a/omega/templates/region.tpl.php b/omega/templates/region.tpl.php index dcb6f20..50300b0 100644 --- a/omega/templates/region.tpl.php +++ b/omega/templates/region.tpl.php @@ -2,4 +2,4 @@ > - \ No newline at end of file + diff --git a/omega/templates/section--footer.tpl.php b/omega/templates/section--footer.tpl.php index 1d7787a..0aa7f7a 100644 --- a/omega/templates/section--footer.tpl.php +++ b/omega/templates/section--footer.tpl.php @@ -1,3 +1,3 @@ > - \ No newline at end of file + diff --git a/omega/templates/section--header.tpl.php b/omega/templates/section--header.tpl.php index da25ce5..d59cbe0 100644 --- a/omega/templates/section--header.tpl.php +++ b/omega/templates/section--header.tpl.php @@ -1,3 +1,3 @@ > - \ No newline at end of file + diff --git a/omega/templates/section.tpl.php b/omega/templates/section.tpl.php index 5cd5d8e..1fcbde5 100644 --- a/omega/templates/section.tpl.php +++ b/omega/templates/section.tpl.php @@ -1,3 +1,3 @@ > - \ No newline at end of file + diff --git a/omega/templates/zone--content.tpl.php b/omega/templates/zone--content.tpl.php index 963e388..7f79cce 100644 --- a/omega/templates/zone--content.tpl.php +++ b/omega/templates/zone--content.tpl.php @@ -1,11 +1,11 @@ -> - > +> + > - +
- \ No newline at end of file + diff --git a/omega/theme-settings.php b/omega/theme-settings.php index 55b5d7a..3497e33 100644 --- a/omega/theme-settings.php +++ b/omega/theme-settings.php @@ -5,18 +5,18 @@ */ function omega_form_system_theme_settings_alter(&$form, &$form_state) { $theme = alpha_get_theme(); - + foreach($theme->regions as $region => $item) { $zone = $item['enabled'] ? $item['zone'] : '__unassigned__'; $section = $item['enabled'] && $theme->zones[$item['zone']]['enabled'] ? $theme->zones[$item['zone']]['section'] : '__unassigned__'; - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_equal_height_element'] = array( '#type' => 'value', '#default_value' => $item['equal_height_element'], '#element_validate' => array('omega_theme_settings_validate_equal_height'), '#zone' => $zone != '__unassigned__' ? $zone : NULL, ); - + $form['alpha_settings']['structure'][$section][$zone]['regions'][$region]['alpha_region_' . $region . '_equal_height_container'] = array( '#type' => 'checkbox', '#title' => t('Force equal height for all child elements'), @@ -30,10 +30,10 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) { ), ); } - + foreach ($theme->zones as $zone => $item) { $section = $item['enabled'] ? $item['section'] : '__unassigned__'; - + $form['alpha_settings']['structure'][$section][$zone]['zone']['alpha_zone_' . $zone . '_equal_height_container'] = array( '#type' => 'checkbox', '#title' => t('Force equal height for all child elements.'), @@ -54,6 +54,6 @@ function omega_form_system_theme_settings_alter(&$form, &$form_state) { */ function omega_theme_settings_validate_equal_height($element, &$form_state) { $value = isset($element['#zone']) ? $form_state['values']['alpha_zone_' . $element['#zone'] . '_equal_height_container'] : FALSE; - - form_set_value($element, $value, $form_state); -} \ No newline at end of file + + form_set_value($element, $value, $form_state); +} diff --git a/starterkits/alpha-xhtml/css/README.txt b/starterkits/alpha-xhtml/css/README.txt index 36cb0a3..2f83517 100644 --- a/starterkits/alpha-xhtml/css/README.txt +++ b/starterkits/alpha-xhtml/css/README.txt @@ -22,49 +22,48 @@ Twitter: http://twitter.com/Omeglicon Any custom CSS files should be placed in this folder. -Five CSS files are provided by default. These files will be loaded according to the +Five CSS files are provided by default. These files will be loaded according to the media queries established in your theme's settings. The default values are provided below. To use these stylesheets, rename the files and YOURTHEME with the name of your theme. For example, if your theme is named beta, the files would be named: global.css (this file does not get renamed) - beta-alpha-default.css - beta-alpha-default-narrow.css + beta-alpha-default.css + beta-alpha-default-narrow.css beta-alpha-default-normal.css beta-alpha-default-wide.css -global.css +global.css * Loaded all for all layouts, including mobile. * Default media query: n/a. Always applied. * By default, this is the only stylesheet loaded for the mobile version of your site. - * This layout does not use the 960gs for its layout. It provides a linearized - view of your site's content. + * This layout does not use the 960gs for its layout. It provides a linearized + view of your site's content. YOURTHEME-alpha-default.css * Loaded for all layouts using the alpha grid (i.e. not the mobile layout). * Default media query: n/a. Applied to all layouts using the alpha grid. - * By default the alpha grid is applied when the device width is at least + * By default the alpha grid is applied when the device width is at least 740px wide. -YOURTHEME-alpha-default-narrow.css - * Loaded for all layouts using the alpha grid. Styles will "cascade" to - wider layouts. You may overwrite any styles in the normal or wide +YOURTHEME-alpha-default-narrow.css + * Loaded for all layouts using the alpha grid. Styles will "cascade" to + wider layouts. You may overwrite any styles in the normal or wide layout-specific CSS files if you wish. - * Default media query for the narrow layout is: - all and (min-width: 740px) and (min-device-width: 740px), - (max-device-width: 800px) and (min-width: 740px) + * Default media query for the narrow layout is: + all and (min-width: 740px) and (min-device-width: 740px), + (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape) YOURTHEME-alpha-default-normal.css - * By default this style sheet will be loaded for the normal and wide layouts - * Styles will "cascade" to the wide layout as well. - * Default media query for the normal layout is: - all and (min-width: 980px) and (min-device-width: 980px), - all and (max-device-width: 1024px) and (min-width: 1024px) + * By default this style sheet will be loaded for the normal and wide layouts + * Styles will "cascade" to the wide layout as well. + * Default media query for the normal layout is: + all and (min-width: 980px) and (min-device-width: 980px), + all and (max-device-width: 1024px) and (min-width: 1024px) and (orientation:landscape) YOURTHEME-alpha-default-wide.css * By default this style sheet will apply only to the widescreen layout. - * Default media query for the wide layout is: + * Default media query for the wide layout is: all and (min-width: 1220px) - diff --git a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-narrow.css b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-narrow.css index beb992c..59ff563 100644 --- a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-narrow.css +++ b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-narrow.css @@ -1,4 +1,5 @@ + /* This file will hold styles that are loaded using the same media query as the narrow grid. */ /* If you are using the default media queries provided by Omega, these styles will also - * apply to the normal and widescreen layouts. You may override these styles in the normal - * and widescreen CSS files as appropriate. */ \ No newline at end of file + * apply to the normal and widescreen layouts. You may override these styles in the normal + * and widescreen CSS files as appropriate. */ diff --git a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-normal.css b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-normal.css index e260598..0e5b167 100644 --- a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-normal.css +++ b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-normal.css @@ -1,3 +1,3 @@ /* This file will hold styles that are loaded using the same media query as the normal grid. */ /* If you are using the default media queries provided by Omega, these styles will also - * apply to the widescreen layout unless they are overridden by the widescreen styles. */ \ No newline at end of file + * apply to the widescreen layout unless they are overridden by the widescreen styles. */ diff --git a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-wide.css b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-wide.css index b2f071f..32933b8 100644 --- a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-wide.css +++ b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default-wide.css @@ -1,2 +1 @@ /* This file will hold styles that are loaded using the same media query as the wide grid. */ - diff --git a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default.css b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default.css index 969a4b8..3383c35 100644 --- a/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default.css +++ b/starterkits/alpha-xhtml/css/YOURTHEME-alpha-default.css @@ -1 +1,2 @@ -/* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */ \ No newline at end of file + +/* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */ diff --git a/starterkits/alpha-xhtml/css/global.css b/starterkits/alpha-xhtml/css/global.css index c6d546d..ac420a0 100644 --- a/starterkits/alpha-xhtml/css/global.css +++ b/starterkits/alpha-xhtml/css/global.css @@ -1,2 +1,2 @@ /* This file will hold styles for the mobile version of your website (mobile first). */ -/* This also can include ANY global CSS that applies site-wide. Unless overwritten by a more specific style rule, CSS declarations in global.css will apply site-wide. */ \ No newline at end of file +/* This also can include ANY global CSS that applies site-wide. Unless overwritten by a more specific style rule, CSS declarations in global.css will apply site-wide. */ diff --git a/starterkits/alpha-xhtml/logo.png b/starterkits/alpha-xhtml/logo.png index 439e6bf..0b6fd28 100644 Binary files a/starterkits/alpha-xhtml/logo.png and b/starterkits/alpha-xhtml/logo.png differ diff --git a/starterkits/alpha-xhtml/preprocess/README.txt b/starterkits/alpha-xhtml/preprocess/README.txt index 1936166..ee2fcfa 100644 --- a/starterkits/alpha-xhtml/preprocess/README.txt +++ b/starterkits/alpha-xhtml/preprocess/README.txt @@ -20,7 +20,7 @@ Twitter: http://twitter.com/Omeglicon ##### Preprocess Hooks ########################################################################################## -Any custom preprocess functionality can (rather than directly in template.php) be placed +Any custom preprocess functionality can (rather than directly in template.php) be placed in this preprocess folder in a file named as such: TEMPLATE_preprocess_html() = preprocess-html.inc @@ -30,10 +30,10 @@ TEMPLATE_preprocess_comment() = preprocess-comment.inc TEMPLATE_preprocess_region() = preprocess-region.inc etc. -Inside of your preprocess-HOOK.inc files, you can either directly dump the PHP code as it -would normally appear INSIDE of a preprocess function, or you can optionally (recommended) +Inside of your preprocess-HOOK.inc files, you can either directly dump the PHP code as it +would normally appear INSIDE of a preprocess function, or you can optionally (recommended) wrap the code in a custom hook for Alpha/Omega as such: function THEMENAME_alpha_preprocess_HOOK(&$vars) { // custom functionality here -} \ No newline at end of file +} diff --git a/starterkits/alpha-xhtml/process/README.txt b/starterkits/alpha-xhtml/process/README.txt index 35a9f5d..983da3e 100644 --- a/starterkits/alpha-xhtml/process/README.txt +++ b/starterkits/alpha-xhtml/process/README.txt @@ -20,7 +20,7 @@ Twitter: http://twitter.com/Omeglicon ##### Process Hooks ########################################################################################## -Any custom process functionality can (rather than directly in template.php) be placed +Any custom process functionality can (rather than directly in template.php) be placed in this process folder in a file named as such: TEMPLATE_process_html() = process-html.inc @@ -30,10 +30,10 @@ TEMPLATE_process_comment() = process-comment.inc TEMPLATE_process_region() = process-region.inc etc. -Inside of your process-HOOK.inc files, you can either directly dump the PHP code as it -would normally appear INSIDE of a process function, or you can optionally (recommended) +Inside of your process-HOOK.inc files, you can either directly dump the PHP code as it +would normally appear INSIDE of a process function, or you can optionally (recommended) wrap the code in a custom hook for Alpha/Omega as such: function THEMENAME_alpha_process_HOOK(&$vars) { // custom functionality here -} \ No newline at end of file +} diff --git a/starterkits/alpha-xhtml/screenshot.png b/starterkits/alpha-xhtml/screenshot.png index 3c97ee3..6ef5ade 100644 Binary files a/starterkits/alpha-xhtml/screenshot.png and b/starterkits/alpha-xhtml/screenshot.png differ diff --git a/starterkits/alpha-xhtml/starterkit_alpha_xhtml.info b/starterkits/alpha-xhtml/starterkit_alpha_xhtml.info index 68a29fd..c0ec585 100644 --- a/starterkits/alpha-xhtml/starterkit_alpha_xhtml.info +++ b/starterkits/alpha-xhtml/starterkit_alpha_xhtml.info @@ -172,4 +172,4 @@ settings[alpha_region_footer_columns] = '12' settings[alpha_region_footer_suffix] = '' settings[alpha_region_footer_weight] = '1' settings[alpha_region_footer_weight] = '1' -settings[alpha_region_footer_css] = '' \ No newline at end of file +settings[alpha_region_footer_css] = '' diff --git a/starterkits/alpha-xhtml/template.php b/starterkits/alpha-xhtml/template.php index 820fd82..eab7941 100644 --- a/starterkits/alpha-xhtml/template.php +++ b/starterkits/alpha-xhtml/template.php @@ -5,8 +5,8 @@ * This file is empty by default because the base theme chain (Alpha & Omega) provides * all the basic functionality. However, in case you wish to customize the output that Drupal * generates through Alpha & Omega this file is a good place to do so. - * + * * Alpha comes with a neat solution for keeping this file as clean as possible while the code * for your subtheme grows. Please read the README.txt in the /preprocess and /process subfolders * for more information on this topic. - */ \ No newline at end of file + */ diff --git a/starterkits/alpha-xhtml/templates/README.txt b/starterkits/alpha-xhtml/templates/README.txt index cc26307..a18a310 100644 --- a/starterkits/alpha-xhtml/templates/README.txt +++ b/starterkits/alpha-xhtml/templates/README.txt @@ -19,8 +19,8 @@ Twitter: http://twitter.com/Omeglicon ########################################################################################## The templates folder is here to organize any custom templates you have for your subhteme. -The HTML5 Starterkit (and subthemes) uses all default templates in the Omega base theme, -and is why this directory is empty. +The HTML5 Starterkit (and subthemes) uses all default templates in the Omega base theme, +and is why this directory is empty. -Any page, node, etc. templates you need to customize can be copied here, and customized -accordingly. \ No newline at end of file +Any page, node, etc. templates you need to customize can be copied here, and customized +accordingly. diff --git a/starterkits/omega-html5/css/README.txt b/starterkits/omega-html5/css/README.txt index 36cb0a3..2f83517 100644 --- a/starterkits/omega-html5/css/README.txt +++ b/starterkits/omega-html5/css/README.txt @@ -22,49 +22,48 @@ Twitter: http://twitter.com/Omeglicon Any custom CSS files should be placed in this folder. -Five CSS files are provided by default. These files will be loaded according to the +Five CSS files are provided by default. These files will be loaded according to the media queries established in your theme's settings. The default values are provided below. To use these stylesheets, rename the files and YOURTHEME with the name of your theme. For example, if your theme is named beta, the files would be named: global.css (this file does not get renamed) - beta-alpha-default.css - beta-alpha-default-narrow.css + beta-alpha-default.css + beta-alpha-default-narrow.css beta-alpha-default-normal.css beta-alpha-default-wide.css -global.css +global.css * Loaded all for all layouts, including mobile. * Default media query: n/a. Always applied. * By default, this is the only stylesheet loaded for the mobile version of your site. - * This layout does not use the 960gs for its layout. It provides a linearized - view of your site's content. + * This layout does not use the 960gs for its layout. It provides a linearized + view of your site's content. YOURTHEME-alpha-default.css * Loaded for all layouts using the alpha grid (i.e. not the mobile layout). * Default media query: n/a. Applied to all layouts using the alpha grid. - * By default the alpha grid is applied when the device width is at least + * By default the alpha grid is applied when the device width is at least 740px wide. -YOURTHEME-alpha-default-narrow.css - * Loaded for all layouts using the alpha grid. Styles will "cascade" to - wider layouts. You may overwrite any styles in the normal or wide +YOURTHEME-alpha-default-narrow.css + * Loaded for all layouts using the alpha grid. Styles will "cascade" to + wider layouts. You may overwrite any styles in the normal or wide layout-specific CSS files if you wish. - * Default media query for the narrow layout is: - all and (min-width: 740px) and (min-device-width: 740px), - (max-device-width: 800px) and (min-width: 740px) + * Default media query for the narrow layout is: + all and (min-width: 740px) and (min-device-width: 740px), + (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape) YOURTHEME-alpha-default-normal.css - * By default this style sheet will be loaded for the normal and wide layouts - * Styles will "cascade" to the wide layout as well. - * Default media query for the normal layout is: - all and (min-width: 980px) and (min-device-width: 980px), - all and (max-device-width: 1024px) and (min-width: 1024px) + * By default this style sheet will be loaded for the normal and wide layouts + * Styles will "cascade" to the wide layout as well. + * Default media query for the normal layout is: + all and (min-width: 980px) and (min-device-width: 980px), + all and (max-device-width: 1024px) and (min-width: 1024px) and (orientation:landscape) YOURTHEME-alpha-default-wide.css * By default this style sheet will apply only to the widescreen layout. - * Default media query for the wide layout is: + * Default media query for the wide layout is: all and (min-width: 1220px) - diff --git a/starterkits/omega-html5/css/YOURTHEME-alpha-default-narrow.css b/starterkits/omega-html5/css/YOURTHEME-alpha-default-narrow.css index beb992c..59ff563 100644 --- a/starterkits/omega-html5/css/YOURTHEME-alpha-default-narrow.css +++ b/starterkits/omega-html5/css/YOURTHEME-alpha-default-narrow.css @@ -1,4 +1,5 @@ + /* This file will hold styles that are loaded using the same media query as the narrow grid. */ /* If you are using the default media queries provided by Omega, these styles will also - * apply to the normal and widescreen layouts. You may override these styles in the normal - * and widescreen CSS files as appropriate. */ \ No newline at end of file + * apply to the normal and widescreen layouts. You may override these styles in the normal + * and widescreen CSS files as appropriate. */ diff --git a/starterkits/omega-html5/css/YOURTHEME-alpha-default-normal.css b/starterkits/omega-html5/css/YOURTHEME-alpha-default-normal.css index e260598..0e5b167 100644 --- a/starterkits/omega-html5/css/YOURTHEME-alpha-default-normal.css +++ b/starterkits/omega-html5/css/YOURTHEME-alpha-default-normal.css @@ -1,3 +1,3 @@ /* This file will hold styles that are loaded using the same media query as the normal grid. */ /* If you are using the default media queries provided by Omega, these styles will also - * apply to the widescreen layout unless they are overridden by the widescreen styles. */ \ No newline at end of file + * apply to the widescreen layout unless they are overridden by the widescreen styles. */ diff --git a/starterkits/omega-html5/css/YOURTHEME-alpha-default-wide.css b/starterkits/omega-html5/css/YOURTHEME-alpha-default-wide.css index f914f1e..32933b8 100644 --- a/starterkits/omega-html5/css/YOURTHEME-alpha-default-wide.css +++ b/starterkits/omega-html5/css/YOURTHEME-alpha-default-wide.css @@ -1 +1 @@ -/* This file will hold styles that are loaded using the same media query as the wide grid. */ \ No newline at end of file +/* This file will hold styles that are loaded using the same media query as the wide grid. */ diff --git a/starterkits/omega-html5/css/YOURTHEME-alpha-default.css b/starterkits/omega-html5/css/YOURTHEME-alpha-default.css index 969a4b8..4c1688d 100644 --- a/starterkits/omega-html5/css/YOURTHEME-alpha-default.css +++ b/starterkits/omega-html5/css/YOURTHEME-alpha-default.css @@ -1 +1 @@ -/* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */ \ No newline at end of file +/* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */ diff --git a/starterkits/omega-html5/css/global.css b/starterkits/omega-html5/css/global.css index c6d546d..ac420a0 100644 --- a/starterkits/omega-html5/css/global.css +++ b/starterkits/omega-html5/css/global.css @@ -1,2 +1,2 @@ /* This file will hold styles for the mobile version of your website (mobile first). */ -/* This also can include ANY global CSS that applies site-wide. Unless overwritten by a more specific style rule, CSS declarations in global.css will apply site-wide. */ \ No newline at end of file +/* This also can include ANY global CSS that applies site-wide. Unless overwritten by a more specific style rule, CSS declarations in global.css will apply site-wide. */ diff --git a/starterkits/omega-html5/logo.png b/starterkits/omega-html5/logo.png index 439e6bf..0b6fd28 100644 Binary files a/starterkits/omega-html5/logo.png and b/starterkits/omega-html5/logo.png differ diff --git a/starterkits/omega-html5/preprocess/README.txt b/starterkits/omega-html5/preprocess/README.txt index 1936166..ee2fcfa 100644 --- a/starterkits/omega-html5/preprocess/README.txt +++ b/starterkits/omega-html5/preprocess/README.txt @@ -20,7 +20,7 @@ Twitter: http://twitter.com/Omeglicon ##### Preprocess Hooks ########################################################################################## -Any custom preprocess functionality can (rather than directly in template.php) be placed +Any custom preprocess functionality can (rather than directly in template.php) be placed in this preprocess folder in a file named as such: TEMPLATE_preprocess_html() = preprocess-html.inc @@ -30,10 +30,10 @@ TEMPLATE_preprocess_comment() = preprocess-comment.inc TEMPLATE_preprocess_region() = preprocess-region.inc etc. -Inside of your preprocess-HOOK.inc files, you can either directly dump the PHP code as it -would normally appear INSIDE of a preprocess function, or you can optionally (recommended) +Inside of your preprocess-HOOK.inc files, you can either directly dump the PHP code as it +would normally appear INSIDE of a preprocess function, or you can optionally (recommended) wrap the code in a custom hook for Alpha/Omega as such: function THEMENAME_alpha_preprocess_HOOK(&$vars) { // custom functionality here -} \ No newline at end of file +} diff --git a/starterkits/omega-html5/process/README.txt b/starterkits/omega-html5/process/README.txt index 35a9f5d..983da3e 100644 --- a/starterkits/omega-html5/process/README.txt +++ b/starterkits/omega-html5/process/README.txt @@ -20,7 +20,7 @@ Twitter: http://twitter.com/Omeglicon ##### Process Hooks ########################################################################################## -Any custom process functionality can (rather than directly in template.php) be placed +Any custom process functionality can (rather than directly in template.php) be placed in this process folder in a file named as such: TEMPLATE_process_html() = process-html.inc @@ -30,10 +30,10 @@ TEMPLATE_process_comment() = process-comment.inc TEMPLATE_process_region() = process-region.inc etc. -Inside of your process-HOOK.inc files, you can either directly dump the PHP code as it -would normally appear INSIDE of a process function, or you can optionally (recommended) +Inside of your process-HOOK.inc files, you can either directly dump the PHP code as it +would normally appear INSIDE of a process function, or you can optionally (recommended) wrap the code in a custom hook for Alpha/Omega as such: function THEMENAME_alpha_process_HOOK(&$vars) { // custom functionality here -} \ No newline at end of file +} diff --git a/starterkits/omega-html5/screenshot.png b/starterkits/omega-html5/screenshot.png index 3c97ee3..6ef5ade 100644 Binary files a/starterkits/omega-html5/screenshot.png and b/starterkits/omega-html5/screenshot.png differ diff --git a/starterkits/omega-html5/starterkit_omega_html5.info b/starterkits/omega-html5/starterkit_omega_html5.info index 73a699b..8a0de52 100644 --- a/starterkits/omega-html5/starterkit_omega_html5.info +++ b/starterkits/omega-html5/starterkit_omega_html5.info @@ -373,4 +373,4 @@ settings[alpha_region_footer_second_prefix] = '' settings[alpha_region_footer_second_columns] = '12' settings[alpha_region_footer_second_suffix] = '' settings[alpha_region_footer_second_weight] = '2' -settings[alpha_region_footer_second_css] = '' \ No newline at end of file +settings[alpha_region_footer_second_css] = '' diff --git a/starterkits/omega-html5/template.php b/starterkits/omega-html5/template.php index 820fd82..eab7941 100644 --- a/starterkits/omega-html5/template.php +++ b/starterkits/omega-html5/template.php @@ -5,8 +5,8 @@ * This file is empty by default because the base theme chain (Alpha & Omega) provides * all the basic functionality. However, in case you wish to customize the output that Drupal * generates through Alpha & Omega this file is a good place to do so. - * + * * Alpha comes with a neat solution for keeping this file as clean as possible while the code * for your subtheme grows. Please read the README.txt in the /preprocess and /process subfolders * for more information on this topic. - */ \ No newline at end of file + */ diff --git a/starterkits/omega-html5/templates/README.txt b/starterkits/omega-html5/templates/README.txt index cc26307..a18a310 100644 --- a/starterkits/omega-html5/templates/README.txt +++ b/starterkits/omega-html5/templates/README.txt @@ -19,8 +19,8 @@ Twitter: http://twitter.com/Omeglicon ########################################################################################## The templates folder is here to organize any custom templates you have for your subhteme. -The HTML5 Starterkit (and subthemes) uses all default templates in the Omega base theme, -and is why this directory is empty. +The HTML5 Starterkit (and subthemes) uses all default templates in the Omega base theme, +and is why this directory is empty. -Any page, node, etc. templates you need to customize can be copied here, and customized -accordingly. \ No newline at end of file +Any page, node, etc. templates you need to customize can be copied here, and customized +accordingly. diff --git a/starterkits/omega-xhtml/css/README.txt b/starterkits/omega-xhtml/css/README.txt index 36cb0a3..2f83517 100644 --- a/starterkits/omega-xhtml/css/README.txt +++ b/starterkits/omega-xhtml/css/README.txt @@ -22,49 +22,48 @@ Twitter: http://twitter.com/Omeglicon Any custom CSS files should be placed in this folder. -Five CSS files are provided by default. These files will be loaded according to the +Five CSS files are provided by default. These files will be loaded according to the media queries established in your theme's settings. The default values are provided below. To use these stylesheets, rename the files and YOURTHEME with the name of your theme. For example, if your theme is named beta, the files would be named: global.css (this file does not get renamed) - beta-alpha-default.css - beta-alpha-default-narrow.css + beta-alpha-default.css + beta-alpha-default-narrow.css beta-alpha-default-normal.css beta-alpha-default-wide.css -global.css +global.css * Loaded all for all layouts, including mobile. * Default media query: n/a. Always applied. * By default, this is the only stylesheet loaded for the mobile version of your site. - * This layout does not use the 960gs for its layout. It provides a linearized - view of your site's content. + * This layout does not use the 960gs for its layout. It provides a linearized + view of your site's content. YOURTHEME-alpha-default.css * Loaded for all layouts using the alpha grid (i.e. not the mobile layout). * Default media query: n/a. Applied to all layouts using the alpha grid. - * By default the alpha grid is applied when the device width is at least + * By default the alpha grid is applied when the device width is at least 740px wide. -YOURTHEME-alpha-default-narrow.css - * Loaded for all layouts using the alpha grid. Styles will "cascade" to - wider layouts. You may overwrite any styles in the normal or wide +YOURTHEME-alpha-default-narrow.css + * Loaded for all layouts using the alpha grid. Styles will "cascade" to + wider layouts. You may overwrite any styles in the normal or wide layout-specific CSS files if you wish. - * Default media query for the narrow layout is: - all and (min-width: 740px) and (min-device-width: 740px), - (max-device-width: 800px) and (min-width: 740px) + * Default media query for the narrow layout is: + all and (min-width: 740px) and (min-device-width: 740px), + (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape) YOURTHEME-alpha-default-normal.css - * By default this style sheet will be loaded for the normal and wide layouts - * Styles will "cascade" to the wide layout as well. - * Default media query for the normal layout is: - all and (min-width: 980px) and (min-device-width: 980px), - all and (max-device-width: 1024px) and (min-width: 1024px) + * By default this style sheet will be loaded for the normal and wide layouts + * Styles will "cascade" to the wide layout as well. + * Default media query for the normal layout is: + all and (min-width: 980px) and (min-device-width: 980px), + all and (max-device-width: 1024px) and (min-width: 1024px) and (orientation:landscape) YOURTHEME-alpha-default-wide.css * By default this style sheet will apply only to the widescreen layout. - * Default media query for the wide layout is: + * Default media query for the wide layout is: all and (min-width: 1220px) - diff --git a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-narrow.css b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-narrow.css index beb992c..59ff563 100644 --- a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-narrow.css +++ b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-narrow.css @@ -1,4 +1,5 @@ + /* This file will hold styles that are loaded using the same media query as the narrow grid. */ /* If you are using the default media queries provided by Omega, these styles will also - * apply to the normal and widescreen layouts. You may override these styles in the normal - * and widescreen CSS files as appropriate. */ \ No newline at end of file + * apply to the normal and widescreen layouts. You may override these styles in the normal + * and widescreen CSS files as appropriate. */ diff --git a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-normal.css b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-normal.css index e260598..0e5b167 100644 --- a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-normal.css +++ b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-normal.css @@ -1,3 +1,3 @@ /* This file will hold styles that are loaded using the same media query as the normal grid. */ /* If you are using the default media queries provided by Omega, these styles will also - * apply to the widescreen layout unless they are overridden by the widescreen styles. */ \ No newline at end of file + * apply to the widescreen layout unless they are overridden by the widescreen styles. */ diff --git a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-wide.css b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-wide.css index f914f1e..32933b8 100644 --- a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-wide.css +++ b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default-wide.css @@ -1 +1 @@ -/* This file will hold styles that are loaded using the same media query as the wide grid. */ \ No newline at end of file +/* This file will hold styles that are loaded using the same media query as the wide grid. */ diff --git a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default.css b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default.css index 969a4b8..4c1688d 100644 --- a/starterkits/omega-xhtml/css/YOURTHEME-alpha-default.css +++ b/starterkits/omega-xhtml/css/YOURTHEME-alpha-default.css @@ -1 +1 @@ -/* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */ \ No newline at end of file +/* This file will hold styles for all layouts using the alpha grid (i.e. not the mobile layout). */ diff --git a/starterkits/omega-xhtml/css/global.css b/starterkits/omega-xhtml/css/global.css index c6d546d..ac420a0 100644 --- a/starterkits/omega-xhtml/css/global.css +++ b/starterkits/omega-xhtml/css/global.css @@ -1,2 +1,2 @@ /* This file will hold styles for the mobile version of your website (mobile first). */ -/* This also can include ANY global CSS that applies site-wide. Unless overwritten by a more specific style rule, CSS declarations in global.css will apply site-wide. */ \ No newline at end of file +/* This also can include ANY global CSS that applies site-wide. Unless overwritten by a more specific style rule, CSS declarations in global.css will apply site-wide. */ diff --git a/starterkits/omega-xhtml/logo.png b/starterkits/omega-xhtml/logo.png index 439e6bf..0b6fd28 100644 Binary files a/starterkits/omega-xhtml/logo.png and b/starterkits/omega-xhtml/logo.png differ diff --git a/starterkits/omega-xhtml/preprocess/README.txt b/starterkits/omega-xhtml/preprocess/README.txt index 1936166..ee2fcfa 100644 --- a/starterkits/omega-xhtml/preprocess/README.txt +++ b/starterkits/omega-xhtml/preprocess/README.txt @@ -20,7 +20,7 @@ Twitter: http://twitter.com/Omeglicon ##### Preprocess Hooks ########################################################################################## -Any custom preprocess functionality can (rather than directly in template.php) be placed +Any custom preprocess functionality can (rather than directly in template.php) be placed in this preprocess folder in a file named as such: TEMPLATE_preprocess_html() = preprocess-html.inc @@ -30,10 +30,10 @@ TEMPLATE_preprocess_comment() = preprocess-comment.inc TEMPLATE_preprocess_region() = preprocess-region.inc etc. -Inside of your preprocess-HOOK.inc files, you can either directly dump the PHP code as it -would normally appear INSIDE of a preprocess function, or you can optionally (recommended) +Inside of your preprocess-HOOK.inc files, you can either directly dump the PHP code as it +would normally appear INSIDE of a preprocess function, or you can optionally (recommended) wrap the code in a custom hook for Alpha/Omega as such: function THEMENAME_alpha_preprocess_HOOK(&$vars) { // custom functionality here -} \ No newline at end of file +} diff --git a/starterkits/omega-xhtml/process/README.txt b/starterkits/omega-xhtml/process/README.txt index 35a9f5d..983da3e 100644 --- a/starterkits/omega-xhtml/process/README.txt +++ b/starterkits/omega-xhtml/process/README.txt @@ -20,7 +20,7 @@ Twitter: http://twitter.com/Omeglicon ##### Process Hooks ########################################################################################## -Any custom process functionality can (rather than directly in template.php) be placed +Any custom process functionality can (rather than directly in template.php) be placed in this process folder in a file named as such: TEMPLATE_process_html() = process-html.inc @@ -30,10 +30,10 @@ TEMPLATE_process_comment() = process-comment.inc TEMPLATE_process_region() = process-region.inc etc. -Inside of your process-HOOK.inc files, you can either directly dump the PHP code as it -would normally appear INSIDE of a process function, or you can optionally (recommended) +Inside of your process-HOOK.inc files, you can either directly dump the PHP code as it +would normally appear INSIDE of a process function, or you can optionally (recommended) wrap the code in a custom hook for Alpha/Omega as such: function THEMENAME_alpha_process_HOOK(&$vars) { // custom functionality here -} \ No newline at end of file +} diff --git a/starterkits/omega-xhtml/screenshot.png b/starterkits/omega-xhtml/screenshot.png index 6a0bf48..e57c9c4 100644 Binary files a/starterkits/omega-xhtml/screenshot.png and b/starterkits/omega-xhtml/screenshot.png differ diff --git a/starterkits/omega-xhtml/starterkit_omega_xhtml.info b/starterkits/omega-xhtml/starterkit_omega_xhtml.info index 8d24840..a9b495b 100644 --- a/starterkits/omega-xhtml/starterkit_omega_xhtml.info +++ b/starterkits/omega-xhtml/starterkit_omega_xhtml.info @@ -373,4 +373,4 @@ settings[alpha_region_footer_second_prefix] = '' settings[alpha_region_footer_second_columns] = '12' settings[alpha_region_footer_second_suffix] = '' settings[alpha_region_footer_second_weight] = '2' -settings[alpha_region_footer_second_css] = '' \ No newline at end of file +settings[alpha_region_footer_second_css] = '' diff --git a/starterkits/omega-xhtml/template.php b/starterkits/omega-xhtml/template.php index 820fd82..eab7941 100644 --- a/starterkits/omega-xhtml/template.php +++ b/starterkits/omega-xhtml/template.php @@ -5,8 +5,8 @@ * This file is empty by default because the base theme chain (Alpha & Omega) provides * all the basic functionality. However, in case you wish to customize the output that Drupal * generates through Alpha & Omega this file is a good place to do so. - * + * * Alpha comes with a neat solution for keeping this file as clean as possible while the code * for your subtheme grows. Please read the README.txt in the /preprocess and /process subfolders * for more information on this topic. - */ \ No newline at end of file + */ diff --git a/starterkits/omega-xhtml/templates/README.txt b/starterkits/omega-xhtml/templates/README.txt index cc26307..a18a310 100644 --- a/starterkits/omega-xhtml/templates/README.txt +++ b/starterkits/omega-xhtml/templates/README.txt @@ -19,8 +19,8 @@ Twitter: http://twitter.com/Omeglicon ########################################################################################## The templates folder is here to organize any custom templates you have for your subhteme. -The HTML5 Starterkit (and subthemes) uses all default templates in the Omega base theme, -and is why this directory is empty. +The HTML5 Starterkit (and subthemes) uses all default templates in the Omega base theme, +and is why this directory is empty. -Any page, node, etc. templates you need to customize can be copied here, and customized -accordingly. \ No newline at end of file +Any page, node, etc. templates you need to customize can be copied here, and customized +accordingly. diff --git a/starterkits/omega-xhtml/templates/block.tpl.php b/starterkits/omega-xhtml/templates/block.tpl.php index 5019622..2e3f1a3 100644 --- a/starterkits/omega-xhtml/templates/block.tpl.php +++ b/starterkits/omega-xhtml/templates/block.tpl.php @@ -5,7 +5,7 @@ >subject; ?> - + > diff --git a/starterkits/omega-xhtml/templates/html.tpl.php b/starterkits/omega-xhtml/templates/html.tpl.php index f4b57cd..7f2f44b 100644 --- a/starterkits/omega-xhtml/templates/html.tpl.php +++ b/starterkits/omega-xhtml/templates/html.tpl.php @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/node.tpl.php b/starterkits/omega-xhtml/templates/node.tpl.php index 21a2b64..91c2fa6 100644 --- a/starterkits/omega-xhtml/templates/node.tpl.php +++ b/starterkits/omega-xhtml/templates/node.tpl.php @@ -9,8 +9,8 @@
--
- - + + > - +
@@ -27,4 +27,4 @@
- \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/region--branding.tpl.php b/starterkits/omega-xhtml/templates/region--branding.tpl.php index faff23e..28f2082 100644 --- a/starterkits/omega-xhtml/templates/region--branding.tpl.php +++ b/starterkits/omega-xhtml/templates/region--branding.tpl.php @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/region--sidebar_first.tpl.php b/starterkits/omega-xhtml/templates/region--sidebar_first.tpl.php index dcb6f20..50300b0 100644 --- a/starterkits/omega-xhtml/templates/region--sidebar_first.tpl.php +++ b/starterkits/omega-xhtml/templates/region--sidebar_first.tpl.php @@ -2,4 +2,4 @@ > - \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/region--sidebar_second.tpl.php b/starterkits/omega-xhtml/templates/region--sidebar_second.tpl.php index dcb6f20..50300b0 100644 --- a/starterkits/omega-xhtml/templates/region--sidebar_second.tpl.php +++ b/starterkits/omega-xhtml/templates/region--sidebar_second.tpl.php @@ -2,4 +2,4 @@ > - \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/section--footer.tpl.php b/starterkits/omega-xhtml/templates/section--footer.tpl.php index 57b9c1c..aa4431e 100644 --- a/starterkits/omega-xhtml/templates/section--footer.tpl.php +++ b/starterkits/omega-xhtml/templates/section--footer.tpl.php @@ -1,3 +1,3 @@ > - \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/section--header.tpl.php b/starterkits/omega-xhtml/templates/section--header.tpl.php index 57b9c1c..aa4431e 100644 --- a/starterkits/omega-xhtml/templates/section--header.tpl.php +++ b/starterkits/omega-xhtml/templates/section--header.tpl.php @@ -1,3 +1,3 @@ > - \ No newline at end of file + diff --git a/starterkits/omega-xhtml/templates/section.tpl.php b/starterkits/omega-xhtml/templates/section.tpl.php index 57b9c1c..aa4431e 100644 --- a/starterkits/omega-xhtml/templates/section.tpl.php +++ b/starterkits/omega-xhtml/templates/section.tpl.php @@ -1,3 +1,3 @@ > - \ No newline at end of file +