[geeklog-hg] geeklog: Denim and Modern_Curve: reverted the js_off mode
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Jun 2 23:39:00 EDT 2012
changeset 8712:20b813605330
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/20b813605330
user: dengen
date: Sun Jun 03 12:37:56 2012 +0900
description:
Denim and Modern_Curve: reverted the js_off mode
diffstat:
public_html/layout/denim/css_ltr/style.css | 43 ++++++++++++++++++-------
public_html/layout/denim/css_rtl/style.css | 43 ++++++++++++++++++-------
public_html/layout/denim/javascript/script.js | 2 +-
public_html/layout/modern_curve/css/layout.css | 28 ++++++++++++++++
public_html/lib-common.php | 2 +
5 files changed, 93 insertions(+), 25 deletions(-)
diffs (truncated from 345 to 300 lines):
diff -r f652b36025b4 -r 20b813605330 public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css Fri Jun 01 11:34:52 2012 -0400
+++ b/public_html/layout/denim/css_ltr/style.css Sun Jun 03 12:37:56 2012 +0900
@@ -1208,7 +1208,8 @@
display if Left Block is appeared.
--------------------------------------*/
-#leftblocks {
+#leftblocks,
+body.js_off #leftblocks {
overflow: auto;
float: left;
width: 180px; /* [L] */ /* rtl */
@@ -1228,7 +1229,8 @@
}
/* 3 Column ( left-center-right ) */
-body.left-center-right #main-content {
+body.left-center-right #main-content,
+body.js_off #main-content {
width: 660px; /* Main Content Width = [W] - [L] - [R] - Right Padding 10px - Left Padding 10px */
margin: 0 280px 0 180px; /* Right Margin = [R] , Left Margin = [L] */ /* rtl */
padding: 0 10px;
@@ -1258,7 +1260,8 @@
display if Right Block is appeared.
--------------------------------------*/
-#rightblocks {
+#rightblocks,
+body.js_off #rightblocks {
overflow: auto;
float: left;
width: 280px; /* [R] */
@@ -2892,7 +2895,8 @@
display if Left Block is appeared.
--------------------------------------*/
- #leftblocks {
+ #leftblocks,
+ body.js_off #leftblocks {
float: right;
width: 280px; /* [L] */
margin: 0;
@@ -2908,9 +2912,16 @@
width: auto;
}
+ body.js_off #centerblocks {
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ }
+
body.left-center-right #main-content,
body.left-center #main-content,
- body.center-right #main-content {
+ body.center-right #main-content,
+ body.js_off #main-content {
float: left;
width: 660px; /* Center Block Width = [W] - [L] - [R] - Right Padding - Left Padding */
margin: 0;
@@ -2922,7 +2933,8 @@
#rightblocks display if Right Block is appeared.
--------------------------------------*/
- #rightblocks {
+ #rightblocks,
+ body.js_off #rightblocks {
overflow: auto;
clear: right;
float: right;
@@ -3103,7 +3115,8 @@
display if Left Block is appeared.
--------------------------------------*/
- #leftblocks {
+ #leftblocks,
+ body.js_off #leftblocks {
width: 200px; /* [L] */
}
@@ -3113,7 +3126,8 @@
body.left-center-right #main-content,
body.left-center #main-content,
- body.center-right #main-content {
+ body.center-right #main-content,
+ body.js_off #main-content {
width: 528px; /* Center Block Width = [W] - [L] - [R] - Right Padding - Left Padding */
}
@@ -3126,7 +3140,8 @@
#rightblocks display if Right Block is appeared.
--------------------------------------*/
- #rightblocks {
+ #rightblocks,
+ body.js_off #rightblocks {
width: 200px; /* [R] */
}
@@ -3321,14 +3336,16 @@
Center Block Container
--------------------------------------*/
- #centerblocks {
+ #centerblocks,
+ body.js_off #centerblocks {
width: auto;
padding: 0 10px;
}
body.left-center-right #main-content,
body.left-center #main-content,
- body.center-right #main-content {
+ body.center-right #main-content,
+ body.js_off #main-content {
width: 100%;
padding: 0;
}
@@ -3366,7 +3383,9 @@
--------------------------------------*/
#leftblocks,
- #rightblocks {
+ body.js_off #leftblocks,
+ #rightblocks,
+ body.js_off #rightblocks {
clear: both;
float: left; /* rtl */
width: 100%;
diff -r f652b36025b4 -r 20b813605330 public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css Fri Jun 01 11:34:52 2012 -0400
+++ b/public_html/layout/denim/css_rtl/style.css Sun Jun 03 12:37:56 2012 +0900
@@ -1208,7 +1208,8 @@
display if Left Block is appeared.
--------------------------------------*/
-#leftblocks {
+#leftblocks,
+body.js_off #leftblocks {
overflow: auto;
float: left;
width: 180px; /* [R] */ /* rtl */
@@ -1228,7 +1229,8 @@
}
/* 3 Column ( left-center-right ) */
-body.left-center-right #main-content {
+body.left-center-right #main-content,
+body.js_off #main-content {
width: 660px; /* Main Content Width = [W] - [L] - [R] - Right Padding 10px - Left Padding 10px */
margin: 0 180px 0 280px; /* Right Margin = [R] , Left Margin = [L] */ /* rtl */
padding: 0 10px;
@@ -1258,7 +1260,8 @@
display if Right Block is appeared.
--------------------------------------*/
-#rightblocks {
+#rightblocks,
+body.js_off #rightblocks {
overflow: auto;
float: left;
width: 280px; /* [R] */
@@ -2892,7 +2895,8 @@
display if Left Block is appeared.
--------------------------------------*/
- #leftblocks {
+ #leftblocks,
+ body.js_off #leftblocks {
float: right;
width: 280px; /* [L] */
margin: 0;
@@ -2908,9 +2912,16 @@
width: auto;
}
+ body.js_off #centerblocks {
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ }
+
body.left-center-right #main-content,
body.left-center #main-content,
- body.center-right #main-content {
+ body.center-right #main-content,
+ body.js_off #main-content {
float: left;
width: 660px; /* Center Block Width = [W] - [L] - [R] - Right Padding - Left Padding */
margin: 0;
@@ -2922,7 +2933,8 @@
#rightblocks display if Right Block is appeared.
--------------------------------------*/
- #rightblocks {
+ #rightblocks,
+ body.js_off #rightblocks {
overflow: auto;
clear: right;
float: right;
@@ -3103,7 +3115,8 @@
display if Left Block is appeared.
--------------------------------------*/
- #leftblocks {
+ #leftblocks,
+ body.js_off #leftblocks {
width: 200px; /* [L] */
}
@@ -3113,7 +3126,8 @@
body.left-center-right #main-content,
body.left-center #main-content,
- body.center-right #main-content {
+ body.center-right #main-content,
+ body.js_off #main-content {
width: 528px; /* Center Block Width = [W] - [L] - [R] - Right Padding - Left Padding */
}
@@ -3126,7 +3140,8 @@
#rightblocks display if Right Block is appeared.
--------------------------------------*/
- #rightblocks {
+ #rightblocks,
+ body.js_off #rightblocks {
width: 200px; /* [R] */
}
@@ -3321,14 +3336,16 @@
Center Block Container
--------------------------------------*/
- #centerblocks {
+ #centerblocks,
+ body.js_off #centerblocks {
width: auto;
padding: 0 10px;
}
body.left-center-right #main-content,
body.left-center #main-content,
- body.center-right #main-content {
+ body.center-right #main-content,
+ body.js_off #main-content {
width: 100%;
padding: 0;
}
@@ -3366,7 +3383,9 @@
--------------------------------------*/
#leftblocks,
- #rightblocks {
+ body.js_off #leftblocks,
+ #rightblocks,
+ body.js_off #rightblocks {
clear: both;
float: right; /* rtl */
width: 100%;
diff -r f652b36025b4 -r 20b813605330 public_html/layout/denim/javascript/script.js
--- a/public_html/layout/denim/javascript/script.js Fri Jun 01 11:34:52 2012 -0400
+++ b/public_html/layout/denim/javascript/script.js Sun Jun 03 12:37:56 2012 +0900
@@ -8,7 +8,7 @@
// 'className' for IE8, IE7, IE6
var classattr = (is_old_ie) ? 'className' : 'class';
- if (document.body.getAttribute(classattr) != '') return;
+ if (document.body.getAttribute(classattr) != 'js_off') return;
var leftblocks = document.getElementById(leftblocksID);
var centerblocks = document.getElementById(centerblocksID);
diff -r f652b36025b4 -r 20b813605330 public_html/layout/modern_curve/css/layout.css
--- a/public_html/layout/modern_curve/css/layout.css Fri Jun 01 11:34:52 2012 -0400
+++ b/public_html/layout/modern_curve/css/layout.css Sun Jun 03 12:37:56 2012 +0900
@@ -207,6 +207,10 @@
body.center div#container div#wrapper {
}
+/* JavaScript Disenabled Wrapper */
+body.js_off div#container div#wrapper {
+}
+
/*--------------------------------------
@@ -222,6 +226,12 @@
padding: 0;
}
+/* JavaScript Disenabled Left Block Container */
+body.js_off div#container div#wrapper div#leftblocks {
+ float: {left};
+ margin-{right}: -180px; /* Right Margin = -( Left Block Width[L]) */
+}
+
/*--------------------------------------
Center Block Container
More information about the geeklog-cvs
mailing list