Index: branches/version-2_5-dev/html/user_data/packages/default/css/import.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/import.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/import.css	(revision 20340)
@@ -1,4 +1,7 @@
 @charset "utf-8";
 
+/************************************************
+ import css (ポップアップ用)
+************************************************ */
 @import url("./set.css");
 @import url("./common.css");
@@ -6,8 +9,6 @@
 @import url("./table.css");
 @import url("./bloc.css");
-@import url("./header_bloc.css");
+@import url("./bloc_alpha.css");
 @import url("./popup_import.css");
-@import url("./popup.css");
 
 @import url("./print.css");
-/* @import url("./pluginbloc.css"); */
Index: branches/version-2_5-dev/html/user_data/packages/default/css/set.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/set.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/set.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-ブラウザリセット
+ ブラウザリセット
 ************************************************ */
 html, body, div, span, applet, object, iframe, h1, h2, h3,
Index: branches/version-2_5-dev/html/user_data/packages/default/css/print.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/print.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/print.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-	印刷用
+ 印刷用
 ************************************************ */
 
Index: branches/version-2_5-dev/html/user_data/packages/default/css/contents.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/contents.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/contents.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-各ページコンテンツ用
+ 各ページコンテンツ用
 /************************************************
 /* ==============================================
@@ -37,34 +37,9 @@
 }
 
-div#undercolumn_contact .box120 {
-    width: 120px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_contact .box60 {
-    width: 60px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_contact .box380 {
-    width: 380px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_contact .area380 {
-    width: 380px;
-    height: 250px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
 .zipimg img {
-	vertical-align: middle;
-}
+    vertical-align: middle;
+}
+
+
 /* ==============================================
 ▼MYページ
@@ -98,6 +73,6 @@
     margin-bottom: 30px;
     padding: 10px;
+    border: solid 1px #ffcc62;
     background-color: #fffaf0;
-    border: solid 1px #ffcc62;
 }
 div#mynavi_area div.point_announce p{
@@ -112,27 +87,7 @@
 div#mypagecolumn h4 {
     margin: 10px auto;
-    font-size: 120%;
     border-bottom: 1px solid #999;
     text-align: left;
-}
-
-div#mycontents_area table th.resulttd {
-    text-align: right;
-}
-
-div#mycontents_area table.delivname th {
-    text-align: left;
-    width: 140px;
-}
-
-div#mycontents_area table caption {
-    border-top: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    padding: 8px;
-    background-color: #f0f0f0;
-    text-align: left;
-    font-weight: bold;
-    color: #000;
+    font-size: 120%;
 }
 
@@ -140,10 +95,20 @@
 /* 購入履歴一覧/詳細
 ----------------------------------------------- */
-div#mycontents_area p.myconditionarea {
+div#mycontents_area div.mycondition_area {
     margin: 0 auto 20px 0;
     padding: 10px;
     border: solid 1px #ccc;
-}
-
+    width: 97%;
+    background: #f9f9f9;
+
+}
+div#mycontents_area div.mycondition_area p {
+    float: left;
+}
+div#mycontents_area div.mycondition_area .btn {
+    width: 160px;
+    margin-top: 15px;
+    float: right;
+}
 .add_address {
     margin-bottom: 20px;
@@ -151,11 +116,10 @@
 
 
-
 /* 会員登録内容変更/退会
 ----------------------------------------------- */
 div#mycontents_area .box120 {
-    width: 120px;
     padding: 2px;
     border: 1px solid #ccc;
+    width: 120px;
 }
 
@@ -179,9 +143,9 @@
 
 div#undercolumn_entry .kiyaku_text {
-    width: 94%;
     margin: 20px auto;
     padding: 10px;
+    border: solid 1px #ccc;
+    width: 94%;
     background: #fff;
-    border: solid 1px #ccc;
 }
 
@@ -190,14 +154,14 @@
 ▼ログイン
 =============================================== */
-div#under02column_login {
-    width: 100%;
+div#undercolumn_login {
     margin: 0 auto;
-}
-
-div#under02column_login .login_area{
+    width: 100%;
+}
+
+div#undercolumn_login .login_area {
     margin-bottom: 30px;
 }
 
-div#under02column_login .login_area .inputbox {
+div#undercolumn_login .login_area .inputbox {
     margin: 15px auto 15px auto;
     padding: 15px 20px 10px 20px;
@@ -205,13 +169,6 @@
 }
 
-div#under02column_login .login_area .inputbox .btn_area{
-    margin-top: 0px;
-}
-
-div#under02column_login .login_area .inputbox .box300 {
-    width: 300px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
+div#undercolumn_login .login_area .inputbox .btn_area {
+    margin-top: 0;
 }
 
@@ -220,5 +177,5 @@
 ▼エラー
 =============================================== */
-div#under02column_error .message_area {
+div#undercolumn_error .message_area {
     margin: 30px auto;
     padding: 30px;
@@ -227,5 +184,5 @@
 }
 
-div#under02column_error .messagearea .error {
+div#undercolumn_error .messagearea .error {
     padding: 120px 0;
 }
@@ -233,35 +190,27 @@
 
 /* ==============================================
-▼下層共通指定 02 
-===============================================
-div#under02column {
-    width: 100%;
-}
- */
-/* ==============================================
 ▼商品一覧
 =============================================== */
 /* ページ送り
 ----------------------------------------------- */
