Merge branch 'master' of github.com:gnuboard/yc4s

This commit is contained in:
chicpro
2013-05-28 18:22:29 +09:00
2 changed files with 2 additions and 2 deletions

View File

@ -492,7 +492,7 @@ input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;col
#sit_title {margin:0 0 5px;font-size:1.3em} #sit_title {margin:0 0 5px;font-size:1.3em}
#sit_desc {margin:0 0 5px;padding:0;color:#999} #sit_desc {margin:0 0 5px;padding:0;color:#999}
#sit_opt_info {/* sound_only 처리 필요 */} #sit_opt_info {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sit_star_sns {position:absolute;top:15px;right:15px;color:#b8afa2;font-size:0.95em;letter-spacing:-0.1em} #sit_star_sns {position:absolute;top:15px;right:15px;color:#b8afa2;font-size:0.95em;letter-spacing:-0.1em}
#sit_star_sns span {display:inline-block;margin:0 5px 0 0;color:#666;letter-spacing:0} #sit_star_sns span {display:inline-block;margin:0 5px 0 0;color:#666;letter-spacing:0}

View File

@ -680,7 +680,7 @@ function get_item_supply($it_id, $subject)
return $str; return $str;
} }
function print_item_options($it_id, $uq_id) function print_item_options($it_id, $uq_id, $ul_id)
{ {
global $g4; global $g4;