[Svn-src-all:2713] [version-2_12-dev 21612] #1613 (typo修正・ソース整形・ソースコメントの改善)
Seasoft
admin ＠ mail.ec-cube.net
2012年 3月 8日 (木) 02:50:27 JST
Subversion committed to /home/svn/open 21612
http://svn.ec-cube.net/open_trac/changeset/21612
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-03-08 02:50:27 +0900 (木, 08 3月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1613 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/html/user_data/packages/default/css/bloc.css
U branches/version-2_12-dev/html/user_data/packages/default/css/bloc_alpha.css
U branches/version-2_12-dev/html/user_data/packages/default/css/common.css
U branches/version-2_12-dev/html/user_data/packages/default/css/contents.css
U branches/version-2_12-dev/html/user_data/packages/default/css/popup.css
U branches/version-2_12-dev/html/user_data/packages/default/css/print.css
U branches/version-2_12-dev/html/user_data/packages/default/css/reset.css
U branches/version-2_12-dev/html/user_data/packages/default/css/table.css
U branches/version-2_12-dev/html/user_data/packages/sphone/css/jqm.css
U branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js
変更: branches/version-2_12-dev/html/user_data/packages/default/css/bloc.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/bloc.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/bloc.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,443 +1,443 @@
- ＠ charset "utf-8";
-
-/************************************************
- ブロック用
-************************************************ */
-/*** 目次 ***
-
-▼ブロック共通
-リスト
-タイトル
-ヘッダー上、フッター下のブロックエリア
-
-▼各機能ブロックの指定
--新着情報
--現在のカゴの中
--カテゴリ
--ガイドリンク
--ログイン（サイド用）
--検索
--カレンダー
--おすすめ商品
- *メインカラム用 1カラム時 [one_maincolumn]
- *メインカラム用 2カラム時 [two_maincolumn_left]
- [two_maincolumn_right]
- *メインカラム用 3カラム時 [three_maincolumn]
- *サイドカラム用 [side_column]
- *商品詳細のオススメ商品 [whobought_area]
- */
-
-
-/* ==============================================
-ブロック共通
-/* ============================================= */
-#container .block_body {
- background-color: #fff;
-}
-.side_column {
- overflow-x: hidden; /* IE6 表示乱れ防止 */
-}
-.side_column .block_outer {
- margin: 10px 7%;
-}
-.side_column .block_body ,
-.main_column .block_body {
- border: solid 1px #ccc;
- border-top: none;
-}
-.side_column .block_body .box {
- border: solid 1px #ccc;
- width: 145px;
-}
-.main_column .block_outer {
- margin-bottom: 20px;
-}
-
-
-/* リスト
------------------------------------------------ */
-/* ログイン 検索条件 */
-#container .block_outer .block_body dl.formlist {
- margin-bottom: 8px;
-}
-#container .block_outer .block_body dl.formlist dd {
- margin-bottom: 5px;
-}
-#container .block_outer .block_body dl.formlist dt {
- margin-bottom: 3px;
- padding-left: 15px;
- background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
- font-size: 90%;
-}
-#container .block_outer .block_body dl.formlist span{
- vertical-align: top;
-}
-
-
-/* タイトル
------------------------------------------------ */
-/* タイトルの背景 白 */
-#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;
- font-size: 14px;
-}
-#category_area h2 {
- border-top: solid 1px #f90;
- background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
- padding: 5px 0 8px 10px;
- font-size: 14px;
-}
-
-/* タイトルの背景 オレンジ */
-#recommend_area h2 ,
-#news_area h2 {
- padding: 5px 0 8px 10px;
- border-style: solid;
- border-color: #f90 #ccc #ccc;
- border-width: 1px 1px 0;
- background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
-}
-
-
-/* ==============================================
-▼ヘッダー上、フッター下のブロックエリア
-=============================================== */
-div#topcolumn {
- margin:0px;
- clear:both;
-}
-div#bottomcolumn {
- margin:0px;
- clear: both;
-}
-
-
-/* ***********************************************
-▼各機能ブロックの指定
-/*********************************************** */
-
-/* ===============================================
-▼新着情報
-=============================================== */
-#news_area .block_body {
- padding: 10px;
-}
-#news_area .news_contents {
- padding-right: 10px;
- max-height:260px;
- height: auto !important;
- height: 260px;
- overflow:auto;
- overflow-y:scroll;
-}
-
-#news_area dl.newslist {
- background: url("../img/background/line_dot_01.gif") repeat-x bottom;
-}
-#news_area dl.newslist dt {
- margin-bottom: 5px;
-}
-#news_area dl.newslist dd {
- margin-bottom: 10px;
- padding-bottom: 10px;
-}
-#news_area dl.end {
- padding: 10px 0;
- background: url("") no-repeat bottom;
-}
-
-
-/* ===============================================
-▼現在のカゴの中
-=============================================== */
-#cart_area .information {
- padding: 10px;
-}
-#cart_area .postage {
- margin-top: 10px;
- padding-top: 10px;
- background: url("../img/background/line_dot_01.gif") repeat-x top;
-}
-#cart_area .postage .point_announce {
- padding: 2px 0 2px 20px;
- background: url("../img/icon/ico_price.gif") no-repeat left top;
-}
-#cart_area .btn {
- padding: 10px 0;
- background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
- text-align: center;
-}
-
-
-/* ===============================================
-▼カテゴリ
-=============================================== */
-#category_area .block_body{
- background-color: #fffaf0;
-}
-
-#category_area li{
- padding-left: 5px;
-}
-#category_area li.level1{
- border-bottom: solid 1px #ccc;
-}
-#category_area li.level1 p{
- padding-left: 20px;
- margin: 7px 3px;
-}
-#category_area li.level1 p {
- background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
-}
-#category_area li.level1 li p {
- background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
-}
-#category_area li a {
- display: block;
- padding: 0;
-}
-a.onlink:link {
- color: #f00;
- text-decoration: underline;
-}
-a.onlink:visited {
- color: #f00;
-}
-a.onlink:hover {
- color: #f00;
-}
-
-
-/* ===============================================
-▼ガイドリンク
-=============================================== */
-#guide_area {
- margin-top: 1em;
- border: none;
-}
-#guide_area li{
- margin-bottom: 5px;
- letter-spacing: -0.05em;
-}
-ul.button_like li {
- margin: 0;
- padding: 0 0 1px 0;
- background: url("../img/background/bg_btn_list.jpg") bottom repeat-x;
-}
-ul.button_like li a {
- margin: 0;
- padding: 10px 15px 10px 10px;
- 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;
-}
-
-
-/* ===============================================
-▼ログイン（サイド用）
-※ヘッダー用はbloc_alpha.css内に記述
-=============================================== */
-#container div#login_area .block_body {
- padding: 10px;
-}
-
-#container div#login_area .block_body p {
- margin-bottom: 5px;
-}
-
-#container div#login_area .block_body .btn {
- text-align: center;
-}
-#container .login_area dl.formlist {
- margin-bottom: 8px;
- width: 420px;
-}
-#container .login_area dl.formlist dt {
- 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%;
-}
-#container .login_area dl.formlist dd {
- margin-bottom: 5px;
- float: right;
- width: 300px;
- vertical-align: bottom;
- text-align: left;
-}
-#container div#login_area .block_body .mini {
- margin-top: 5px;
- letter-spacing: -0.01em;
-}
-
-
-/* ===============================================
-▼検索
-=============================================== */
-div#search_area .block_body {
- padding: 10px;
-}
-div#search_area .block_body .btn {
- text-align: center;
-}
-
-
-/* ===============================================
-▼カレンダー
-=============================================== */
-#calender_area {
- background-color: transparent;
- border: none;
-}
-#calender_area .block_body {
- padding: 10px 0;
- background-color: #f1f9fc;
-}
-#calender_area table {
- background: #fff;
- border: none;
- width: 150px;
- margin: 0 auto 5px;
- font-size: 90%;
-}
-#calender_area table td {
- padding: 1px 3px;
- border-top: 1px solid #ccc;
- border-right: none;
- text-align:center;
-}
-#calender_area th {
- padding: 1px 3px;
- background: #fff;
- border: none;
- text-align: center;
-}
-#calender_area table .month {
- margin-bottom: 5px;
- padding-left: 12px;
- background: url("../img/icon/ico_arrow_04.gif") no-repeat left;
- font-size: 120%;
-}
-#calender_area .off {
- color: #f00;
-}
-#calender_area .information {
- margin-left: 10px;
- font-size: 90%;
-}
-
-
-/* ===============================================
-▼おすすめ商品
-=============================================== */
-/*
- tplファイルのマークアップが同じ項目
- メインカラム用 2カラム時 [two_maincolumn_left]
- [two_maincolumn_right]
- メインカラム用 3カラム時 [three_maincolumn]
- サイドカラム用 [side_column]
- 商品詳細のオススメ商品 [whobought_area]
-=============================================== */
-/* 共通
------------------------------------------------ */
-#recommend_area .block_body ,
-#whobought_area .product_item {
- margin-bottom: 10px;
- padding: 10px 0 10px;
- border: none;
- background: url("../img/background/line_dot_01.gif") repeat-x bottom;
-}
-
-#recommend_area .block_body p ,
-#whobought_area .product_item p {
- margin: 0 0 5px 0;
-}
-
-#recommend_area .block_body img ,
-#whobought_area .product_item img {
- margin: 0 5px 0 0;
-}
-
-#recommend_area .block_body h3 ,
-#whobought_area .product_item h3 {
- font-size: 100%;
- font-weight: normal;
-}
-
-/* サイドカラム用 */
-.side_column #recommend_area .product_item {
- margin-bottom: 10px;
-}
-
-
-/* 画像
------------------------------------------------ */
-/* メインカラム用 */
-.main_column #recommend_area .block_body .productImage,
-#whobought_area .product_item .productImage {
- margin-bottom: 10px;
- float: left;
- width: 90px;
-}
-/* サイドカラム用 */
-.side_column #recommend_area .block_body .productImage {
- float: none;
- text-align: center;
- width: auto;
-}
-
-
-/* 左右の振り分け
------------------------------------------------ */
-.main_column #recommend_area .product_item,
-#whobought_area .product_item {
- float: left;
- width: 47.5%;
- padding-left: 1%;
- padding-right: 1%;
-}
-
-
-/* 商品説明テキスト
------------------------------------------------ */
-/* メインカラム用 1カラム時*/
-#one_maincolumn #recommend_area .block_body .productContents {
- float: right;
- width: 74%;
-}
-
-/* メインカラム用 2カラム時*/
-#two_maincolumn_right #recommend_area .block_body .productContents ,
-#two_maincolumn_left #recommend_area .block_body .productContents ,
-#two_maincolumn_right #whobought_area .productContents ,
-#two_maincolumn_left #whobought_area .productContents {
- float: right;
- width: 74%;
-}
-
-/* メインカラム用 3カラム時*/
-#three_maincolumn #recommend_area .block_body .productContents ,
-#three_maincolumn #whobought_area .productContents {
- float: right;
- width: 67%;
-}
-
-/* サイドカラム用 */
-.side_column #recommend_area .block_body .productContents {
- clear: both;
-}
+ ＠ charset "utf-8";
+
+/************************************************
+ ブロック用
+************************************************ */
+/*** 目次 ***
+
+▼ブロック共通
+リスト
+タイトル
+ヘッダー上、フッター下のブロックエリア
+
+▼各機能ブロックの指定
+-新着情報
+-現在のカゴの中
+-カテゴリ
+-ガイドリンク
+-ログイン（サイド用）
+-検索
+-カレンダー
+-おすすめ商品
+ *メインカラム用 1カラム時 [one_maincolumn]
+ *メインカラム用 2カラム時 [two_maincolumn_left]
+ [two_maincolumn_right]
+ *メインカラム用 3カラム時 [three_maincolumn]
+ *サイドカラム用 [side_column]
+ *商品詳細のオススメ商品 [whobought_area]
+ */
+
+
+/* ==============================================
+ブロック共通
+/* ============================================= */
+#container .block_body {
+ background-color: #fff;
+}
+.side_column {
+ overflow-x: hidden; /* IE6 表示乱れ防止 */
+}
+.side_column .block_outer {
+ margin: 10px 7%;
+}
+.side_column .block_body,
+.main_column .block_body {
+ border: solid 1px #ccc;
+ border-top: none;
+}
+.side_column .block_body .box {
+ border: solid 1px #ccc;
+ width: 145px;
+}
+.main_column .block_outer {
+ margin-bottom: 20px;
+}
+
+
+/* リスト
+----------------------------------------------- */
+/* ログイン 検索条件 */
+#container .block_outer .block_body dl.formlist {
+ margin-bottom: 8px;
+}
+#container .block_outer .block_body dl.formlist dd {
+ margin-bottom: 5px;
+}
+#container .block_outer .block_body dl.formlist dt {
+ margin-bottom: 3px;
+ padding-left: 15px;
+ background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+ font-size: 90%;
+}
+#container .block_outer .block_body dl.formlist span{
+ vertical-align: top;
+}
+
+
+/* タイトル
+----------------------------------------------- */
+/* タイトルの背景 白 */
+#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;
+ font-size: 14px;
+}
+#category_area h2 {
+ border-top: solid 1px #f90;
+ background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
+ padding: 5px 0 8px 10px;
+ font-size: 14px;
+}
+
+/* タイトルの背景 オレンジ */
+#recommend_area h2,
+#news_area h2 {
+ padding: 5px 0 8px 10px;
+ border-style: solid;
+ border-color: #f90 #ccc #ccc;
+ border-width: 1px 1px 0;
+ background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
+}
+
+
+/* ==============================================
+▼ヘッダー上、フッター下のブロックエリア
+=============================================== */
+div#topcolumn {
+ margin:0px;
+ clear:both;
+}
+div#bottomcolumn {
+ margin:0px;
+ clear: both;
+}
+
+
+/* ***********************************************
+▼各機能ブロックの指定
+/*********************************************** */
+
+/* ===============================================
+▼新着情報
+=============================================== */
+#news_area .block_body {
+ padding: 10px;
+}
+#news_area .news_contents {
+ padding-right: 10px;
+ max-height:260px;
+ height: auto !important;
+ height: 260px;
+ overflow:auto;
+ overflow-y:scroll;
+}
+
+#news_area dl.newslist {
+ background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+}
+#news_area dl.newslist dt {
+ margin-bottom: 5px;
+}
+#news_area dl.newslist dd {
+ margin-bottom: 10px;
+ padding-bottom: 10px;
+}
+#news_area dl.end {
+ padding: 10px 0;
+ background: url("") no-repeat bottom;
+}
+
+
+/* ===============================================
+▼現在のカゴの中
+=============================================== */
+#cart_area .information {
+ padding: 10px;
+}
+#cart_area .postage {
+ margin-top: 10px;
+ padding-top: 10px;
+ background: url("../img/background/line_dot_01.gif") repeat-x top;
+}
+#cart_area .postage .point_announce {
+ padding: 2px 0 2px 20px;
+ background: url("../img/icon/ico_price.gif") no-repeat left top;
+}
+#cart_area .btn {
+ padding: 10px 0;
+ background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
+ text-align: center;
+}
+
+
+/* ===============================================
+▼カテゴリ
+=============================================== */
+#category_area .block_body{
+ background-color: #fffaf0;
+}
+
+#category_area li{
+ padding-left: 5px;
+}
+#category_area li.level1{
+ border-bottom: solid 1px #ccc;
+}
+#category_area li.level1 p{
+ padding-left: 20px;
+ margin: 7px 3px;
+}
+#category_area li.level1 p {
+ background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
+}
+#category_area li.level1 li p {
+ background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
+}
+#category_area li a {
+ display: block;
+ padding: 0;
+}
+a.onlink:link {
+ color: #f00;
+ text-decoration: underline;
+}
+a.onlink:visited {
+ color: #f00;
+}
+a.onlink:hover {
+ color: #f00;
+}
+
+
+/* ===============================================
+▼ガイドリンク
+=============================================== */
+#guide_area {
+ margin-top: 1em;
+ border: none;
+}
+#guide_area li{
+ margin-bottom: 5px;
+ letter-spacing: -0.05em;
+}
+ul.button_like li {
+ margin: 0;
+ padding: 0 0 1px 0;
+ background: url("../img/background/bg_btn_list.jpg") bottom repeat-x;
+}
+ul.button_like li a {
+ margin: 0;
+ padding: 10px 15px 10px 10px;
+ 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;
+}
+
+
+/* ===============================================
+▼ログイン（サイド用）
+※ヘッダー用はbloc_alpha.css内に記述
+=============================================== */
+#container div#login_area .block_body {
+ padding: 10px;
+}
+
+#container div#login_area .block_body p {
+ margin-bottom: 5px;
+}
+
+#container div#login_area .block_body .btn {
+ text-align: center;
+}
+#container .login_area dl.formlist {
+ margin-bottom: 8px;
+ width: 420px;
+}
+#container .login_area dl.formlist dt {
+ 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%;
+}
+#container .login_area dl.formlist dd {
+ margin-bottom: 5px;
+ float: right;
+ width: 300px;
+ vertical-align: bottom;
+ text-align: left;
+}
+#container div#login_area .block_body .mini {
+ margin-top: 5px;
+ letter-spacing: -0.01em;
+}
+
+
+/* ===============================================
+▼検索
+=============================================== */
+div#search_area .block_body {
+ padding: 10px;
+}
+div#search_area .block_body .btn {
+ text-align: center;
+}
+
+
+/* ===============================================
+▼カレンダー
+=============================================== */
+#calender_area {
+ background-color: transparent;
+ border: none;
+}
+#calender_area .block_body {
+ padding: 10px 0;
+ background-color: #f1f9fc;
+}
+#calender_area table {
+ background: #fff;
+ border: none;
+ width: 150px;
+ margin: 0 auto 5px;
+ font-size: 90%;
+}
+#calender_area table td {
+ padding: 1px 3px;
+ border-top: 1px solid #ccc;
+ border-right: none;
+ text-align:center;
+}
+#calender_area th {
+ padding: 1px 3px;
+ background: #fff;
+ border: none;
+ text-align: center;
+}
+#calender_area table .month {
+ margin-bottom: 5px;
+ padding-left: 12px;
+ background: url("../img/icon/ico_arrow_04.gif") no-repeat left;
+ font-size: 120%;
+}
+#calender_area .off {
+ color: #f00;
+}
+#calender_area .information {
+ margin-left: 10px;
+ font-size: 90%;
+}
+
+
+/* ===============================================
+▼おすすめ商品
+=============================================== */
+/*
+ tplファイルのマークアップが同じ項目
+ メインカラム用 2カラム時 [two_maincolumn_left]
+ [two_maincolumn_right]
+ メインカラム用 3カラム時 [three_maincolumn]
+ サイドカラム用 [side_column]
+ 商品詳細のオススメ商品 [whobought_area]
+=============================================== */
+/* 共通
+----------------------------------------------- */
+#recommend_area .block_body,
+#whobought_area .product_item {
+ margin-bottom: 10px;
+ padding: 10px 0 10px;
+ border: none;
+ background: url("../img/background/line_dot_01.gif") repeat-x bottom;
+}
+
+#recommend_area .block_body p,
+#whobought_area .product_item p {
+ margin: 0 0 5px 0;
+}
+
+#recommend_area .block_body img,
+#whobought_area .product_item img {
+ margin: 0 5px 0 0;
+}
+
+#recommend_area .block_body h3,
+#whobought_area .product_item h3 {
+ font-size: 100%;
+ font-weight: normal;
+}
+
+/* サイドカラム用 */
+.side_column #recommend_area .product_item {
+ margin-bottom: 10px;
+}
+
+
+/* 画像
+----------------------------------------------- */
+/* メインカラム用 */
+.main_column #recommend_area .block_body .productImage,
+#whobought_area .product_item .productImage {
+ margin-bottom: 10px;
+ float: left;
+ width: 90px;
+}
+/* サイドカラム用 */
+.side_column #recommend_area .block_body .productImage {
+ float: none;
+ text-align: center;
+ width: auto;
+}
+
+
+/* 左右の振り分け
+----------------------------------------------- */
+.main_column #recommend_area .product_item,
+#whobought_area .product_item {
+ float: left;
+ width: 47.5%;
+ padding-left: 1%;
+ padding-right: 1%;
+}
+
+
+/* 商品説明テキスト
+----------------------------------------------- */
+/* メインカラム用 1カラム時*/
+#one_maincolumn #recommend_area .block_body .productContents {
+ float: right;
+ width: 74%;
+}
+
+/* メインカラム用 2カラム時*/
+#two_maincolumn_right #recommend_area .block_body .productContents,
+#two_maincolumn_left #recommend_area .block_body .productContents,
+#two_maincolumn_right #whobought_area .productContents,
+#two_maincolumn_left #whobought_area .productContents {
+ float: right;
+ width: 74%;
+}
+
+/* メインカラム用 3カラム時*/
+#three_maincolumn #recommend_area .block_body .productContents,
+#three_maincolumn #whobought_area .productContents {
+ float: right;
+ width: 67%;
+}
+
+/* サイドカラム用 */
+.side_column #recommend_area .block_body .productContents {
+ clear: both;
+}
変更: branches/version-2_12-dev/html/user_data/packages/default/css/bloc_alpha.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/bloc_alpha.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/bloc_alpha.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,88 +1,88 @@
- ＠ charset "utf-8";
-
-/************************************************
- インヘッダーブロック
-************************************************ */
-#headerInternalColumn {
- margin-top: 5px;
- float: right;
- width: 520px;
- height: 35px;
-}
-
-/* ログイン（ヘッダー用）
------------------------------------------------ */
-#header_login_area {
- padding: 0 10px;
- border: solid 1px #ffc979;
- height: 30px;
- background: #fef3d3;
- 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 {
- padding-left: 28px;
- width: 155px;
- 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 {
- padding-right: 5px;
- width: 53px;
-}
-#header_login_area p.btn {
- height: 20px;
- padding: 5px 0;
- vertical-align: middle;
-}
-#header_login_area p.btn input[type=image] {
- vertical-align: middle;
-}
-
-/* ***********************************************
-追加ブロック
-************************************************ */
-/* 共通
------------------------------------------------ */
-#container .block_outer #banner_area .block_body {
- border: none;
-}
-
-/* 【メイン】バナーエリア_02
------------------------------------------------ */
-.main_column .block_outer #banner_area .block_body ul {
- width: 100%;
-}
-.main_column .block_outer #banner_area .block_body ul li {
- float: left;
-}
-.main_column .block_outer #banner_area .block_body ul li.sub_01{
- padding-right: 8px;
-}
-
-/* 【サイド】バナーエリア_01
------------------------------------------------ */
-/* 【サイド】バナーエリア_02
------------------------------------------------ */
-#leftcolumn .block_outer #banner_area .block_body ul li ,
-#rightcolumn .block_outer #banner_area .block_body ul li {
- margin-bottom: 8px;
-}
-
+ ＠ charset "utf-8";
+
+/************************************************
+ インヘッダーブロック
+************************************************ */
+#headerInternalColumn {
+ margin-top: 5px;
+ float: right;
+ width: 520px;
+ height: 35px;
+}
+
+/* ログイン（ヘッダー用）
+----------------------------------------------- */
+#header_login_area {
+ padding: 0 10px;
+ border: solid 1px #ffc979;
+ height: 30px;
+ background: #fef3d3;
+ 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 {
+ padding-left: 28px;
+ width: 155px;
+ 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 {
+ padding-right: 5px;
+ width: 53px;
+}
+#header_login_area p.btn {
+ height: 20px;
+ padding: 5px 0;
+ vertical-align: middle;
+}
+#header_login_area p.btn input[type=image] {
+ vertical-align: middle;
+}
+
+/* ***********************************************
+追加ブロック
+************************************************ */
+/* 共通
+----------------------------------------------- */
+#container .block_outer #banner_area .block_body {
+ border: none;
+}
+
+/* 【メイン】バナーエリア_02
+----------------------------------------------- */
+.main_column .block_outer #banner_area .block_body ul {
+ width: 100%;
+}
+.main_column .block_outer #banner_area .block_body ul li {
+ float: left;
+}
+.main_column .block_outer #banner_area .block_body ul li.sub_01{
+ padding-right: 8px;
+}
+
+/* 【サイド】バナーエリア_01
+----------------------------------------------- */
+/* 【サイド】バナーエリア_02
+----------------------------------------------- */
+#leftcolumn .block_outer #banner_area .block_body ul li,
+#rightcolumn .block_outer #banner_area .block_body ul li {
+ margin-bottom: 8px;
+}
+
変更: branches/version-2_12-dev/html/user_data/packages/default/css/common.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/common.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/common.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,434 +1,434 @@
- ＠ charset "utf-8";
-
-/************************************************
- 共通設定
-************************************************ */
-body {
- color: #666;
- font-family: Verdana,Arial,Helvetica,sans-serif;
- background-color: #f5f5f5;
- font-size: 72.5%;
- line-height: 150%;
- letter-spacing: 0.1em;
-}
-
-select {
- border: solid 1px #ccc;
-}
-
-/*写真*/
-.picture {
- border: 1px solid #ccc;
-}
-
-
-/* ==============================================
- フレーム
-=============================================== */
-/* 全体を包括 */
-.frame_outer {
- margin: 0 auto;
- width: 100%;
- text-align: center;
-}
-
-/* コンテンツ */
-#container {
- margin: 0 auto;
- padding: 0 0 30px 0;
- width: 980px;
- background: #fff;
- text-align: left;
-}
-
-
-/* ==============================================
- カラム指定
-=============================================== */
-/* ヘッダーとフッターの上下
-[注意]ブロック移動時はbloc.css内で調整が必要 */
-#topcolumn ,
-#bottomcolumn ,
-#footerbottomcolumn {
- margin: 0 auto;
- padding: 15px;
- width: 950px;
- background: #fff;
- text-align: left;
-}
-
-/* 中央カラム */
-.main_column {
- padding: 10px 0 20px;
-}
-
-/* サイドカラム */
-#leftcolumn {
- float: left;
- width: 20%;
-}
-#rightcolumn {
- float: right;
- width: 20%;
-}
-
-/* 1カラム設定 */
-#one_maincolumn {
- margin: 0 auto;
- width: 80%;
-}
-
-/* 2カラム設定 (メイン部が左) */
-#two_maincolumn_left {
- padding-left: 1.5%;
- float: left;
- width: 78%;
-}
-
-/* 2カラム設定 (メイン部が右) */
-#two_maincolumn_right {
- padding-right: 1.5%;
- width: 78%;
- float: right;
-}
-
-/* 3カラム設定 */
-#three_maincolumn {
- padding-left: 0.5%;
- width: 59%;
- float: left;
-}
-
-/* 下層コンテンツ */
-#undercolumn {
- width: 100%;
- margin: 0 0 30px 0;
-}
-
-
-/* ==============================================
- ユーティリティ
-=============================================== */
-/* フロート回り込み解除
------------------------------------------------ */
-.clearfix:after {
- display: block;
- clear: both;
- height: 0px;
- line-height: 0px;
- visibility: hidden;
- content: ".";
-}
-.clearfix {
- display: block; /* for IE8 */
-}
-.clear {
- clear: both;
-}
-
-/* リンク指定
------------------------------------------------ */
-a:link ,
-a:visited {
- color: #39c;
- text-decoration: none;
-}
-a:link:hover ,
-a[href]:hover {
- color: #f60;
- text-decoration: underline;
-}
-
-
-/* フォント
------------------------------------------------ */
-h1,h2,h3,h4,h5 {
- font-size: 100%;
- line-height: 150%;
-}
-.sale_price {
- color: #f00;
-}
-.normal_price {
- font-size: 90%;
-}
-.point {
- color: #f00;
- font-weight: bold;
-}
-.user_name {
- font-weight: bold;
-}
-.recommend_level {
- color: #ecbd00;
-}
-
-.attention {
- color: #f00;
-}
-.attentionSt {
- color: #f00;
- font-weight: bold;
-}
-.st {
- font-weight: bold;
-}
-.mini {
- font-size: 90%;
-}
-
-
-/* 行揃え
------------------------------------------------ */
-.alignC {
- text-align: center;
-}
-.alignR {
- text-align: right;
-}
-.alignL {
- text-align: left;
-}
-.pricetd em {
- font-weight: bold;
-}
-
-
-/* フォーム
------------------------------------------------ */
-input[type='text'] ,
-input[type='password'] ,
-.select {
- border: solid 1px #ccc;
- padding: 2px;
-}
-
-.box40 {
- width: 40px;
-}
-.box60 {
- width: 60px;
-}
-.box100 {
- width: 100px;
-}
-.box120 {
- width: 120px;
-}
-.box140 {
- width: 140px;
-}
-.box145 {
- width: 145px;
-}
-.box150 {
- width: 150px;
-}
-.box240 {
- width: 240px;
-}
-.box300 {
- width: 300px;
-}
-.box320 {
- width: 320px;
-}
-.box350 {
- width: 350px;
-}
-.box380 {
- width: 380px;
-}
-
-/* フォームが縦に重なり合う場合に併用する余白 */
-.top {
- margin-bottom: 5px;
-}
-
-.ng_top {
- margin-bottom: 0 !important;
-}
-
-
-/* タイトル
------------------------------------------------ */
-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;
- font-size: 170%;
-}
-
-#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 ,
-#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;
- font-size: 120%;
-}
-
-div#undercolumn_login .login_area h4 {
- padding-left: 15px;
- background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
-}
-
-
-/* ==============================================
- ヘッダー
-=============================================== */
-/* レイアウト
------------------------------------------------ */
-#header_wrap {
- border-top: solid 3px #f90;
- min-height: 82px;
- background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
-}
-#header {
- margin: auto;
- width: 980px;
-}
-#logo_area {
- padding-left: 10px;
- float: left;
- width: 390px;
- text-align: left;
-}
-#header_utility {
- float: right;
- width: 580px;
-}
-
-#errorHeader {
- color: #F00;
- font-weight: bold;
- font-size: 12px;
- background-color: #FEB;
- text-align: center;
- padding: 5px;
-}
-
-/* ロゴ
------------------------------------------------ */
-#site_description {
- font-size: 90%;
-}
-#logo_area h1 {
- width: 378px;
- height: 33px;
-}
-#logo_area h1 span {
- display: none; /* テキストロゴ非表示 */
-}
-
-
-/* ヘッダーナビ
------------------------------------------------ */
-div#header_navi {
- float: right;
- width: 409px;
- height: 38px;
-}
-div#header_navi ul li {
- display: block;
- float: left;
-}
-div#header_navi ul li.mypage,
-div#header_navi ul li.entry {
- margin-top: 6px;
-}
-
-
-/* ==============================================
- フッター
-=============================================== */
-#footer_wrap {
- margin: 0 auto;
- width: 980px;
- height: 80px;
- background: #fff;
-}
-#footer {
- margin: auto;
- padding-top: 10px;
- border-top: solid 1px #ccc;
- width: 950px;
-}
-#pagetop {
- width: 210px;
- float: right;
- text-align: right;
-}
-#copyright {
- width: 740px;
- float: left;
- text-align: left;
- font-size: 97%;
-}
-
-
-/* ==============================================
- パーツ
-=============================================== */
-/* ボタン
------------------------------------------------ */
-.btn_area {
- margin-top: 10px;
- width: 100%;
- text-align: center;
-}
-
-.btn_area li {
- padding-right: 10px;
- display: inline;
-}
-
-
-/* 完了メッセージ
------------------------------------------------ */
-div#complete_area {
- margin-bottom: 20px;
-}
-div#complete_area .message ,
-div#undercolumn_entry .message {
- margin-bottom: 20px;
- line-height: 150%;
- font-weight: bold;
- font-size: 120%;
-}
-div#complete_area .shop_information {
- margin-top: 40px;
- padding: 20px 0 0 0;
- border-top: solid 1px #ccc;
-}
-div#complete_area .shop_information .name {
- margin-bottom: 10px;
- font-weight: bold;
- font-size: 140%;
-}
-
-
-/* Tipsy
------------------------------------------------ */
-.tipsy { padding: 5px; font-size: 10px; position: absolute; z-index: 100000; }
- .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
- .tipsy-inner { border-radius: 3px; -moz-border-radius:3px; -webkit-border-radius:3px; }
- .tipsy-arrow { position: absolute; background: url('../img/ajax/tipsy.gif') no-repeat top left; width: 9px; height: 5px; }
- .tipsy-n .tipsy-arrow { top: 0; left: 50%; margin-left: -4px; }
- .tipsy-nw .tipsy-arrow { top: 0; left: 10px; }
- .tipsy-ne .tipsy-arrow { top: 0; right: 10px; }
- .tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -4px; background-position: bottom left; }
- .tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; background-position: bottom left; }
- .tipsy-se .tipsy-arrow { bottom: 0; right: 10px; background-position: bottom left; }
- .tipsy-e .tipsy-arrow { top: 50%; margin-top: -4px; right: 0; width: 5px; height: 9px; background-position: top right; }
- .tipsy-w .tipsy-arrow { top: 50%; margin-top: -4px; left: 0; width: 5px; height: 9px; }
-
+ ＠ charset "utf-8";
+
+/************************************************
+ 共通設定
+************************************************ */
+body {
+ color: #666;
+ font-family: Verdana,Arial,Helvetica,sans-serif;
+ background-color: #f5f5f5;
+ font-size: 72.5%;
+ line-height: 150%;
+ letter-spacing: 0.1em;
+}
+
+select {
+ border: solid 1px #ccc;
+}
+
+/*写真*/
+.picture {
+ border: 1px solid #ccc;
+}
+
+
+/* ==============================================
+ フレーム
+=============================================== */
+/* 全体を包括 */
+.frame_outer {
+ margin: 0 auto;
+ width: 100%;
+ text-align: center;
+}
+
+/* コンテンツ */
+#container {
+ margin: 0 auto;
+ padding: 0 0 30px 0;
+ width: 980px;
+ background: #fff;
+ text-align: left;
+}
+
+
+/* ==============================================
+ カラム指定
+=============================================== */
+/* ヘッダーとフッターの上下
+[注意]ブロック移動時はbloc.css内で調整が必要 */
+#topcolumn,
+#bottomcolumn,
+#footerbottomcolumn {
+ margin: 0 auto;
+ padding: 15px;
+ width: 950px;
+ background: #fff;
+ text-align: left;
+}
+
+/* 中央カラム */
+.main_column {
+ padding: 10px 0 20px;
+}
+
+/* サイドカラム */
+#leftcolumn {
+ float: left;
+ width: 20%;
+}
+#rightcolumn {
+ float: right;
+ width: 20%;
+}
+
+/* 1カラム設定 */
+#one_maincolumn {
+ margin: 0 auto;
+ width: 80%;
+}
+
+/* 2カラム設定 (メイン部が左) */
+#two_maincolumn_left {
+ padding-left: 1.5%;
+ float: left;
+ width: 78%;
+}
+
+/* 2カラム設定 (メイン部が右) */
+#two_maincolumn_right {
+ padding-right: 1.5%;
+ width: 78%;
+ float: right;
+}
+
+/* 3カラム設定 */
+#three_maincolumn {
+ padding-left: 0.5%;
+ width: 59%;
+ float: left;
+}
+
+/* 下層コンテンツ */
+#undercolumn {
+ width: 100%;
+ margin: 0 0 30px 0;
+}
+
+
+/* ==============================================
+ ユーティリティ
+=============================================== */
+/* フロート回り込み解除
+----------------------------------------------- */
+.clearfix:after {
+ display: block;
+ clear: both;
+ height: 0px;
+ line-height: 0px;
+ visibility: hidden;
+ content: ".";
+}
+.clearfix {
+ display: block; /* for IE8 */
+}
+.clear {
+ clear: both;
+}
+
+/* リンク指定
+----------------------------------------------- */
+a:link,
+a:visited {
+ color: #39c;
+ text-decoration: none;
+}
+a:link:hover,
+a[href]:hover {
+ color: #f60;
+ text-decoration: underline;
+}
+
+
+/* フォント
+----------------------------------------------- */
+h1,h2,h3,h4,h5 {
+ font-size: 100%;
+ line-height: 150%;
+}
+.sale_price {
+ color: #f00;
+}
+.normal_price {
+ font-size: 90%;
+}
+.point {
+ color: #f00;
+ font-weight: bold;
+}
+.user_name {
+ font-weight: bold;
+}
+.recommend_level {
+ color: #ecbd00;
+}
+
+.attention {
+ color: #f00;
+}
+.attentionSt {
+ color: #f00;
+ font-weight: bold;
+}
+.st {
+ font-weight: bold;
+}
+.mini {
+ font-size: 90%;
+}
+
+
+/* 行揃え
+----------------------------------------------- */
+.alignC {
+ text-align: center;
+}
+.alignR {
+ text-align: right;
+}
+.alignL {
+ text-align: left;
+}
+.pricetd em {
+ font-weight: bold;
+}
+
+
+/* フォーム
+----------------------------------------------- */
+input[type='text'],
+input[type='password'],
+.select {
+ border: solid 1px #ccc;
+ padding: 2px;
+}
+
+.box40 {
+ width: 40px;
+}
+.box60 {
+ width: 60px;
+}
+.box100 {
+ width: 100px;
+}
+.box120 {
+ width: 120px;
+}
+.box140 {
+ width: 140px;
+}
+.box145 {
+ width: 145px;
+}
+.box150 {
+ width: 150px;
+}
+.box240 {
+ width: 240px;
+}
+.box300 {
+ width: 300px;
+}
+.box320 {
+ width: 320px;
+}
+.box350 {
+ width: 350px;
+}
+.box380 {
+ width: 380px;
+}
+
+/* フォームが縦に重なり合う場合に併用する余白 */
+.top {
+ margin-bottom: 5px;
+}
+
+.ng_top {
+ margin-bottom: 0 !important;
+}
+
+
+/* タイトル
+----------------------------------------------- */
+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;
+ font-size: 170%;
+}
+
+#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,
+#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;
+ font-size: 120%;
+}
+
+div#undercolumn_login .login_area h4 {
+ padding-left: 15px;
+ background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
+}
+
+
+/* ==============================================
+ ヘッダー
+=============================================== */
+/* レイアウト
+----------------------------------------------- */
+#header_wrap {
+ border-top: solid 3px #f90;
+ min-height: 82px;
+ background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
+}
+#header {
+ margin: auto;
+ width: 980px;
+}
+#logo_area {
+ padding-left: 10px;
+ float: left;
+ width: 390px;
+ text-align: left;
+}
+#header_utility {
+ float: right;
+ width: 580px;
+}
+
+#errorHeader {
+ color: #F00;
+ font-weight: bold;
+ font-size: 12px;
+ background-color: #FEB;
+ text-align: center;
+ padding: 5px;
+}
+
+/* ロゴ
+----------------------------------------------- */
+#site_description {
+ font-size: 90%;
+}
+#logo_area h1 {
+ width: 378px;
+ height: 33px;
+}
+#logo_area h1 span {
+ display: none; /* テキストロゴ非表示 */
+}
+
+
+/* ヘッダーナビ
+----------------------------------------------- */
+div#header_navi {
+ float: right;
+ width: 409px;
+ height: 38px;
+}
+div#header_navi ul li {
+ display: block;
+ float: left;
+}
+div#header_navi ul li.mypage,
+div#header_navi ul li.entry {
+ margin-top: 6px;
+}
+
+
+/* ==============================================
+ フッター
+=============================================== */
+#footer_wrap {
+ margin: 0 auto;
+ width: 980px;
+ height: 80px;
+ background: #fff;
+}
+#footer {
+ margin: auto;
+ padding-top: 10px;
+ border-top: solid 1px #ccc;
+ width: 950px;
+}
+#pagetop {
+ width: 210px;
+ float: right;
+ text-align: right;
+}
+#copyright {
+ width: 740px;
+ float: left;
+ text-align: left;
+ font-size: 97%;
+}
+
+
+/* ==============================================
+ パーツ
+=============================================== */
+/* ボタン
+----------------------------------------------- */
+.btn_area {
+ margin-top: 10px;
+ width: 100%;
+ text-align: center;
+}
+
+.btn_area li {
+ padding-right: 10px;
+ display: inline;
+}
+
+
+/* 完了メッセージ
+----------------------------------------------- */
+div#complete_area {
+ margin-bottom: 20px;
+}
+div#complete_area .message,
+div#undercolumn_entry .message {
+ margin-bottom: 20px;
+ line-height: 150%;
+ font-weight: bold;
+ font-size: 120%;
+}
+div#complete_area .shop_information {
+ margin-top: 40px;
+ padding: 20px 0 0 0;
+ border-top: solid 1px #ccc;
+}
+div#complete_area .shop_information .name {
+ margin-bottom: 10px;
+ font-weight: bold;
+ font-size: 140%;
+}
+
+
+/* Tipsy
+----------------------------------------------- */
+.tipsy { padding: 5px; font-size: 10px; position: absolute; z-index: 100000; }
+ .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
+ .tipsy-inner { border-radius: 3px; -moz-border-radius:3px; -webkit-border-radius:3px; }
+ .tipsy-arrow { position: absolute; background: url('../img/ajax/tipsy.gif') no-repeat top left; width: 9px; height: 5px; }
+ .tipsy-n .tipsy-arrow { top: 0; left: 50%; margin-left: -4px; }
+ .tipsy-nw .tipsy-arrow { top: 0; left: 10px; }
+ .tipsy-ne .tipsy-arrow { top: 0; right: 10px; }
+ .tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -4px; background-position: bottom left; }
+ .tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; background-position: bottom left; }
+ .tipsy-se .tipsy-arrow { bottom: 0; right: 10px; background-position: bottom left; }
+ .tipsy-e .tipsy-arrow { top: 50%; margin-top: -4px; right: 0; width: 5px; height: 9px; background-position: top right; }
+ .tipsy-w .tipsy-arrow { top: 50%; margin-top: -4px; left: 0; width: 5px; height: 9px; }
+
変更: branches/version-2_12-dev/html/user_data/packages/default/css/contents.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/contents.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/contents.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -235,7 +235,7 @@
}
/* メインカラム用 2カラム時*/
-#two_maincolumn_right div.listrightbloc ,
+#two_maincolumn_right div.listrightbloc,
#two_maincolumn_left div.listrightbloc {
float: right;
width: 80%;
@@ -343,7 +343,7 @@
*3カラム時 [three_maincolumn]
----------------------------------------------- */
-#detailarea ,
+#detailarea,
.sub_area {
margin-bottom: 20px;
width: 100%;
@@ -375,12 +375,12 @@
}
/* 2カラム用 */
-#two_maincolumn_left div#detailphotobloc ,
+#two_maincolumn_left div#detailphotobloc,
#two_maincolumn_right div#detailphotobloc {
float: left;
width: 37%;
}
-#two_maincolumn_left #detailrightbloc ,
+#two_maincolumn_left #detailrightbloc,
#two_maincolumn_right #detailrightbloc {
float: right;
width: 63%;
@@ -395,7 +395,7 @@
#two_maincolumn_right p.subtext {
margin-bottom: 20px;
}
-#two_maincolumn_left div.subphotoimg ,
+#two_maincolumn_left div.subphotoimg,
#two_maincolumn_right div.subphotoimg {
float: right;
width: 25%;
変更: branches/version-2_12-dev/html/user_data/packages/default/css/popup.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/popup.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/popup.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,110 +1,110 @@
- ＠ charset "utf-8";
-
-/************************************************
- ポップアップウィンドウ
-************************************************ */
-/* 共通
------------------------------------------------ */
-div#windowcolumn {
- border-top: solid 3px #f90;
- width: 560px;
- height: 100%;
- margin: 15px 15px 0 15px;
- background: #fff;
-}
-
-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;
- font-size: 170%;
-}
-
-div#window_area {
- margin: 15px auto 0 auto;
- padding-bottom: 20px;
- width: 540px;
- min-height:300px;
- height: auto !important;
-}
-
-div#window_area p.information {
- margin-bottom: 20px;
-}
-
-div#window_area .message {
- margin-bottom: 20px; color: #f60;
- line-height: 150%;
- font-weight: bold;
- font-size: 140%;
-}
-div#window_area table {
- width: 540px;
-}
-
-/* お客様の声の書き込み、新しいお届け先の追加・変更
------------------------------------------------ */
-div#window_area #forgot {
- margin: 0 auto;
- padding: 20px;
- width: 440px;
- border: 1px solid #ccc;
- text-align: left;
-}
-div#window_area #forgot .mailaddres {
- margin-bottom: 10px;
-}
-
-div#window_area #forgot p {
- text-align: center;
-}
-
-
-/* 商品詳細拡大写真、カート拡大写真
------------------------------------------------ */
-div#bigimage,
-div#cartimage {
- margin-top: 15px;
- background-color: #fff;
- text-align: center;
-}
-
-div#bigimage img,
-div#cartimage img {
- padding: 10px;
- background-color: #fff;
-}
-
-/* 郵便番号検索
------------------------------------------------ */
-div#zipsearchcolumn {
- margin: 15px auto 0 auto;
- 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;
-}
-
-div#zipsearch_area {
- margin: 15px auto 0 auto;
- width: 460px;
-}
-
-div#zipsearchcolumn .btn {
- margin: 15px 0 30px 0;
- text-align: center;
-}
-
-div#zipsearch_area #completebox p{
- padding: 60px 5px;
- text-align: center;
-}
-
+ ＠ charset "utf-8";
+
+/************************************************
+ ポップアップウィンドウ
+************************************************ */
+/* 共通
+----------------------------------------------- */
+div#windowcolumn {
+ border-top: solid 3px #f90;
+ width: 560px;
+ height: 100%;
+ margin: 15px 15px 0 15px;
+ background: #fff;
+}
+
+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;
+ font-size: 170%;
+}
+
+div#window_area {
+ margin: 15px auto 0 auto;
+ padding-bottom: 20px;
+ width: 540px;
+ min-height:300px;
+ height: auto !important;
+}
+
+div#window_area p.information {
+ margin-bottom: 20px;
+}
+
+div#window_area .message {
+ margin-bottom: 20px; color: #f60;
+ line-height: 150%;
+ font-weight: bold;
+ font-size: 140%;
+}
+div#window_area table {
+ width: 540px;
+}
+
+/* お客様の声の書き込み、新しいお届け先の追加・変更
+----------------------------------------------- */
+div#window_area #forgot {
+ margin: 0 auto;
+ padding: 20px;
+ width: 440px;
+ border: 1px solid #ccc;
+ text-align: left;
+}
+div#window_area #forgot .mailaddres {
+ margin-bottom: 10px;
+}
+
+div#window_area #forgot p {
+ text-align: center;
+}
+
+
+/* 商品詳細拡大写真、カート拡大写真
+----------------------------------------------- */
+div#bigimage,
+div#cartimage {
+ margin-top: 15px;
+ background-color: #fff;
+ text-align: center;
+}
+
+div#bigimage img,
+div#cartimage img {
+ padding: 10px;
+ background-color: #fff;
+}
+
+/* 郵便番号検索
+----------------------------------------------- */
+div#zipsearchcolumn {
+ margin: 15px auto 0 auto;
+ 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;
+}
+
+div#zipsearch_area {
+ margin: 15px auto 0 auto;
+ width: 460px;
+}
+
+div#zipsearchcolumn .btn {
+ margin: 15px 0 30px 0;
+ text-align: center;
+}
+
+div#zipsearch_area #completebox p{
+ padding: 60px 5px;
+ text-align: center;
+}
+
変更: branches/version-2_12-dev/html/user_data/packages/default/css/print.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/print.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/print.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,11 +1,11 @@
- ＠ charset "utf-8";
-
-/************************************************
- 印刷用
-************************************************ */
-
- ＠ media print {
- body {
- zoom: 75%;
- }
-}
+ ＠ charset "utf-8";
+
+/************************************************
+ 印刷用
+************************************************ */
+
+ ＠ media print {
+ body {
+ zoom: 75%;
+ }
+}
変更: branches/version-2_12-dev/html/user_data/packages/default/css/reset.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/reset.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/reset.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,38 +1,38 @@
- ＠ charset "utf-8";
-
-/************************************************
- ブラウザリセット
-************************************************ */
-html, body, div, span, applet, object, iframe, h1, h2, h3,
-h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address,
-big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend, table, caption, tbody, tfoot,
-thead, tr, th, td{
- margin: 0;
- padding: 0;
- border: 0;
-}
-
-table, caption, th, td{
- margin: 0;
- padding: 0;
- border: 0;
- border-collapse : collapse ;
- border-spacing: 0px;
- empty-cells: show;
- text-align: left;
- font-weight: normal;
-}
-
-a img, iframe{
- border:none;
-}
-ol,ul,li{
- list-style:none;
-}
-
-input, textarea, select, button{
- font-size:100%;
- font-family:inherit;
-}
+ ＠ charset "utf-8";
+
+/************************************************
+ ブラウザリセット
+************************************************ */
+html, body, div, span, applet, object, iframe, h1, h2, h3,
+h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address,
+big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend, table, caption, tbody, tfoot,
+thead, tr, th, td{
+ margin: 0;
+ padding: 0;
+ border: 0;
+}
+
+table, caption, th, td{
+ margin: 0;
+ padding: 0;
+ border: 0;
+ border-collapse : collapse ;
+ border-spacing: 0px;
+ empty-cells: show;
+ text-align: left;
+ font-weight: normal;
+}
+
+a img, iframe{
+ border:none;
+}
+ol,ul,li{
+ list-style:none;
+}
+
+input, textarea, select, button{
+ font-size:100%;
+ font-family:inherit;
+}
変更: branches/version-2_12-dev/html/user_data/packages/default/css/table.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/default/css/table.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/default/css/table.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,73 +1,73 @@
- ＠ charset "utf-8";
-
-/************************************************
- tables
-************************************************ */
-/* デフォルトテーブル
------------------------------------------------ */
-table {
- 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 {
- padding: 8px;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- color: #333;
- background-color: #f0f0f0;
- font-weight: normal;
-}
-table td {
- padding: 8px;
- border-right: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
-}
-
-/* 見出し
------------------------------------------------ */
-div#undercolumn_shopping table th[scope=col] {
- text-align: center;
-}
-div#undercolumn_shopping table.delivname th {
- width: 155px;
-}
-
-/* MYページ */
-div#mycontents_area table th {
- text-align: left;
-}
-div#mycontents_area table th.alignR {
- text-align: right;
-}
-div#mycontents_area table th.alignL {
- text-align: left;
-}
-div#mycontents_area table th.alignC {
- text-align: center;
-}
-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;
-}
-
+ ＠ charset "utf-8";
+
+/************************************************
+ tables
+************************************************ */
+/* デフォルトテーブル
+----------------------------------------------- */
+table {
+ 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 {
+ padding: 8px;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ color: #333;
+ background-color: #f0f0f0;
+ font-weight: normal;
+}
+table td {
+ padding: 8px;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+}
+
+/* 見出し
+----------------------------------------------- */
+div#undercolumn_shopping table th[scope=col] {
+ text-align: center;
+}
+div#undercolumn_shopping table.delivname th {
+ width: 155px;
+}
+
+/* MYページ */
+div#mycontents_area table th {
+ text-align: left;
+}
+div#mycontents_area table th.alignR {
+ text-align: right;
+}
+div#mycontents_area table th.alignL {
+ text-align: left;
+}
+div#mycontents_area table th.alignC {
+ text-align: center;
+}
+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;
+}
+
変更: branches/version-2_12-dev/html/user_data/packages/sphone/css/jqm.css
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/css/jqm.css 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/css/jqm.css 2012-03-07 17:50:27 UTC (rev 21612)
@@ -16,8 +16,8 @@
background: #bbb;
color: #fff;
text-shadow: 0 1px 0 rgba(0,0,0,0.3);
- background-image: -moz-linear-gradient(top,
- #6D7481,
+ background-image: -moz-linear-gradient(top,
+ #6D7481,
#494e57);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0,#6D7481),
@@ -81,8 +81,8 @@
cursor: pointer;
text-shadow: 0 1px 1px #fff;
text-decoration: none;
- background-image: -moz-linear-gradient(top,
- #ededed,
+ background-image: -moz-linear-gradient(top,
+ #ededed,
#dadada);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #ededed),
@@ -98,8 +98,8 @@
font-weight: bold;
color: #111;
text-shadow: 0 1px 1px #ffffff;
- background-image: -moz-linear-gradient(top,
- #eeeeee,
+ background-image: -moz-linear-gradient(top,
+ #eeeeee,
#fdfdfd);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #eeeeee),
@@ -112,8 +112,8 @@
font-weight: bold;
color: #111;
text-shadow: none;
- background-image: -moz-linear-gradient(top,
- #cccccc,
+ background-image: -moz-linear-gradient(top,
+ #cccccc,
#eeeeee);
background-image: -webkit-gradient(linear,left top,left bottom,
color-stop(0, #cccccc),
変更: branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js
===================================================================
--- branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js 2012-03-07 17:42:18 UTC (rev 21611)
+++ branches/version-2_12-dev/html/user_data/packages/sphone/js/config.js 2012-03-07 17:50:27 UTC (rev 21612)
@@ -1,5 +1,5 @@
-$(document).bind("mobileinit", function(){
- $.mobile.ajaxEnabled = false;
- $.mobile.pushStateEnabled = false;
- $.mobile.page.prototype.options.keepNative = "select, input, textarea.bar";
+$(document).bind("mobileinit", function(){
+ $.mobile.ajaxEnabled = false;
+ $.mobile.pushStateEnabled = false;
+ $.mobile.page.prototype.options.keepNative = "select, input, textarea.bar";
});
Svn-src-all メーリングリストの案内