-.pagenumberarea {
+.pagenumber_area {
     padding-bottom: 10px;
     background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
 }
-
-.pagecondarea {
+.pagecond_area {
     padding: 10px;
     margin-bottom: 20px;
 }
-.pagenumberarea {
+.pagenumber_area {
     margin: 20px 0;
 }
-.pagecondarea {
+.pagecond_area {
     border: 1px solid #ccc;
 }
-.pagenumberarea .navi {
+.pagenumber_area .navi {
     width: 100%;
     text-align: left;
 }
-.pagenumberarea .change {
+.pagenumber_area .change {
     float: right;
     text-align: right;
@@ -272,6 +221,6 @@
 ----------------------------------------------- */
 div.list_area {
-    width: 100%;
-    padding: 0px 0 30px 0;
+    padding: 0 0 30px 0;
+    width: 100%;
     overflow: auto;
 }
@@ -286,6 +235,6 @@
 /* 商品ステータス */
 div.listrightbloc ul.status_icon {
-    width: 100%;
-    margin-bottom: 10px;
+    margin-bottom: 10px;
+    width: 100%;
 }
 div.listrightbloc ul.status_icon li {
@@ -296,6 +245,6 @@
 /* 商品名 */
 div.listrightbloc h3 {
+    font-weight: bold;
     font-size: 120%;
-    font-weight: bold;
 }
 
@@ -318,8 +267,8 @@
 /* 買い物かご */
 div.listrightbloc .cart_area {
+    padding: 10px;
+    border: 1px solid #cef0f4;
+    background-color: #ecf5ff;
     width: 94%;
-    padding: 10px;
-    background-color: #ecf5ff;
-    border: 1px solid #cef0f4;
 }
 
@@ -351,8 +300,8 @@
 }
 div.listrightbloc .cartin .quantity {
+    padding: 3px 10px 0 0;
     width: 150px;
     float :left;
     text-align: right;
-    padding: 3px 10px 0 0;
 }
 div.listrightbloc .cartin .quantity .box {
@@ -369,7 +318,15 @@
 =============================================== */
 /* レイアウト
+
+    tplファイルのマークアップが同じ項目
+    *1カラム時 [one_maincolumn]
+    *2カラム時 [two_maincolumn_left]
+               [two_maincolumn_right]
+    *3カラム時 [three_maincolumn]
+
 ----------------------------------------------- */
 #detailarea ,
-.subarea {
+.sub_area {
+    margin-bottom: 20px;
     width: 100%;
 }
@@ -385,31 +342,35 @@
 }
 #one_maincolumn div.subtext {
+    margin-bottom: 20px;
+    float: left;
     width: 69%;
-    margin-bottom: 20px;
-    float: left;
 }
 #one_maincolumn div.subphotoimg {
+    float: right;
     width: 25%;
-    float: right;
     text-align: right;
 }
 
 /* 2カラム用 */
+#two_maincolumn_left div#detailphotobloc ,
 #two_maincolumn_right div#detailphotobloc {
+    float: left;
     width: 37%;
-    float: left;
-}
+}
+#two_maincolumn_left div#detailrightbloc ,
 #two_maincolumn_right div#detailrightbloc {
+    float: right;
     width: 63%;
-    float: right;
-}
+}
+#two_maincolumn_left div.subtext,
 #two_maincolumn_right div.subtext {
+    margin-bottom: 20px;
+    float: left;
     width: 73%;
-    margin-bottom: 20px;
-    float: left;
-}
+}
+#two_maincolumn_left div.subphotoimg ,
 #two_maincolumn_right div.subphotoimg {
+    float: right;
     width: 25%;
-    float: right;
     text-align: right;
 }
@@ -417,19 +378,19 @@
 /* 3カラム用 */
 #three_maincolumn div#detailphotobloc {
+    float: left;
     width: 49%;
-    float: left;
 }
 #three_maincolumn div#detailrightbloc {
+    float: right;
     width: 50%;
-    float: right;
 }
 #three_maincolumn div.subtext {
+    margin-bottom: 20px;
+    float: left;
     width: 63%;
-    float: left;
-    margin-bottom: 20px;
 }
 #three_maincolumn div.subphotoimg {
+    float: right;
     width: 35%;
-    float: right;
     text-align: right;
 }
@@ -440,10 +401,9 @@
     margin: 0 0 10px 0;
     padding: 0 0 15px 0;
+    color: #666;
+    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
+    font-weight: bold;
     font-size: 160%;
-    font-weight: bold;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
-    color: #666;
-}
-
+}
 div#detailrightbloc .point ,
 div#detailrightbloc .relative_cat {
@@ -452,9 +412,7 @@
     background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
 }
-
 div#detailrightbloc .main_comment {
     margin-bottom: 20px;
 }
-
 div.cart_area {
     padding: 10px;
@@ -463,9 +421,8 @@
 }
 
-
 /* 商品ステータス */
 div#detailrightbloc ul.status_icon {
-    width: 100%;
-    margin-bottom: 10px;
+    margin-bottom: 10px;
+    width: 100%;
 }
 div#detailrightbloc ul.status_icon li {
@@ -477,32 +434,30 @@
 /* 規格 */
 div#detailrightbloc div.classlist {
-    width: 100%;
     margin-bottom: 10px;
     padding-bottom: 10px;
+    width: 100%;
     background: url("../img/background/line_dot_02.gif") repeat-x bottom ;
 }
 div#detailrightbloc .classlist {
-    width: 100%;
     margin-bottom: 5px;
 }
+div#detailrightbloc ul {
+    margin-bottom: 10px;
+    width: 100%;
+}
 div#detailrightbloc ul li {
-    float: left;
     vertical-align: top;
+    float: left;
 }
 
 /* 買い物かご */
 div#detailrightbloc .cartin {
-    margin: 0;
-    float :right;
-}
-div#detailrightbloc .cartin .quantity {
-    width: 150px;
-    float :left;
-    text-align: right;
-    padding: 3px 10px 0 0;
+    text-align: center;
 }
 div#detailrightbloc .cartin_btn {
-    width: 160px;
-    float :left;
+    text-align: center;
+}
+div#detailrightbloc .favorite_btn {
+    margin-top: 10px;
 }
 
