Changeset 20290 for branches/version-2_5-dev/html
- Timestamp:
- 2011/02/21 15:41:52 (15 years ago)
- Location:
- branches/version-2_5-dev/html
- Files:
-
- 121 added
- 53 deleted
- 6 edited
-
install/css/admin_contents.css (modified) (8 diffs)
-
install/templates/install_frame.tpl (modified) (1 diff)
-
user_data/packages/admin/css/admin_contents.css (modified) (7 diffs)
-
user_data/packages/admin/css/thickbox.css (added)
-
user_data/packages/default/css/bloc.css (added)
-
user_data/packages/default/css/common.css (added)
-
user_data/packages/default/css/contents.css (added)
-
user_data/packages/default/css/header_bloc.css (added)
-
user_data/packages/default/css/import.css (modified) (1 diff)
-
user_data/packages/default/css/index.css (deleted)
-
user_data/packages/default/css/main.css (deleted)
-
user_data/packages/default/css/mypage.css (deleted)
-
user_data/packages/default/css/popup.css (added)
-
user_data/packages/default/css/popup_import.css (added)
-
user_data/packages/default/css/print.css (added)
-
user_data/packages/default/css/products.css (deleted)
-
user_data/packages/default/css/set.css (added)
-
user_data/packages/default/css/table.css (added)
-
user_data/packages/default/css/thickbox.css (deleted)
-
user_data/packages/default/css/under.css (deleted)
-
user_data/packages/default/css/under02.css (deleted)
-
user_data/packages/default/css/window.css (deleted)
-
user_data/packages/default/img/background/bg_arrow_01.gif (deleted)
-
user_data/packages/default/img/background/bg_arrow_02.gif (deleted)
-
user_data/packages/default/img/background/bg_arrow_03.gif (deleted)
-
user_data/packages/default/img/background/bg_arrow_title_01.gif (deleted)
-
user_data/packages/default/img/background/bg_arrow_title_02.gif (deleted)
-
user_data/packages/default/img/background/bg_btn.gif (deleted)
-
user_data/packages/default/img/background/bg_btn_bloc_02.jpg (added)
-
user_data/packages/default/img/background/bg_btn_list.jpg (added)
-
user_data/packages/default/img/background/bg_gradation_h50.gif (deleted)
-
user_data/packages/default/img/background/bg_tit_bloc_01.jpg (added)
-
user_data/packages/default/img/background/bg_tit_sub_01.jpg (added)
-
user_data/packages/default/img/background/line_01.gif (added)
-
user_data/packages/default/img/background/line_146.gif (deleted)
-
user_data/packages/default/img/background/line_280.gif (deleted)
-
user_data/packages/default/img/background/line_400.gif (deleted)
-
user_data/packages/default/img/background/line_402.gif (deleted)
-
user_data/packages/default/img/background/line_578.gif (deleted)
-
user_data/packages/default/img/background/line_580.gif (deleted)
-
user_data/packages/default/img/background/line_dot_01.gif (added)
-
user_data/packages/default/img/background/line_dot_02.gif (added)
-
user_data/packages/default/img/banner (added)
-
user_data/packages/default/img/banner/bne_side_asp.jpg (added)
-
user_data/packages/default/img/banner/bne_side_payment_01.jpg (added)
-
user_data/packages/default/img/banner/bne_side_payment_02.jpg (added)
-
user_data/packages/default/img/banner/bnr_side_payment_01.jpg (added)
-
user_data/packages/default/img/banner/bnr_side_payment_01_on.jpg (added)
-
user_data/packages/default/img/banner/bnr_top_main.jpg (added)
-
user_data/packages/default/img/banner/bnr_top_main_on.jpg (added)
-
user_data/packages/default/img/banner/bnr_top_sub_01.jpg (added)
-
user_data/packages/default/img/banner/bnr_top_sub_01_on.jpg (added)
-
user_data/packages/default/img/banner/bnr_top_sub_02.jpg (added)
-
user_data/packages/default/img/banner/bnr_top_sub_02_on.jpg (added)
-
user_data/packages/default/img/button/btn_add_address.jpg (added)
-
user_data/packages/default/img/button/btn_add_address_complete.jpg (added)
-
user_data/packages/default/img/button/btn_add_address_complete_on.jpg (added)
-
user_data/packages/default/img/button/btn_add_address_on.jpg (added)
-
user_data/packages/default/img/button/btn_add_favorite.jpg (added)
-
user_data/packages/default/img/button/btn_add_favorite_on.jpg (added)
-
user_data/packages/default/img/button/btn_address_input.jpg (added)
-
user_data/packages/default/img/button/btn_address_select.jpg (added)
-
user_data/packages/default/img/button/btn_address_select_on.jpg (added)
-
user_data/packages/default/img/button/btn_back.jpg (added)
-
user_data/packages/default/img/button/btn_back_on.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_cart.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_cart_on.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_login.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_login_on.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_logout.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_logout_on.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_search.jpg (added)
-
user_data/packages/default/img/button/btn_bloc_search_on.jpg (added)
-
user_data/packages/default/img/button/btn_block_cartin.gif (deleted)
-
user_data/packages/default/img/button/btn_block_cartin_on.gif (deleted)
-
user_data/packages/default/img/button/btn_block_login.gif (deleted)
-
user_data/packages/default/img/button/btn_block_login_on.gif (deleted)
-
user_data/packages/default/img/button/btn_block_logout.gif (deleted)
-
user_data/packages/default/img/button/btn_block_logout_on.gif (deleted)
-
user_data/packages/default/img/button/btn_block_search.gif (deleted)
-
user_data/packages/default/img/button/btn_block_search_on.gif (deleted)
-
user_data/packages/default/img/button/btn_buystep.jpg (added)
-
user_data/packages/default/img/button/btn_buystep_on.jpg (added)
-
user_data/packages/default/img/button/btn_cartin.jpg (added)
-
user_data/packages/default/img/button/btn_cartin_on.jpg (added)
-
user_data/packages/default/img/button/btn_close.jpg (added)
-
user_data/packages/default/img/button/btn_close_on.jpg (added)
-
user_data/packages/default/img/button/btn_comment.gif (deleted)
-
user_data/packages/default/img/button/btn_comment.jpg (added)
-
user_data/packages/default/img/button/btn_comment_on.gif (deleted)
-
user_data/packages/default/img/button/btn_comment_on.jpg (added)
-
user_data/packages/default/img/button/btn_complete.jpg (added)
-
user_data/packages/default/img/button/btn_complete_on.jpg (added)
-
user_data/packages/default/img/button/btn_confirm.jpg (added)
-
user_data/packages/default/img/button/btn_confirm_on.jpg (added)
-
user_data/packages/default/img/button/btn_detail.jpg (added)
-
user_data/packages/default/img/button/btn_detail_on.jpg (added)
-
user_data/packages/default/img/button/btn_entry.jpg (added)
-
user_data/packages/default/img/button/btn_entry_agree.jpg (added)
-
user_data/packages/default/img/button/btn_entry_agree_on.jpg (added)
-
user_data/packages/default/img/button/btn_entry_cannot.jpg (added)
-
user_data/packages/default/img/button/btn_entry_cannot_on.jpg (added)
-
user_data/packages/default/img/button/btn_entry_on.jpg (added)
-
user_data/packages/default/img/button/btn_expansion.gif (deleted)
-
user_data/packages/default/img/button/btn_expansion_on.gif (deleted)
-
user_data/packages/default/img/button/btn_login.jpg (added)
-
user_data/packages/default/img/button/btn_login_on.jpg (added)
-
user_data/packages/default/img/button/btn_minus.gif (deleted)
-
user_data/packages/default/img/button/btn_minus.jpg (added)
-
user_data/packages/default/img/button/btn_next.jpg (added)
-
user_data/packages/default/img/button/btn_next_on.jpg (added)
-
user_data/packages/default/img/button/btn_order_complete.jpg (added)
-
user_data/packages/default/img/button/btn_order_complete_on.jpg (added)
-
user_data/packages/default/img/button/btn_order_re.jpg (added)
-
user_data/packages/default/img/button/btn_order_re_on.jpg (added)
-
user_data/packages/default/img/button/btn_plus.gif (deleted)
-
user_data/packages/default/img/button/btn_plus.jpg (added)
-
user_data/packages/default/img/button/btn_refuse.jpg (added)
-
user_data/packages/default/img/button/btn_refuse_do.jpg (added)
-
user_data/packages/default/img/button/btn_refuse_do_on.jpg (added)
-
user_data/packages/default/img/button/btn_refuse_not.jpg (added)
-
user_data/packages/default/img/button/btn_refuse_not_on.jpg (added)
-
user_data/packages/default/img/button/btn_refuse_on.jpg (added)
-
user_data/packages/default/img/button/btn_rss.jpg (added)
-
user_data/packages/default/img/button/btn_several_address.jpg (added)
-
user_data/packages/default/img/button/btn_several_address_on.jpg (added)
-
user_data/packages/default/img/button/btn_toppage.jpg (added)
-
user_data/packages/default/img/button/btn_toppage_on.jpg (added)
-
user_data/packages/default/img/common/bg_header.gif (added)
-
user_data/packages/default/img/common/bg_header_info.gif (deleted)
-
user_data/packages/default/img/common/btn_header_cart.jpg (added)
-
user_data/packages/default/img/common/btn_header_cart_on.jpg (added)
-
user_data/packages/default/img/common/btn_header_cartin.gif (deleted)
-
user_data/packages/default/img/common/btn_header_cartin_on.gif (deleted)
-
user_data/packages/default/img/common/btn_header_entry.gif (deleted)
-
user_data/packages/default/img/common/btn_header_entry.jpg (added)
-
user_data/packages/default/img/common/btn_header_entry_on.gif (deleted)
-
user_data/packages/default/img/common/btn_header_entry_on.jpg (added)
-
user_data/packages/default/img/common/btn_header_login.jpg (added)
-
user_data/packages/default/img/common/btn_header_login_on.jpg (added)
-
user_data/packages/default/img/common/btn_header_logo.gif (deleted)
-
user_data/packages/default/img/common/btn_header_mypage.gif (deleted)
-
user_data/packages/default/img/common/btn_header_mypage.jpg (added)
-
user_data/packages/default/img/common/btn_header_mypage_on.gif (deleted)
-
user_data/packages/default/img/common/btn_header_mypage_on.jpg (added)
-
user_data/packages/default/img/common/btn_pagetop.gif (deleted)
-
user_data/packages/default/img/common/ico_arrow_login.gif (added)
-
user_data/packages/default/img/common/logo.jpg (added)
-
user_data/packages/default/img/icon/ico_arrow_01.gif (added)
-
user_data/packages/default/img/icon/ico_arrow_01_on.gif (added)
-
user_data/packages/default/img/icon/ico_arrow_02.gif (added)
-
user_data/packages/default/img/icon/ico_arrow_03.gif (added)
-
user_data/packages/default/img/icon/ico_arrow_04.gif (added)
-
user_data/packages/default/img/icon/ico_arrow_05.gif (added)
-
user_data/packages/default/img/icon/ico_block_cart.gif (deleted)
-
user_data/packages/default/img/icon/ico_block_category.gif (deleted)
-
user_data/packages/default/img/icon/ico_block_login.gif (deleted)
-
user_data/packages/default/img/icon/ico_block_news.gif (deleted)
-
user_data/packages/default/img/icon/ico_block_recommend.gif (deleted)
-
user_data/packages/default/img/icon/ico_block_search_products.gif (deleted)
-
user_data/packages/default/img/icon/ico_level.gif (added)
-
user_data/packages/default/img/icon/ico_mail.gif (deleted)
-
user_data/packages/default/img/icon/ico_news.gif (deleted)
-
user_data/packages/default/img/icon/ico_password.gif (deleted)
-
user_data/packages/default/img/icon/ico_point.gif (added)
-
user_data/packages/default/img/icon/ico_price.gif (added)
-
user_data/packages/default/img/picture/img_flow_01.jpg (added)
-
user_data/packages/default/img/picture/img_flow_02.jpg (added)
-
user_data/packages/default/img/picture/img_flow_03.jpg (added)
-
user_data/packages/default/img/picture/img_flow_04.jpg (added)
-
user_data/packages/default/img/title/logo.jpg (added)
-
user_data/packages/default/img/title/tit_bloc_calender.gif (added)
-
user_data/packages/default/img/title/tit_bloc_cart.gif (added)
-
user_data/packages/default/img/title/tit_bloc_category.gif (added)
-
user_data/packages/default/img/title/tit_bloc_login.gif (added)
-
user_data/packages/default/img/title/tit_bloc_news.jpg (added)
-
user_data/packages/default/img/title/tit_bloc_recommend.jpg (added)
-
user_data/packages/default/img/title/tit_bloc_search.gif (added)
-
user_data/packages/default/img/title/tit_product_recommend.jpg (modified) (previous)
-
user_data/packages/default/img/title/tit_product_voice.jpg (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/html/install/css/admin_contents.css
r20116 r20290 249 249 /* インストールメッセージ 250 250 ----------------------------------------------- */ 251 #outside-admin { 251 252 /*以下エラーページと共通■触るべからず*/ 253 254 #outside { 252 255 margin:0 auto; 253 256 padding:0; … … 256 259 } 257 260 258 # install-wrap {261 #out-wrap { 259 262 margin:100px auto; 260 263 width: 560px; 261 264 } 262 265 263 # install-area {266 #out-area { 264 267 width:560px; 265 268 text-align: left; 266 269 267 270 } 268 #install-area .contents { 269 width:560px; 270 background: url('../img/login_back_contents.gif') top left repeat-y; 271 text-align: left; 272 } 273 274 #install-wrap .logo { 271 272 #out-wrap .logo { 275 273 padding-bottom: 5px; 276 274 float: right; 277 275 } 278 276 279 # install-area{277 #out-area{ 280 278 width: 558px; 281 279 } 282 # install-area .install-top {280 #out-area .out-top { 283 281 clear: both; 284 282 width: 560px; … … 287 285 } 288 286 289 #install-area .btn-area-top { 287 /*以上エラーページと共通■触るべからず*/ 288 289 #out-area .contents { 290 width:560px; 291 background: url('../img/login_back_contents.gif') top left repeat-y; 292 text-align: left; 293 } 294 295 #out-area .btn-area-top { 290 296 width: 560px; 291 297 height: 10px; 292 298 background: url('../img/login_back_btn_top.jpg') left no-repeat; 293 299 } 294 # install-area .btn-area ul {300 #out-area .btn-area ul { 295 301 padding: 20px 0 10px 0; 296 302 width: 560px; … … 298 304 background: url('../img/login_back_btn_contents.jpg') top left no-repeat #f4f5f5; 299 305 } 300 # install-area .btn-area-bottom {306 #out-area .btn-area-bottom { 301 307 width: 560px; 302 308 height: 10px; 303 309 background: url('../img/login_back_btn_bottom.jpg') bottom left no-repeat #eeeff0; 304 310 } 305 # install-area .contents .block {311 #out-area .contents .block { 306 312 margin: 0 auto; 307 313 width: 520px; 308 314 } 309 # install-area .contents .message {315 #out-area .contents .message { 310 316 margin: 0 auto 0px auto; 311 317 padding: 5px 0; … … 314 320 font-size:100%; 315 321 } 316 # install-area .contents h2 {322 #out-area .contents h2 { 317 323 margin: 0 auto 10px auto; 318 324 padding: 5px 0; … … 323 329 border-bottom: solid 3px #ccc; 324 330 } 325 # install-area .contents .result-info01 {331 #out-area .contents .result-info01 { 326 332 margin: 0 auto 10px auto; 327 333 padding: 20px; … … 332 338 line-height:160%; 333 339 } 334 # install-area .contents .result-info02 {340 #out-area .contents .result-info02 { 335 341 margin: 0 auto; 336 342 padding-bottom: 30px; 337 343 width: 520px; 338 344 } 339 # install-area .contents .result-info02 p {345 #out-area .contents .result-info02 p { 340 346 margin-bottom: 10px; 341 347 } 342 # install-area .contents .result-info02 p.action-message {348 #out-area .contents .result-info02 p.action-message { 343 349 margin: 20px 0 0 0; 344 350 padding-bottom: 10px; … … 350 356 } 351 357 352 # install-area .contents .result-info01 .site-info-list li {358 #out-area .contents .result-info01 .site-info-list li { 353 359 margin-bottom: 5px; 354 360 font-size: 120%; -
branches/version-2_5-dev/html/install/templates/install_frame.tpl
r20116 r20290 39 39 <p>JavaScript を有効にしてご利用下さい。</p> 40 40 </noscript> 41 <div id="outside -admin">42 <div id=" install-wrap">41 <div id="outside"> 42 <div id="out-wrap"> 43 43 <div class="logo"> 44 44 <img src="img/logo_resize.jpg" width="99" height="15" alt="EC-CUBE" /> 45 45 </div> 46 <div id=" install-area">47 <div class=" install-top"></div>46 <div id="out-area"> 47 <div class="out-top"></div> 48 48 <!--{include file=$tpl_mainpage}--> 49 49 </div> -
branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css
r20116 r20290 22 22 font-family: "MS Pゴシック","Hiragino Maru Gothic Pro","ヒラギノ丸ゴ Pro W4",Osaka,sans-serif; 23 23 font-size: 80%; 24 line-height: 1 50%;24 line-height: 120%; 25 25 } 26 26 … … 179 179 } 180 180 181 182 /*おすすめ商品管理*/ 183 184 table#recommend-table { 185 border-collapse: collapse; 186 font-size: 100%; 187 margin: 0 0 50px; 188 width: 100%; 189 } 190 191 div#table-wrap { 192 margin-top: 6px; 193 } 194 195 div#table-wrap div.table-img { 196 float: left; 197 padding-left: 6px; 198 } 199 200 div#table-wrap div.table-detail { 201 float: left; 202 text-align: left; 203 padding-left: 11px; 204 } 205 206 div#table-wrap div.table-detail div.detail-name { 207 margin-bottom: 5px; 208 } 209 210 td.no-border { 211 border: 0; 212 background: #f5f5f5; 213 padding: 20px; 214 } 215 216 td.no-border-w { 217 border: 0; 218 } 219 220 td.AlignLeft { 221 text-align: left; 222 padding-left: 11px; 223 } 181 224 182 225 /*通常ボタン*/ … … 302 345 } 303 346 347 /*商品を選択するボタン(2/18追加)*/ 348 .btn-action-m, a.btn-action-m:link, a.btn-action-m:visited { 349 padding: 3px 10px; 350 border: solid 1px #bcbecb; 351 display: inline-block; 352 color: #444757; 353 background: url('../img/button/white-grad04.png') top repeat-x #eee; 354 background-attachment: scroll; 355 background-clip: border-box; 356 font-weight: normal; 357 font-size: 90%; 358 text-decoration: none; 359 white-space: nowrap; 360 cursor: pointer; 361 362 /* CSS3 radius */ 363 border-radius: 5px; 364 /* Safari, Chrome radius */ 365 -webkit-box-sizing: content-box; 366 -webkit-border-radius: 5px; 367 /* Firefox radius */ 368 -moz-border-radius: 5px; 369 /* Safari, Chrome radius */ 370 -webkit-box-sizing: content-box; 371 -webkit-border-radius: 5px; 372 /* Firefox radius */ 373 -moz-border-radius: 5px; 374 } 375 304 376 305 377 /*戻るボタン*/ … … 793 865 /* エラーメッセージ 794 866 ----------------------------------------------- */ 795 #error-wrap { 796 margin: 150px auto 0; 797 width: 100%; 798 text-align: center; 799 } 800 #error-wrap #error .logo { 867 868 869 /*以下インストールページと共通■触るべからず*/ 870 871 #out-wrap { 872 margin: 100px auto; 873 width: 560px; 874 } 875 876 #out-wrap .logo { 801 877 padding-bottom: 5px; 802 878 float: right; 803 879 } 804 880 805 # error{881 #out { 806 882 margin: 0 auto; 807 883 width: 560px; 808 884 } 809 885 810 #error . error-top {886 #error .out-top { 811 887 clear: both; 812 888 width: 560px; … … 814 890 background: url('../img/contents/login_back_top.jpg') bottom left no-repeat; 815 891 } 892 893 /*以上インストールページと共通■触るべからず*/ 894 816 895 817 896 #error .contents { … … 1073 1152 .design-layout #FooterBottomNavi, .design-layout #HeaderInternalNavi, .design-layout #Unused { 1074 1153 padding-bottom: 20px; 1075 height: 10px; /* IE6応急処置 */1154 height: 10px; /*IE6応急処置 */ 1076 1155 } 1077 1156 … … 1364 1443 } 1365 1444 1445 1446 /*以下インストールページと共通■触るべからず*/ 1447 1448 #outside { 1449 margin:0 auto; 1450 padding:0; 1451 text-align:center; 1452 width:100%; 1453 } 1454 1455 /*以上インストールページと共通■触るべからず*/ -
branches/version-2_5-dev/html/user_data/packages/default/css/import.css
r20116 r20290 1 1 @charset "utf-8"; 2 2 3 @import url("./main.css"); 4 @import url("./index.css"); 5 @import url("./products.css"); 6 @import url("./under.css"); 7 @import url("./under02.css"); 8 @import url("./mypage.css"); 9 @import url("./window.css"); 3 @import url("./set.css"); 4 @import url("./common.css"); 5 @import url("./contents.css"); 6 @import url("./table.css"); 7 @import url("./bloc.css"); 8 @import url("./header_bloc.css"); 9 @import url("./popup_import.css"); 10 @import url("./popup.css"); 11 12 @import url("./print.css"); 13 /* @import url("./pluginbloc.css"); */
Note: See TracChangeset
for help on using the changeset viewer.
