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

This commit is contained in:
chicpro
2013-01-17 15:31:44 +09:00
2 changed files with 2 additions and 6 deletions

View File

@ -41,7 +41,6 @@ legend {margin-left:0;padding:7px 10px;border:1px solid #dedace;background:#333;
fieldset textarea {padding:3px;border:1px solid #ddd;background:#fff;vertical-align:middle}
.fieldset_input:focus,
fieldset textarea:focus {padding:4px;border:0;background:#494949;color:#fff}
fieldset select {padding:2px 2px 3px;border:1px solid #ddd;background:#f9f9f5;vertical-align:middle}
fieldset p {margin:0}
fieldset .span_highlight {color:#ff4679}
fieldset button,
@ -232,14 +231,12 @@ a {color:#000;text-decoration:none}
.frm_tbl th {padding-left:10px;width:160px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;text-align:left}
.frm_tbl td {padding:7px 10px}
.frm_tbl textarea,
.frm_input,
.frm_tbl select {border:1px solid #d7d7d7;background:#f6f9fa;vertical-align:middle}
.frm_input {border:1px solid #d7d7d7;background:#f6f9fa;vertical-align:middle}
.frm_tbl textarea,
.frm_input {padding:2px;background:#f5f5f2}
.frm_tbl textarea:focus,
.frm_input:focus {padding:3px;border:0;background:#494949;color:#fff}
.frm_tbl textarea {width:90%}
.frm_tbl select {padding:2px}
.frm_address {display:block;margin-top:5px}
.frm_file {display:block;margin-bottom:5px}
.frm_info {display:block;padding:5px 0 0;color:#595959;line-height:1.3em}
@ -310,7 +307,6 @@ a {color:#000;text-decoration:none}
.bo_fx ul {margin:0;padding:0;list-style:none}
#bo_cate {float:left;margin:0 10px 10px 0}
#bo_cate form {display:inline-block}
#bo_cate select {margin-right:5px;padding:4px;border:1px solid #ddd;background:#f9f9f5;vertical-align:middle}
.btn_bo_user {float:right;margin:0;padding:0;list-style:none}
.btn_bo_user li {float:left;margin-left:5px}
.btn_bo_adm {float:left}

View File

@ -41,7 +41,7 @@ if ($is_notice || $is_html || $is_secret || $is_mail) {
}
if ($is_mail) {
$option .= PHP_EOL.'<input type="checkbox" name="mail" value="mail" '.$recv_email_checked.'>'.PHP_EOL.'<label for="mail">답변메일받기</label>';
$option .= PHP_EOL.'<input type="checkbox" id="mail" name="mail" value="mail" '.$recv_email_checked.'>'.PHP_EOL.'<label for="mail">답변메일받기</label>';
}
}