@@ -535,6 +490,6 @@
 
 div#customervoice_area review_bloc .reviewbtn {
+    float: right;
     width: 160px;
-    float: right;
 }
 
@@ -547,6 +502,6 @@
 div#customervoice_area .voicetitle {
     margin-bottom: 5px;
+    color: #333;
     font-weight: bold;
-    color: #333;
 }
 
@@ -573,36 +528,36 @@
 /* カートの中
 ----------------------------------------------- */
-div#under02column_cart .point_announce {
+div#undercolumn_cart .point_announce {
     padding: 20px;
     margin-bottom: 20px;
     border: solid 1px #ffcc62;
-    text-align: center;
     background: #fffaf0;
     font-size: 120%;
+    text-align: center;
     line-height: 140%;
 }
-div#under02column_cart .totalmoney_area {
-    margin-bottom: 20px;
-}
-
-div#under02column_cart p {
+div#undercolumn_cart .totalmoney_area {
+    margin-bottom: 20px;
+}
+
+div#undercolumn_cart p {
     margin: 10px 5px;
 }
 
-div#under02column table th.resulttd {
+div#undercolumn table th.resulttd {
     text-align: right;
 }
 
-div#under02column td#quantity {
+div#undercolumn td#quantity {
    text-align: center;
    width: 70px;
 }
 
-div#under02column ul#quantity_level li {
+div#undercolumn ul#quantity_level li {
+    padding: 3px;
     display: inline;
-    padding: 3px;
-}
-
-div#under02column .empty {
+}
+
+div#undercolumn .empty {
     text-align: left;
 }
@@ -615,81 +570,54 @@
 /* お客様情報入力
 ----------------------------------------------- */
-div#under02column_customer {
-}
-
-.flowarea {
+div#undercolumn_customer {
+}
+
+.flow_area {
     margin: 0 0 20px 0;
 }
 
-div#under02column_customer th em {
+div#undercolumn_customer th em {
     color: #000;
     font-weight: bold;
 }
 
-div#under02column_customer .box120 {
-    width: 120px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#under02column_customer .box60 {
-    width: 60px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#under02column_customer .box380 {
-    width: 380px;
+
+/* お支払い方法・お届け時間等の指定
+----------------------------------------------- */
+div#undercolumn_shopping .pay_area {
+    margin: 0 auto 30px;
+    width: 100%;
+}
+div#undercolumn_shopping .pay_area02 {
+    margin: 40px auto 30px auto;
+}
+div#undercolumn_shopping .pay_area02 .txtarea {
     margin: 5px 0 0 0;
     padding: 2px;
     border: 1px solid #ccc;
-}
-
-div#under02column_customer .box320 {
-    width: 320px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-
-/* お支払い方法・お届け時間等の指定
------------------------------------------------ */
-div#under02column_shopping .pay_area {
-    width: 100%;
-    margin: 0 auto 30px;
-}
-
-div#under02column_shopping .pay_area02 {
-    margin: 40px auto 30px auto;
-}
-
-div#under02column_shopping .pay_area02 .txtarea {
     width: 99%;
     height: 150px;
-    margin: 5px 0 0 0;
-    padding: 2px;
+}
+div#undercolumn_shopping .pay_area02 .select-msg {
+    margin-bottom: 10px;
+}
+
+div#undercolumn_shopping .point_area {
+    margin: 40px auto 0 auto;
+}
+
+div#undercolumn_shopping .point_area .point_announce {
+    padding: 20px;
     border: 1px solid #ccc;
 }
-div#under02column_shopping .pay_area02 .select-msg {
-    margin-bottom: 10px;
-}
-
-div#under02column_shopping .point_area {
-    margin: 40px auto 0 auto;
-}
-
-div#under02column_shopping .point_area .point_announce {
-    border: 1px solid #ccc;
-    padding: 20px;
-}
-
-div#under02column_shopping .point_area p {
-    margin-bottom: 20px;
-}
-
-div#under02column_shopping .point_area .point_announce li {
+
+div#undercolumn_shopping .point_area p {
+    margin-bottom: 20px;
+}
+
+div#undercolumn_shopping .point_area .point_announce li {
     margin-bottom: 5px;
 }
+
 
 /* お届け先の指定
@@ -705,17 +633,17 @@
 }
 
-#under02column_shopping .information {
+#undercolumn_shopping .information {
     margin-bottom: 10px;
 }
 
 #address_area .add_multiple {
+    padding: 15px 10px;
+    border: 1px solid #ffcc62;
+    float: right;
     width: 30%;
-    padding: 15px 10px;
-    float: right;
-    border: 1px solid #ffcc62;
+    color: #555;
+    background: #fffaf0;
     text-align: center;
-    background: #fffaf0;
     font-weight: bold;
-    color: #555;
 }
 
@@ -725,6 +653,6 @@
 
 #address_area p.addbtn {
+    font-weight: bold;
     font-size: 10px;
-    font-weight: bold;
 }
 
@@ -732,10 +660,9 @@
 ▼検索結果
 =============================================== */
-p.conditionarea {
-    clear: both;
-    width: 566px;
+p.condition_area {
     margin: 0 auto;
     padding: 5px;
     border: solid 1px #333;
-}
-
+    width: 566px;
+}
+
Index: branches/version-2_5-dev/html/user_data/packages/default/css/popup_import.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/popup_import.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/popup_import.css	(revision 20340)
@@ -9,8 +9,6 @@
 @import url("./table.css");
 @import url("./bloc.css");
-@import url("./header_bloc.css");
-@import url("./popup_import.css");
+@import url("./bloc_alpha.css");
 @import url("./popup.css");
 
 @import url("./print.css");
