diff --git a/app/assets/images/FB.png b/app/assets/images/FB.png new file mode 100755 index 0000000..4292ae8 Binary files /dev/null and b/app/assets/images/FB.png differ diff --git a/app/assets/images/Google Plus.png b/app/assets/images/Google Plus.png new file mode 100755 index 0000000..d740eec Binary files /dev/null and b/app/assets/images/Google Plus.png differ diff --git a/app/assets/images/Instagram.png b/app/assets/images/Instagram.png new file mode 100755 index 0000000..a2613d0 Binary files /dev/null and b/app/assets/images/Instagram.png differ diff --git a/app/assets/images/talker_photo.png b/app/assets/images/talker_photo.png index 7ca9a34..2f1ddec 100644 Binary files a/app/assets/images/talker_photo.png and b/app/assets/images/talker_photo.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a7681de..3cb6ae5 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -6,6 +6,7 @@ header { position: relative; img { height: 100px; + margin-left: 50px; } .nav { @@ -39,6 +40,11 @@ header { border-right: solid gray thin; margin-top: 50px; padding: 0 50px; + font-size: 16px; + + .share{ + color: #b0b0b0 + } } .sidebar { @@ -47,51 +53,128 @@ header { } -#content-info{ + + + + +/*關於講者 start*/ + +.about{ width: 100%; background-color: #F0F0F0; - margin-top: 20px; - form{ - white-space: nowrap; + .speaker{ + margin-left: 50px; + margin-right: 50px; + } + + .works, .education, .experience, .skill, .contact_me{ + } } +hr{ + border-top: 1px solid #b0b0b0; + margin-left: 60px; + margin-right: 60px; +} -.about_talker{ - width: 95%; - height: auto; - background-color: #F0F0F0; +.speaker{ + padding-top: 80px; + padding-bottom: 30px; - .talker_photo{ - width: 120px; - height: 120px; - margin-top: 15px; - margin-left: 15px; - display: inline-block; - float: left; + img{ + width: 100%; } - .talker_intro{ - background-color: #F0F0F0; - width: 76%; - height: auto; - margin: 20px; - display: inline-block; - + .speaker_intro { + > h3{ + color: red; + margin-top: 0; + } + .contact{ + color: red; + } + .edu{ + padding-top: 8px; + padding-bottom: 8px; + + h5{ + color: #fff; + line-height: 8px; + } + } + p{ + font-size: 16px; + } } } +.education{ + font-size: 16px; + line-height: 50px; + font-weight: bold; +} +.experience{ + font-size: 16px; + + li{ + line-height: 35px; + font-weight: bold; + } +} +.skill{ + li{ + font-size: 16px; + line-height: 35px; + } +} + +.contact_me{ + padding-bottom: 50px; + img{ + width: 28px; + height: 31px; + margin-right: 20px; + } +} + +.question{ + height: 566px; + margin-bottom: 100px; +} + +.sponsor{ + color: red; + font-size: 16px; + font-weight: bold; +} +.helper{ + +} + +/*關於講者 end*/ /*footer start*/ -.container-center{ - width: 86%; - height: 230px; - margin: 25px auto 0; + +footer{ + width: 100%; + background-color: #F0F0F0; + margin-top: 20px; + + form{ + white-space: nowrap; + } +} + +.container{ + height: 280px; + width: 100%; + input{ border: 0px; @@ -114,10 +197,13 @@ header { } } -.in-left{ - width: 28%; - float: left; +.container > .row{ + margin-top: 20px; + padding-right: 50px; + padding-left: 50px; +} +.in-left{ img{ height: 120px; } @@ -132,18 +218,13 @@ header { } .in-right{ - width: 72%; - float: left; - + p{ margin: 0; text-align: left; } .footer_row{ - width: 24.5%; - display: inline-block; - ul{ float: right; } @@ -154,7 +235,6 @@ header { p{ font-weight: bold; font-size: 16px; - margin-bottom: 8px; } } @@ -170,13 +250,21 @@ header { #company{ text-align: center; - margin: 0; - margin-bottom: 10px; font-size: 12px; + margin-top: 25px; } /*footer end*/ +.row { + margin-right: 0px; + margin-left: 0px; +} + +.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + padding-right: 10px; + padding-left: 10px; +} diff --git a/app/controllers/talks_controller.rb b/app/controllers/talks_controller.rb index 36aa830..3473140 100644 --- a/app/controllers/talks_controller.rb +++ b/app/controllers/talks_controller.rb @@ -1,5 +1,7 @@ class TalksController < ApplicationController def show - #@talk = Talk.find(params[:id]) + @talk = Talk.find(params[:id]) + @user = @talk.user + @about = @user.about end end diff --git a/app/models/news.rb b/app/models/news.rb new file mode 100644 index 0000000..193f62c --- /dev/null +++ b/app/models/news.rb @@ -0,0 +1,2 @@ +class News < ApplicationRecord +end diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 2afc493..232150f 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,59 +1,66 @@ -