쇼핑몰: merge 충돌 수정

This commit is contained in:
whitedot
2013-04-29 17:21:53 +09:00
83 changed files with 672 additions and 581 deletions

View File

@ -184,7 +184,7 @@ textarea {width:90%}
select {border:1px solid #ced9de}
button {padding:3px;border:1px solid #ced9de;background:#f6f9fa;cursor:pointer}
fieldset {margin-bottom:20px}
legend {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;border:0;overflow:hidden}
legend {position:absolute;font-size:0;line-height:0;border:0;overflow:hidden}
fieldset span {display:block;margin-bottom:10px}
fieldset p {color:#4c5f67}
fieldset button, .fieldset_submit {padding:0 15px;height:23px;border:0;background:#617d46;color:#fff;font-size:1em;line-height:2.1em;vertical-align:middle;cursor:pointer}
@ -514,4 +514,4 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#anc_pricecompare_engine dt a {font-weight:bold}
#anc_pricecompare_engine dd {margin:0 0 30px}
#anc_pricecompare_engine li {margin:5px 0}
#anc_pricecompare_engine li {margin:5px 0}

View File

@ -28,7 +28,7 @@ a:active {color:#000;text-decoration:underline}
.msg_sound_only,
.sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important}
/* 본문 바로가기 */
#to_content a {z-index:100000;position:absolute;top:0;left:0;font-size:0;line-height:0;overflow:hidden}
#to_content a {z-index:100000;position:absolute;top:0;left:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
#to_content a:focus,
#to_content a:active {width:100%;height:75px;background:#21272e;color:#fff;font-size:2em;font-weight:bold;text-align:center;text-decoration:none;line-height:3.3em}