-/* @import url("./pluginbloc.css"); */
Index: branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-ブロック用
+ ブロック用
 ************************************************ */
 /*** 目次 ***
@@ -21,5 +21,7 @@
 -おすすめ商品
     tplファイルのマークアップが同じ項目
-    *メインカラム用 2カラム時 [two_maincolumn_right]
+    *メインカラム用 1カラム時 [one_maincolumn 
+    *メインカラム用 2カラム時 [two_maincolumn_left]
+                              [two_maincolumn_right]
     *メインカラム用 3カラム時 [three_maincolumn]
     *サイドカラム用           [side_column]
@@ -46,6 +48,6 @@
 }
 .side_column .bloc_body .box {
+    border: solid 1px #ccc;
     width: 145px;
-    border: solid 1px #ccc;
 }
 .main_column .bloc_outer {
@@ -77,17 +79,17 @@
 ----------------------------------------------- */
 /* タイトルの背景 白 */
-#loginarea h2 ,
-#searcharea h2 ,
-#calenderarea h2 ,
-#cartarea h2 ,
+#login_area h2 ,
+#search_area h2 ,
+#calender_area h2 ,
+#cart_area h2 ,
 #cart h2 {
+    padding: 5px 0 8px 10px;
     border-style: solid;
     border-color: #f90 #ccc #ccc;
     border-width: 1px 1px 0;
     background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
-    padding: 5px 0 8px 10px;
     font-size: 14px;
 }
-#categoryarea h2 {
+#category_area h2 {
     border-top: solid 1px #f90;
     background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
@@ -97,16 +99,16 @@
 
 /* タイトルの背景 オレンジ */
-#recomendarea .titleWrap ,
-#newsarea.titleWrap {
+#recomend_area .titleWrap ,
+#news_area.titleWrap {
     padding-bottom: 1px;
     font-size: 14px;
 }
 
-#recomendarea h2 ,
-#newsarea h2 {
+#recomend_area h2 ,
+#news_area h2 {
+    padding: 5px 0 8px 10px;
     border-style: solid;
     border-color: #f90 #ccc #ccc;
     border-width: 1px 1px 0;
-    padding: 5px 0 8px 10px;
     background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
 }
@@ -116,11 +118,11 @@
 ▼ヘッダー上、フッター下のブロックエリア
 =============================================== */
-div#topcolumn{
+div#topcolumn {
+    margin:0px;
     clear:both;
-    margin:0px; 
-}
-div#bottomcolumn{
+}
+div#bottomcolumn {
+    margin:0px;
     clear: both;
-    margin:0px;
 }
 
@@ -133,44 +135,48 @@
 ▼新着情報
 =============================================== */
-#newsarea .bloc_body {
+#news_area .bloc_body {
     padding: 10px;
 }
-#newsarea .newsContents {
+#news_area .newsContents {
     padding-right: 10px;
+    max-height:260px;
+    height: auto !important;
     height: 260px;
     overflow:auto;
     overflow-y:scroll;
 }
-#newsarea dl.newsList {
+
+#news_area dl.newsList {
     background: url("../img/background/line_dot_01.gif") repeat-x bottom;
 }
-#newsarea dl.newsList dt {
-    margin-bottom: 5px;
-}
-#newsarea dl.newsList dd {
+#news_area dl.newsList dt {
+    margin-bottom: 5px;
+}
+#news_area dl.newsList dd {
     margin-bottom: 10px;
     padding-bottom: 10px;
 }
-#newsarea dl.end {
+#news_area dl.end {
     padding: 10px 0;
     background: url("") no-repeat bottom;
 }
 
+
 /* ===============================================
 ▼現在のカゴの中
 =============================================== */
-#cartarea .information {
+#cart_area .information {
     padding: 10px;
 }
-#cartarea .postage {
+#cart_area .postage {
     margin-top: 10px;
     padding-top: 10px;
     background: url("../img/background/line_dot_01.gif") repeat-x top;
 }
-#cartarea .postage .point_announce {
+#cart_area .postage .point_announce {
     padding: 2px 0 2px 20px;
     background: url("../img/icon/ico_price.gif") no-repeat left top;
 }
-#cartarea .btn {
+#cart_area .btn {
     padding: 10px 0;
     background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
@@ -182,25 +188,25 @@
 ▼カテゴリー
 =============================================== */
-#categoryarea .bloc_body{
+#category_area .bloc_body{
     background-color: #fffaf0;
 }
 
-#categoryarea li{
+#category_area li{
     padding-left: 5px;
 }
-#categoryarea li.level1{
+#category_area li.level1{
     border-bottom: solid 1px #ccc;
 }
-#categoryarea li.level1 p{
+#category_area li.level1 p{
     padding-left: 20px;
     margin: 7px 3px;
 }
-#categoryarea li.level1 p {
+#category_area li.level1 p {
     background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
 }
-#categoryarea li.level1 li p {
+#category_area li.level1 li p {
     background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
 }
-#categoryarea li a {
+#category_area li a {
     display: block;
     padding: 0;
@@ -217,12 +223,13 @@
 }
 
+
 /* ===============================================
 ▼ガイドリンク
 =============================================== */
-#guidearea {
+#guide_area {
     margin-top: 1em;
     border: none;
 }
-#guidearea li{
+#guide_area li{
     margin-bottom: 5px;
     letter-spacing: -0.05em;
@@ -234,13 +241,13 @@
 }
 ul.button_like li a {
-    display: block;
+    margin: 0;
     padding: 10px 15px 10px 10px;
-    text-decoration: none;
     border: 1px solid;
     border-bottom: none;
     border-color: #ccc;
+    display: block;
     background: url("../img/icon/ico_arrow_02.gif") no-repeat right;
+    text-decoration: none;
     outline: none;
-    margin: 0;
 }
 
@@ -250,37 +257,38 @@
 ※ヘッダー用はheader_block.css内に記述
 =============================================== */
