From b8a59e343274bbf9784f3aa8e0ea4b7475f25c1f Mon Sep 17 00:00:00 2001 From: jowall Date: Wed, 30 Mar 2011 11:45:27 -0700 Subject: [PATCH] Added alternate quad layout to TheThemeMachine CSS. --HG-- branch : 1.x --- .../Modules/Orchard.MediaPicker/Styles/mediapicker.css | 6 +----- src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css | 6 ++++++ src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css index 8c38aa03a..0dd9dd66d 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css @@ -41,11 +41,7 @@ body { overflow-y:scroll; overflow-x:hidden; } - -/*input[disabled], input[disabled="disabled"], input.disabled { - color: #fff; -}*/ - + .media-largepreview { width: 300px; diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css index c5bbbb447..f2fcb83e2 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css +++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css @@ -417,6 +417,12 @@ nav ul .split-124 #footer-quad-fourth { width:480px; } /* If zones 1, 2, 4 are on */ .split-123 #footer-quad-third { width:480px; } /* If zones 1, 2, 3 are on */ +/*3 zones on - alternate layout*/ +/*.split-123 #footer-quad-first, .split-123 #footer-quad-second, .split-123 #footer-quad-third { width:320px; }*/ /* If zones 1, 2, 3 are on */ +/*.split-124 #footer-quad-first, .split-124 #footer-quad-second, .split-124 #footer-quad-fourth { width:320px; }*/ /* If zones 1, 2, 4 are on */ +/*.split-134 #footer-quad-first, .split-134 #footer-quad-third, .split-134 #footer-quad-fourth { width:320px; }*/ /* If zones 1, 3, 4 are on */ +/*.split-234 #footer-quad-second, .split-234 #footer-quad-third, .split-234 #footer-quad-fourth { width:320px; }*/ /* If zones 2, 3, 4 are on */ + /* Widgets diff --git a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml index 25b709817..34cdfd5de 100644 --- a/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml +++ b/src/Orchard.Web/Themes/TheThemeMachine/Views/Layout.cshtml @@ -9,7 +9,8 @@ @{ /* Global includes for the theme ***************************************************************/ - + + SetMeta("X-UA-Compatible", "IE=edge,chrome=1"); Style.Include("http://fonts.googleapis.com/css?family=Lobster&subset=latin"); Style.Include("site.css");