diff --git a/2018/app/application.rb b/2018/app/application.rb index bc871c9..c7c05bf 100755 --- a/2018/app/application.rb +++ b/2018/app/application.rb @@ -63,8 +63,8 @@ end sendmail_test = "| Mail -s 'Rubyてらこった テストメール' " + $email_c m = cat_message("../send_test.txt") - ENV["QMAILUSER"]="terakotta" - ENV["QMAILHOST"]="e.koeki-u.ac.jp" + ENV["QMAILUSER"]="c116092" + ENV["QMAILHOST"]="h.koeki-u.ac.jp" t=Thread.new do sendmail(sendmail_test, m) end @@ -165,13 +165,13 @@ end $ref_num = sei_num + school_num + grade_num + class_num + number_num + sch - host = "terakotta@e.koeki-u.ac.jp" + host = "c116092@h.koeki-u.ac.jp" sendmail_app = "| Mail -s 'Rubyてらこった お申し込み完了メール' " + $email_c sendmail_host = "| Mail -s 'Rubyてらこった 申込みメール' " + host m1 = cat_message("../send_app.txt") m2 = cat_message("../send_host.txt") - ENV["QMAILUSER"]="terakotta" - ENV["QMAILHOST"]="e.koeki-u.ac.jp" + ENV["QMAILUSER"]="c116092" + ENV["QMAILHOST"]="h.koeki-u.ac.jp" t=Thread.new do sendmail(sendmail_app, m1) sendmail(sendmail_host, m2) @@ -184,6 +184,6 @@ cat "../error.html" end - rescue +rescue cat "../error.html" end diff --git a/2018/css/main.css b/2018/css/main.css index 0bf7404..34eb75f 100644 --- a/2018/css/main.css +++ b/2018/css/main.css @@ -19,87 +19,98 @@ margin: 0 auto; } +@media only screen and (max-width:999px) { + #page { + width: auto; + margin: 0 auto; + } +} + +/* header */ + /* header */ header{ - margin:0; - padding:0; - width:100%; - height:286px; - background:#fff; - background-position:right; - background-repeat:no-repeat; - font-weight:bold; - font-size:18px; - font-family:'Yu Mincho', meiryo ,sans-serif; - text-align:center; - color:#40361f; + text-align: center; + margin: 0 auto; +} + +header img{ + width: 100%; } /* menu */ -#menu{ + nav{ width:200px; font-family: 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif; font-size:small; float:right; -} + } + + @media only screen and (max-width:999px) { + nav{ + width:20%; + } + } -#menu ul{ + nav ul{ background:#fff; list-style-type:none; margin:0; padding:10px; -} + } -#menu li{ + nav li{ width:100%; line-height:2em; border-bottom: 1px solid #ebe4da; -} + } -#menu a{ + nav a{ display:block; text-decoration:none; color:#463a1c; padding:13px 5px 13px; position:relative; -} + } -#menu a:hover{ + nav a:hover{ background-color: rgba(255,213,236,0.5); -} + } -#menu a:active{ + nav a:active{ background-color: #FF9999; -} + } -#menu a:after{ + nav a:after{ font-family: 'Mv Boli', cursive; font-size:0.8em; color: #cbbe9c; position:absolute; bottom:0; left:5px; -} -#menu li.now{ + } + + nav li.now{ background-color: rgba(255,213,236,0.5); -} -#menu li:last-child{ + } + + nav li:last-child{ border-bottom:none; -} + } /* main contents */ -#main_contents{ +.main_contents{ background-color:#fff; margin:0; + padding:2ex; width:750px; - min-height:700px; float:left; } -#main:after{ - content:""; - clear:both; - display:block; +@media only screen and (max-width:999px) { + .main_contents{ + width:75%; + } } h2{ @@ -128,7 +139,7 @@ float:left; } -div.box-text-left{ +.box-text-left{ background: #fff; border:dotted 5px #494949; border-radius: 3em 3em; @@ -138,7 +149,7 @@ width:380px; } -div.box-text-right{ +.box-text-right{ background: #fff; border:dotted 5px #494949; border-radius: 3em 3em; @@ -148,7 +159,7 @@ width:380px; } -div.box-text-right-border-none{ +.box-text-right-border-none{ background: #fff; margin:1ex; padding: 2.2ex 1ex; @@ -156,12 +167,12 @@ width:400px; } -div.text-left{ +.text-left{ float:left; width:700px; } -div.text-right{ +.text-right{ float:right; width:700px; } @@ -198,7 +209,7 @@ border-top: #b3b3b3 4px solid; } -th:not(th.menu) { +th { border-bottom: #e3e3e3 1px solid; border-left: #e3e3e3 1px solid; text-align: left; @@ -212,7 +223,7 @@ border-top: #be1309 4px solid; } -td:not(td.menu) { +td { border-bottom: #e3e3e3 1px solid; border-right: #e3e3e3 1px solid; text-align: left; @@ -249,15 +260,15 @@ display: none; } -input[type="checkbox"].on-off + div{ +input[type="checkbox"].on-off + section{ display: none; } -input[type="checkbox"].on-off:checked + div{ +input[type="checkbox"].on-off:checked + section{ display: block; } -div.qa{ +section.qa{ padding:1ex; } @@ -267,8 +278,8 @@ header{ display: none; } - - #menu{ + + nav{ display: none; } @@ -276,14 +287,14 @@ display: none; } - #main_contents{ + .main_contents{ background-color:#fff; margin:0; padding:5px; width:1000px; float:left; } - div.qa{ + .qa{ padding:0; } @@ -296,12 +307,12 @@ border: 1px solid #fff; cursor: pointer; } - - input[type="checkbox"].on-off + div{ + + input[type="checkbox"].on-off + section{ display: block; } - - input[type="checkbox"].on-off:checked + div{ + + input[type="checkbox"].on-off:checked + section{ display: block; } } @@ -396,88 +407,16 @@ font-size:1.2em; } -@media screen and (max-width: 900px) { - #page { - width: 750px; - margin: 0 auto; - } +/* footerを最下部に表示 */ - header{ - margin:0; - padding:0; - width:750px; - height:220px; - background:#fff; - background-position:right; - background-repeat:no-repeat; - font-weight:bold; - font-size:18px; - font-family:'Yu Mincho', meiryo ,sans-serif; - text-align:center; - color:#40361f; - } - - header img{ - width:750px; - } - - #menu{ - width: 0px; - font-family: 'Hiragino Kaku Gothic ProN', Meiryo, sans-serif; - font-size:x-small; - display: inline-block; - overflow: hidden; - } - - #menu ul{ - background:#fff; - list-style-type:none; - overflow: hidden; - } - - #menu li{ - /*width:100%;*/ - width: 180px; - height:140px; - text-align: center; - border-bottom: 1px solid #ebe4da; - float: left; - line-height: 50px; - margin-right: 10px; - } - - #menu a{ - width:95%; - height:80%; - display:block; - text-decoration:none; - color:#463a1c; - text-decoration: none; - font-weight: bold; - } - - #menu a:hover{ - background-color: rgba(255,213,236,0.5); - } - - #menu a:active{ - background-color: #FF9999; - } - - #menu a:after{ - font-family: 'Mv Boli', cursive; - font-size:0.8em; - color: #cbbe9c; - position:absolute; - bottom:0; - left:5px; - } - - #menu li.now{ - background-color: rgba(255,213,236,0.5); - } - #menu li:last-child{ - border-bottom:none; - } - +html { + height: 100%; +} +body { + min-height: 100%; + display: flex; + flex-direction: column; +} +.main_contents { + flex: 1; } diff --git a/2018/error.html b/2018/error.html index 71d2780..66507e5 100644 --- a/2018/error.html +++ b/2018/error.html @@ -1,10 +1,9 @@ -
-

確認画面

-

エラーが発生しました。お手数ですが、もう一度最初から入力をお願い致します。

-

お申込フォームへ

-
+

確認画面

+

エラーが発生しました。お手数ですが、もう一度最初から入力をお願い致します。

+

お申込フォームへ

+ diff --git a/2018/form-confirm.html b/2018/form-confirm.html index 5b088d2..48e3f4f 100644 --- a/2018/form-confirm.html +++ b/2018/form-confirm.html @@ -77,7 +77,7 @@ - +