-#container div#loginarea .bloc_body {
+#container div#login_area .bloc_body {
     padding: 10px;
 }
 
-#container div#loginarea .bloc_body p {
-    margin-bottom: 5px;
-}
-
-#container div#loginarea .bloc_body .btn {
+#container div#login_area .bloc_body p {
+    margin-bottom: 5px;
+}
+
+#container div#login_area .bloc_body .btn {
     text-align: center;
 }
 #container .login_area dl.formList {
+    margin-bottom: 8px;
     width: 420px;
-    margin-bottom: 8px;
 }
 #container .login_area dl.formList dt {
-    width: 90px;
     margin-bottom: 3px;
     padding-left: 15px;
+    color: #333;
     background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+    width: 90px;
+    float: left;
     font-size: 90%;
-    color: #333;
-    float: left;
 }
 #container .login_area dl.formList dd {
+    margin-bottom: 5px;
+    float: right;
     width: 300px;
-    margin-bottom: 5px;
-    float: right;
+    vertical-align: bottom;
     text-align: left;
-    vertical-align: bottom;
-}
-#container .login_area .login_memory {
+}
+#container div#login_area .bloc_body .mini {
     margin-top: 5px;
+    letter-spacing: -0.01em;
 }
 
@@ -289,42 +297,43 @@
 ▼検索
 =============================================== */
-div#searcharea .bloc_body {
+div#search_area .bloc_body {
     padding: 10px;
 }
-div#searcharea .bloc_body .btn {
+div#search_area .bloc_body .btn {
     text-align: center;
 }
 
+
 /* ===============================================
 ▼カレンダー
 =============================================== */
-#calenderarea {
+#calender_area {
     background-color: transparent;
     border: none;
 }
-#calenderarea .bloc_body {
+#calender_area .bloc_body {
     padding: 10px 0;
     background-color: #f1f9fc;
 }
-#calenderarea table {
+#calender_area table {
+    background: #fff;
+    border: none;
     width: 150px;
     margin: 0 auto 5px;
-    background: #fff;
-    border: none;
-    text-align:center;
     font-size: 90%;
 }
-#calenderarea table td {
+#calender_area table td {
     padding: 1px 3px;
     border-top: 1px solid #ccc;
     border-right: none;
-}
-#calenderarea th {
-    text-align: center;
+    text-align:center;
+}
+#calender_area th {
     padding: 1px 3px;
     background: #fff;
     border: none;
-}
-#calenderarea table .month {
+    text-align: center;
+}
+#calender_area table .month {
     margin-bottom: 5px;
     padding-left: 12px;
@@ -332,8 +341,8 @@
     font-size: 120%;
 }
-#calenderarea .off {
+#calender_area .off {
     color: #f00;
 }
-#calenderarea .information {
+#calender_area .information {
     margin-left: 10px;
     font-size: 90%;
@@ -346,5 +355,6 @@
 /*
    tplファイルのマークアップが同じ項目
-   メインカラム用 2カラム時 [two_maincolumn_right]
+   メインカラム用 2カラム時 [two_maincolumn_left]
+                            [two_maincolumn_right]
    メインカラム用 3カラム時 [three_maincolumn]
    サイドカラム用           [side_column]
@@ -353,19 +363,19 @@
 /* 共通
 ----------------------------------------------- */
-#recomendarea .bloc_body ,
+#recomend_area .bloc_body ,
 #whobought_area .whobought_bloc {
-    width: 100%;
     margin-bottom: 10px;
     padding: 10px 0 10px;
     border: none;
+    width: 100%;
     background: url("../img/background/line_dot_01.gif") repeat-x bottom;
 }
 
-#recomendarea .bloc_body p ,
+#recomend_area .bloc_body p ,
 #whobought_area .whobought_bloc p {
     margin: 0 0 5px 0;
 }
 
-#recomendarea .bloc_body img ,
+#recomend_area .bloc_body img ,
 #whobought .whobought_bloc img {
     display: block;
@@ -374,5 +384,5 @@
 }
 
-#recomendarea .bloc_body h3 ,
+#recomend_area .bloc_body h3 ,
 #whobought_area .whobought_bloc h3 {
     font-size: 100%;
@@ -380,23 +390,29 @@
 }
 
+
 /* 画像
 ----------------------------------------------- */
-#recomendarea .bloc_body .productImage ,
+#recomend_area .bloc_body .productImage ,
 #whobought_area .whobought_bloc .productImage {
+    margin-bottom: 10px;
     float: left;
     width: 90px;
-    margin-bottom: 10px;
-}
+}
+
 
 /* 左右の振り分け
 ----------------------------------------------- */
-#two_maincolumn_right #recomendarea .recomendleft ,
-#three_maincolumn #recomendarea .recomendleft ,
+#one_maincolumn #recomend_area .recomendleft ,
+#two_maincolumn_right #recomend_area .recomendleft ,
+#two_maincolumn_left #recomend_area .recomendleft ,
+#three_maincolumn #recomend_area .recomendleft ,
 #whobought_area .whobought_bloc .whobought_left {
     float: left;
     width: 47.5%;
 }
-#two_maincolumn_right #recomendarea .recomendright ,
-#three_maincolumn #recomendarea .recomendright ,
+#one_maincolumn #recomend_area .recomendright ,
+#two_maincolumn_right #recomend_area .recomendright ,
+#two_maincolumn_left #recomend_area .recomendright ,
+#three_maincolumn #recomend_area .recomendright ,
 #whobought_area .whobought_bloc .whobought_right {
     float: right;
@@ -405,9 +421,17 @@
 
 
-/* 商品説明テキスト横幅
------------------------------------------------ */
+/* 商品説明テキスト
+----------------------------------------------- */
+/* メインカラム用 1カラム時*/
+#one_maincolumn #recomend_area .bloc_body .productContents {
+    float: right;
+    width: 74%;
+}
+
 /* メインカラム用 2カラム時*/
