summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--beta.info10
-rw-r--r--css/1200gs.css21
-rw-r--r--css/720gs.css22
-rw-r--r--css/960gs.css21
-rw-r--r--css/beta.css70
-rw-r--r--preprocess/preprocess-html.inc29
6 files changed, 108 insertions, 65 deletions
diff --git a/beta.info b/beta.info
index 5b350cc..1debb61 100644
--- a/beta.info
+++ b/beta.info
@@ -101,6 +101,16 @@ zones[footer][] = footer_second
; END CONTENT ZONES
settings[omega_default_container_width] = '12'
+settings[omega_responsive_grid] = 'enabled'
+settings[omega_responsive_mobile] = '1'
+settings[omega_responsive_medium] = '1'
+settings[omega_responsive_default] = '1'
+settings[omega_responsive_large] = ''
+settings[omega_customize_viewport] = 'on'
+settings[omega_viewport_initial_scale] = '1.0'
+settings[omega_viewport_min_scale] = '1.0'
+settings[omega_viewport_max_scale] = '1.0'
+settings[omega_viewport_user_scale] = ''
settings[omega_fixed_fluid] = 'fixed'
settings[omega_user_enabled] = '1'
settings[omega_user_wrapper] = '1'
diff --git a/css/1200gs.css b/css/1200gs.css
new file mode 100644
index 0000000..df80542
--- /dev/null
+++ b/css/1200gs.css
@@ -0,0 +1,21 @@
+@media all and (min-width: 1220px) and (min-device-width: 1220px) {
+ h1.site-title a, h2.site-title a {
+ font-size: 1.5em;
+ line-height: 1.3em;
+ }
+ .site-slogan {
+ display: block;
+ }
+ #content-container {
+ padding: 10px 0 0 0;
+ }
+ #menu-outer-wrapper,
+ #header-outer-wrapper,
+ #preface-outer-wrapper,
+ #location-outer-wrapper,
+ #content-outer-wrapper,
+ #status-outer-wrapper {
+ width: 1240px;
+ margin: 0 auto;
+ }
+} \ No newline at end of file
diff --git a/css/720gs.css b/css/720gs.css
new file mode 100644
index 0000000..49826c1
--- /dev/null
+++ b/css/720gs.css
@@ -0,0 +1,22 @@
+@media all and (min-width: 740px) and (min-device-width: 740px), (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape) {
+ /* Restyle Branding zone */
+ h1.site-title a, h2.site-title a {
+ font-size: 1.5em;
+ line-height: 1.3em;
+ }
+ .site-slogan {
+ display: block;
+ }
+ #content-container {
+ padding: 10px 0 0 0;
+ }
+ #menu-outer-wrapper,
+ #header-outer-wrapper,
+ #preface-outer-wrapper,
+ #location-outer-wrapper,
+ #content-outer-wrapper,
+ #status-outer-wrapper {
+ width: 760px;
+ margin: 0 auto;
+ }
+} \ No newline at end of file
diff --git a/css/960gs.css b/css/960gs.css
new file mode 100644
index 0000000..1596148
--- /dev/null
+++ b/css/960gs.css
@@ -0,0 +1,21 @@
+@media all and (min-width: 980px) and (min-device-width: 980px), (max-device-width: 1024px) and (min-width: 980px) and (orientation:landscape) {
+ h1.site-title a, h2.site-title a {
+ font-size: 1.5em;
+ line-height: 1.3em;
+ }
+ .site-slogan {
+ display: block;
+ }
+ #content-container {
+ padding: 10px 0 0 0;
+ }
+ #menu-outer-wrapper,
+ #header-outer-wrapper,
+ #preface-outer-wrapper,
+ #location-outer-wrapper,
+ #content-outer-wrapper,
+ #status-outer-wrapper {
+ width: 1000px;
+ margin: 0 auto;
+ }
+} \ No newline at end of file
diff --git a/css/beta.css b/css/beta.css
index 02cf9f5..695613a 100644
--- a/css/beta.css
+++ b/css/beta.css
@@ -545,73 +545,13 @@ blockquote {
.logo-img {
display: none;
}
-/* media query styles */
-@media all and (max-width: 979px) and (min-width: 740px) and (min-device-width: 740px) {
- /* Restyle Branding zone */
- h1.site-title a, h2.site-title a {
- font-size: 1.5em;
- line-height: 1.3em;
- }
- .site-slogan {
- display: block;
- }
- #content-container {
- padding: 10px 0 0 0;
- }
- #menu-outer-wrapper,
- #header-outer-wrapper,
- #preface-outer-wrapper,
- #location-outer-wrapper,
- #content-outer-wrapper,
- #status-outer-wrapper {
- width: 760px;
- margin: 0 auto;
- }
-}
-@media all and (max-width: 1219px) and (min-width: 980px) and (min-device-width: 980px), (max-device-width: 1024px) and (orientation:landscape) {
- h1.site-title a, h2.site-title a {
- font-size: 1.5em;
- line-height: 1.3em;
- }
- .site-slogan {
- display: block;
- }
- #content-container {
- padding: 10px 0 0 0;
- }
- #menu-outer-wrapper,
- #header-outer-wrapper,
- #preface-outer-wrapper,
- #location-outer-wrapper,
- #content-outer-wrapper,
- #status-outer-wrapper {
- width: 1000px;
- margin: 0 auto;
- }
-}
-@media all and (min-width: 1220px) and (min-device-width: 1220px) {
- h1.site-title a, h2.site-title a {
- font-size: 1.5em;
- line-height: 1.3em;
- }
- .site-slogan {
- display: block;
- }
- #content-container {
- padding: 10px 0 0 0;
- }
- #menu-outer-wrapper,
- #header-outer-wrapper,
- #preface-outer-wrapper,
- #location-outer-wrapper,
- #content-outer-wrapper,
- #status-outer-wrapper {
- width: 1240px;
- margin: 0 auto;
- }
-}
+
+
+
+
+
@media all and (min-width: 740px) and (min-device-width: 740px) {
.logo-img {
diff --git a/preprocess/preprocess-html.inc b/preprocess/preprocess-html.inc
new file mode 100644
index 0000000..35df209
--- /dev/null
+++ b/preprocess/preprocess-html.inc
@@ -0,0 +1,29 @@
+<?php
+// responsive grid css
+if (theme_get_setting('omega_responsive_grid') == 'enabled') {
+ // 720px grid (if enabled)
+ if(omega_theme_get_setting('omega_responsive_medium')) {
+ drupal_add_css(drupal_get_path('theme', 'beta') . '/css/720gs.css', array(
+ 'group' => CSS_THEME,
+ 'every_page' => TRUE,
+ 'weight', 20,
+ )
+ );
+ }
+ if(omega_theme_get_setting('omega_responsive_default')) {
+ drupal_add_css(drupal_get_path('theme', 'beta') . '/css/960gs.css', array(
+ 'group' => CSS_THEME,
+ 'every_page' => TRUE,
+ 'weight', 21,
+ )
+ );
+ }
+ if(omega_theme_get_setting('omega_responsive_large')) {
+ drupal_add_css(drupal_get_path('theme', 'beta') . '/css/1200gs.css', array(
+ 'group' => CSS_THEME,
+ 'every_page' => TRUE,
+ 'weight', 21,
+ )
+ );
+ }
+} \ No newline at end of file