g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-05-22 17:35:08 +09:00
4 changed files with 38 additions and 43 deletions

View File

@ -335,7 +335,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 {position:absolute;font-size:0;line-height:0;border:0;overflow:hidden}
legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;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}