-#two_maincolumn_right #recomendarea .bloc_body .productContents ,
-#two_maincolumn_right #whobought_area .whobought_bloc .productContents {
+#two_maincolumn_right #recomend_area .bloc_body .productContents ,
+#two_maincolumn_left #recomend_area .bloc_body .productContents ,
+#two_maincolumn_right #whobought_area .whobought_bloc .productContents ,
+#two_maincolumn_left #whobought_area .whobought_bloc .productContents {
     float: right;
     width: 74%;
@@ -415,5 +439,5 @@
 
 /* メインカラム用 3カラム時*/
-#three_maincolumn #recomendarea .bloc_body .productContents ,
+#three_maincolumn #recomend_area .bloc_body .productContents ,
 #three_maincolumn #whobought_area .whobought_bloc .productContents {
     float: right;
@@ -422,31 +446,30 @@
 
 
-/* サイドカラム用 (幅px固定)
------------------------------------------------ */
-.side_column #recomendarea .bloc_body {
+/* サイドカラム用 (幅px固定) */
+.side_column #recomend_area .bloc_body {
     margin-top: 5px;
-    margin-right: 0px;
+    margin-right: 0;
     width: 157px;
-    padding: 0px;
-}
-.side_column #recomendarea .bloc_body .productContents {
+    padding: 0;
+}
+.side_column #recomend_area .bloc_body .productContents {
+    padding: 0;
+    margin: 0;
     width: 80px;
-    padding: 0px;
-    margin: 0px;
-}
-.side_column #recomendarea .recomendleft {
+}
+.side_column #recomend_area .recomendleft {
+    padding: 0;
     width: 70px;
-    padding: 0;
     float: left;
 }
-.side_column #recomendarea .recomendright {
-    width: 70px;
+.side_column #recomend_area .recomendright {
     margin: 0;
     padding: 0;
+    width: 70px;
     float: right;
 }
 
 /* IE6以下*/
-* html .side_column #recomendarea .bloc_body {
+* html .side_column #recomend_area .bloc_body {
     width: 180px;
 }
Index: branches/version-2_5-dev/html/user_data/packages/default/css/popup.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/popup.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/popup.css	(revision 20340)
@@ -2,43 +2,42 @@
 
 /************************************************
-ポップアップウィンドウ
+ ポップアップウィンドウ
 ************************************************ */
 /* 共通
 ----------------------------------------------- */
 div#windowcolumn {
+    border-top: solid 3px #f90;
     height: 100%;
     margin: 15px 15px 0 15px;
     background: #fff;
-    border-top: solid 3px #f90;
 }
 
 div#windowcolumn h2 {
     margin-bottom: 10px;
+    padding: 8px;
     border-top: solid 1px #ebeced;
+    color: #f60;
     background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
     background-color: #fef3d8;
-    padding: 8px;
     font-size: 170%;
-    color: #f60;
 }
 
-div#windowarea {
-    width: 540px;
+div#window_area {
     margin: 15px auto 0 auto;
     padding-bottom: 20px;
+    width: 540px;
 }
 
-div#windowarea p.information {
+div#window_area p.information {
     margin-bottom: 20px;
 }
 
-div#windowarea .message {
-    margin-bottom: 20px;
-    font-size: 140%;
+div#window_area .message {
+    margin-bottom: 20px;    color: #f60;
     line-height: 150%;
     font-weight: bold;
-    color: #f60;
+    font-size: 140%;
 }
-div#windowarea table {
+div#window_area table {
     width: 540px;
 }
@@ -46,15 +45,15 @@
 /* お客様の声の書き込み、新しいお届け先の追加・変更
 ----------------------------------------------- */
-div#windowarea #forgot {
+div#window_area #forgot {
     margin: 0 auto;
+    padding: 20px;
     width: 440px;
-    padding: 20px;
     border: 1px solid #ccc;
     text-align: left;
 }
-div#windowarea #forgot .mailaddres {
+div#window_area #forgot .mailaddres {
     margin-bottom: 10px;
 }
-div#windowarea .zipimg img {
+div#window_area .zipimg img {
     margin: 5px 0 0 0;
 }
@@ -78,19 +77,19 @@
 ----------------------------------------------- */
 div#zipsearchcolumn {
-    width: 460px;
     margin: 15px auto 0 auto;
-    background-color: #fff;
     border-top: 5px solid #ffa85c;
     border-bottom: 5px solid #ffa85c;
+    width: 460px;
+    background-color: #fff;
 }
 
 div#zipsearchcolumn h2 {
+    margin: 0 0 15px 0;
     width: 460px;
-    margin: 0 0 15px 0;
 }
 
-div#zipsearcharea {
+div#zipsearch_area {
+    margin: 15px auto 0 auto;
     width: 460px;
-    margin: 15px auto 0 auto;
 }
 
@@ -100,5 +99,5 @@
 }
 
-div#zipsearcharea #completebox p{
+div#zipsearch_area #completebox p{
     padding: 60px 5px;
     text-align: center;
Index: branches/version-2_5-dev/html/user_data/packages/default/css/table.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/table.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/table.css	(revision 20340)
@@ -7,16 +7,16 @@
 ----------------------------------------------- */
 table {
-    width: 100%;
     margin: 15px auto 20px auto;
     border-top: 1px solid #ccc;
     border-left: 1px solid #ccc;
+    width: 100%;
     border-collapse: collapse;
     text-align: left;
 }
 table th {
-    color: #333;
     padding: 8px;
     border-right: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
+    color: #333;
     background-color: #f0f0f0;
     font-weight: normal;
@@ -30,11 +30,13 @@
 /* 見出し
 ----------------------------------------------- */
-div#under02column_shopping table th {
+div#undercolumn_shopping table th {
     text-align: center;
 }
