Changeset 17116 for branches/comu-ver2/html/user_data/packages

Timestamp:

2008/03/11 11:08:47 (16 years ago)

Author:

pineray

Message:

merge r17096 17104

Location:

branches/comu-ver2/html/user_data/packages/default/css

Files:

• main.css (modified) (2 diffs)
• under.css (modified) (1 diff)

branches/comu-ver2/html/user_data/packages/default/css/main.css

@@ -171 +171 @@
 }
 
-div#centercolumn {
+div#rightcolumn {
+    float: left;
+    width: 166px;
+}
+
+div#rightcolumn h2 {
+    padding: 15px 0 0 0;
+}
+
+/* メインコンテンツ
+----------------------------------------------- */
+/* 3カラム設定 */
+div#three_maincolumn {
     float: left;
     width: 432px;
@@ -177 +189 @@
 }
 
-div#centercolumn h2 {
-    padding: 15px 0 0 0;
-}
-
-div#rightcolumn {
-    float: left;
-    width: 166px;
-}
-
-div#rightcolumn h2 {
-    padding: 15px 0 0 0;
-}
-
-/* 1カラム設定
------------------------------------------------ */
-div#one_column {
+div#three_maincolumn h2 {
+    padding: 15px 0 0 0;
+}
+
+/* 2カラム設定 */
+div#two_maincolumn {
+    float: left;
+    width: 598px;
+    padding: 15px 0 0 0;
+}
+
+div#two_maincolumn h2 {
+    padding: 15px 0 0 0;
+}
+
+/* 1カラム設定 */
+div#one_maincolumn {
     padding: 10px 0 0 0;
 }

branches/comu-ver2/html/user_data/packages/default/css/under.css

@@ -5 +5 @@
 ----------------------------------------------- */
 div#undercolumn {
-    float: right;
     width: 580px;
-    margin: 15px 0 0 0;
+    margin: 15px auto 0 auto;
 }