-div#under02column_shopping table.delivname th {
+div#undercolumn_shopping table.delivname th {
     text-align: left;
     width: 155px;
 }
+
+/* MYページ */
 div#mycontents_area table th {
     text-align: center;
@@ -43,10 +45,27 @@
     text-align: right;
 }
+div#mycontents_area table th.alignL {
+    text-align: left;
+}
+div#mycontents_area table th.resulttd {
+    text-align: right;
+}
+div#mycontents_area table caption {
+    padding: 8px;
+    border-top: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    color: #000;
+    background-color: #f0f0f0;
+    text-align: left;
+    font-weight: bold;
+}
 
-/* 見出し
+
+/* その他
 ----------------------------------------------- */
 table select {
+    margin-bottom: 7px;
     border: solid 1px #ccc;
-    margin-bottom: 7px;
 }
 
Index: branches/version-2_5-dev/html/user_data/packages/default/css/common.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/common.css	(revision 20310)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/common.css	(revision 20340)
@@ -17,5 +17,5 @@
 }
 
-/*PHOTO*/
+/*写真*/
 .picture {
     border: 1px solid #ccc;
@@ -28,6 +28,6 @@
 /* 全体を包括 */
 .frame_outer {
+    margin: 0 auto;
     width: 100%;
-    margin: 0 auto;
     text-align: center;
 }
@@ -35,10 +35,11 @@
 /* コンテンツ */
 #container {
+    margin: 0 auto;
+    padding: 0 0 30px 0;
     width: 980px;
-    margin: 0 auto;
-    padding: 0 0 30px 0;
+    background: #fff;
     text-align: left;
-    background: #fff;
-}
+}
+
 
 /* ==============================================
@@ -50,7 +51,7 @@
 #bottomcolumn ,
 #footerbottomcolumn {
+    margin: 0 auto;
+    padding: 15px;
     width: 950px;
-    margin: 0 auto;
-    padding: 15px;
     background: #fff;
     text-align: left;
@@ -66,18 +67,19 @@
 /* 1カラム設定 */
 #one_maincolumn {
+    margin: 0 auto;
     width: 80%;
-    margin: 0 auto;
 }
 
 /* 2カラム設定 (メイン部が左) */
 #two_maincolumn_left {
-    width: 79%;
-    float: left;
+    padding-left: 1.5%;
+    float: left;
+    width: 78%;
 }
 
 /* 2カラム設定 (メイン部が右) */
 #two_maincolumn_right {
+    padding-right: 1.5%;
     width: 78%;
-    margin-right: 1.5%; /* 側を同等幅の未定義空間として、段落崩れを防ぐ */
     float: right;
 }
@@ -85,13 +87,11 @@
 /* 3カラム設定 */
 #three_maincolumn {
+    padding-left: 0.5%;
     width: 59%;
-    padding-left: 0.5%; /* 右側を同等幅の未定義空間として、段落崩れを防ぐ */
     float: left;
 }
 
 /* 下層コンテンツ */
-div#undercolumn { width: 100%; margin: 0;}
-/*
-#under02column
+div#undercolumn { width: 100%; margin: 0 0 30px 0;}
 
 
@@ -101,12 +101,4 @@
 /* フロート回り込み解除
 ----------------------------------------------- */
-br.clear {/* 消す */
-    clear: both;
-    display: none;
-    font-size: 0px;
-    line-height: 0%;
-    height: 0px
-}
-
 .clearfix:after {
     display:block;
@@ -122,17 +114,17 @@
 ----------------------------------------------- */
 a:link {
-    color: #3399cc;
+    color: #39c;
     text-decoration: none;
 }
 a:visited {
-    color: #3399cc;
+    color: #39c;
     text-decoration: none;
 }
 a:link:hover {
-    color: #ff6600;
+    color: #f60;
     text-decoration: underline;
 }
 a[href]:hover { 
-    color: #ff6600;
+    color: #f60;
 }
 
@@ -142,8 +134,8 @@
 h1,h2,h3,h4,h5 { font-size: 100%; line-height: 150%;}
 .price { color: #f00; }
+.sale_price { color: #f00; }
 .point { color: #f00; font-weight: bold; }
 .user_name { font-weight: bold; }
-.sale_price { color: #f00; }
-.normal_price { color: #f00; }
+.normal_price { color: #f00; font-size: 90%; }
 .recommend_level { color: #ecbd00; }
 
@@ -152,9 +144,4 @@
 .st { font-weight: bold; }
 .mini { font-size: 90%; }
-
-em {/* 消す */
-    font-style: normal;
-    color: #f00;
-}
 
 
@@ -167,4 +154,5 @@
 .pricetd em { font-weight: bold;}
 
+
 /* フォーム
 ----------------------------------------------- */
@@ -175,4 +163,6 @@
     padding: 2px;
 }
+
+.box40 {width: 40px; }
 .box60 {width: 60px; }
 .box100 {width: 100px; }
@@ -183,7 +173,9 @@
 .box240 {width: 240px; }
 .box300 {width: 300px; }
+.box320 {width: 320px; }
 .box350 {width: 350px; }
 .box380 {width: 380px; }
-/* フォームが縦に重なり合う場合にboxと併用する余白 */
+
+/* フォームが縦に重なり合う場合に併用する余白 */
 .top { margin-bottom: 5px; }
 
@@ -193,29 +185,28 @@
 h2.title {
     margin-bottom: 10px;
+    padding: 8px;
     border-top: solid 1px #ebeced;
+    color: #f60;
     background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
     background-color: #fef3d8;
-    padding: 8px;
     font-size: 170%;
-    color: #f60;
-}
-
-#one_maincolumn .subarea h3 ,
-#under02column .subarea h3 ,
-#two_maincolumn_right .subarea h3 ,
-#three_maincolumn .subarea h3 ,
-div#under02column_login .login_area h3 ,
-#under02column_shopping h3 ,
+}
+
+#one_maincolumn .sub_area h3 ,
+#two_maincolumn_right .sub_area h3 ,
+#two_maincolumn_left .sub_area h3 ,
+#three_maincolumn .sub_area h3 ,
+#undercolumn_login .login_area h3 ,
+#undercolumn_shopping h3 ,
 #mypagecolumn h3 ,
-#under02column_cart h3 {
-    font-size: 120%;
+#undercolumn_cart h3 {
     margin: 0 0 10px 0;
     padding: 5px 0 10px;
+    color: #f60;
     background: url("../img/background/line_01.gif") repeat-x left bottom;
-    color: #f60;
-    clear: both;
-}
-
-div#under02column_login .login_area h4 {
+    font-size: 120%;
+}
+
+div#undercolumn_login .login_area h4 {
     padding-left: 15px;
     background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
@@ -230,57 +221,60 @@
 #errorHeader {
     color: #F00;
-	  font-weight: bold;
-	  font-size: 12px;
+    font-weight: bold;
+    font-size: 12px;
     background-color: #FEB;
     text-align: center;
     padding: 5px;
 }
-#headerWrap {
+
+#header_wrap {
+    border-top: solid 3px #f90;
     min-height: 82px;
     background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
-    border-top: solid 3px #f90;
 }
 #header {
+    margin: auto;
     width: 980px;
-    margin: auto;
-}
-#logoArea {
+}
+#logo_area {
     padding-left: 10px;
+    float: left;
     width: 390px;
-    float: left;
     text-align: left;
 }
 #header_utility {
+    float: right;
     width: 580px;
-    float: right;
-}
+}
+
 
 /* ロゴ
 ----------------------------------------------- */
-#siteDescription {
+#site_description {
     margin-top: 13px;
     font-size:90%;
 }
-#logoArea h1 {
+#logo_area h1 {
     width: 378px;
     height: 33px;
 }
-#logoArea h1 span{
+#logo_area h1 span{
     display: none;/* テキストロゴ非表示 */
 }
 
+
 /* ヘッダーナビ
 ----------------------------------------------- */
-div#headerNavi {
+div#header_navi {
+    float: right;
     width: 409px;
     height: 38px;
-    float: right;
-}
-div#headerNavi ul li {
-    float: left;
+}
+div#header_navi ul li {
     display: block;
-}
-div#headerNavi ul li.mypage,
-div#headerNavi ul li.entry {
+    float: left;
+}
+div#header_navi ul li.mypage,
+div#header_navi ul li.entry {
     margin-top: 6px;
 }
@@ -290,15 +284,15 @@
  フッター
 =============================================== */
-#footerWrap {
+#footer_wrap {
+    margin: 0 auto;
     width: 980px;
     height: 80px;
-    margin: 0 auto;
     background: #fff;
 }
 #footer {
+    padding-top: 10px;
+    border-top: solid 1px #ccc;
     width: 950px;
     margin: auto;
-    padding-top: 10px;
-    border-top: solid 1px #ccc;
 }
 #pagetop {
@@ -314,4 +308,5 @@
 }
 
+
 /* ==============================================
  パーツ
@@ -320,4 +315,5 @@
 ----------------------------------------------- */
 .btn_area {
+    margin-top: 10px;
     width: 100%;
     text-align: center;
@@ -325,11 +321,8 @@
 
 .btn_area li {
+    padding-right: 10px;
     display: inline;
-    padding-right: 10px;
-}
-
-#cartbtn_default {
-    margin: 7px 0;
-}
+}
+
 
 /* 完了メッセージ
@@ -341,8 +334,8 @@
 div#undercolumn_entry .message {
     margin-bottom: 20px;
-    font-size: 160%;
+    color: #f60;
     line-height: 150%;
     font-weight: bold;
-    color: #f60;
+    font-size: 160%;
 }
 div#complete_area .shop_information {
@@ -353,6 +346,6 @@
 div#complete_area .shop_information .name {
     margin-bottom: 10px;
+    font-weight: bold;
     font-size: 140%;
-    font-weight: bold;
-}
-
+}
+
Index: branches/version-2_5-dev/html/user_data/packages/default/css/header_bloc.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/header_bloc.css	(revision 20290)
+++ 	(revision )
@@ -1,51 +1,0 @@
-@charset "utf-8";
-
-/* ***********************************************
-インヘッダーブロック
-************************************************ */
-/* ログイン
------------------------------------------------ */
-#headerInternalColumn {
-    width: 520px;
-    height: 35px;
-    margin-top: 5px;
-    float: right;
-}
-
-/* ログイン
------------------------------------------------ */
-#header_login_area {
-    height: 30px;
-    padding: 0 10px;
-    background: #fef3d3;
-    border: solid 1px #ffc979;
-    letter-spacing: -0.075em;
-}
-#header_login_area ul.formList {
-    margin-top: 5px;
-}
-#header_login_area ul.formList li {
-    float: left;
-}
-#header_login_area ul.formList li.mail {
-    width: 155px;
-    padding-left: 28px;
-    background: url("../img/common/ico_arrow_login.gif") no-repeat left;
-    font-size: 90%;
-}
-#header_login_area ul.formList li.password {
-    padding-right: 5px;
-}
-#header_login_area ul.formList li.login_memory {
-    padding-right: 5px;
-    font-size: 90%;
-}
-#header_login_area ul.formList li.forgot{
-    margin-top: 3px;
-    padding-right: 5px;
-    font-size: 90%;
-}
-#header_login_area ul.formList li.btn {
-    width: 53px;
-    padding-right: 5px;
-}