Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

talk page (not finish) #7

Open
wants to merge 2 commits into
base: talks
Choose a base branch
from
Open

talk page (not finish) #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff8f26a
footer + about speaker finish
yuyi1024 Jun 1, 2017
a41501f
talk-page(not finish)
yuyi1024 Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/FB.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Google Plus.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Instagram.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/talker_photo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
164 changes: 126 additions & 38 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ header {
position: relative;
img {
height: 100px;
margin-left: 50px;
}

.nav {
Expand Down Expand Up @@ -39,6 +40,11 @@ header {
border-right: solid gray thin;
margin-top: 50px;
padding: 0 50px;
font-size: 16px;

.share{
color: #b0b0b0
}
}

.sidebar {
Expand All @@ -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;
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -154,7 +235,6 @@ header {
p{
font-weight: bold;
font-size: 16px;
margin-bottom: 8px;
}
}

Expand All @@ -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;
}

4 changes: 3 additions & 1 deletion app/controllers/talks_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions app/models/news.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class News < ApplicationRecord
end
115 changes: 61 additions & 54 deletions app/views/shared/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,66 @@
<footer id="content-info" class="container">
<div class="container-center">
<div class="in-left">
<%= link_to root_path, id: 'ioh_logo' do %>
<%= image_tag("ioh_logo.png") %>
<% end %>
<p>"當每個人都說起故事，我們可以改變世界。"</p>

<%#= form_for(@email) do |f| %>
<%#= f.text_field :email, placeholder:"輸入電子郵件" %>
<%#= f.submit "收到最新消息" %>
<%# end %>
<footer>
<div class="container">
<div class="row">
<div class="col-sm-4 in-left">
<div class="col-sm-11">
<%= link_to root_path, id: 'ioh_logo' do %>
<%= image_tag("ioh_logo.png") %>
<% end %>
<p>"當每個人都說起故事，我們可以改變世界。"</p>

<%#= form_for(@email) do |f| %>
<%#= f.text_field :email, placeholder:"輸入電子郵件" %>
<%#= f.submit "收到最新消息" %>
<%# end %>

<form action="" method="get">
<input type="email" required="required" placeholder="輸入電子郵件">
<button type="submit" value="Submit">收到最新消息</button>
</form>

</div>
<div class="in-right">
<div class="footer_row">
<ul>
<p>about</p>
<a href=""><li>創辦初衷</li></a>
<a href=""><li>團隊成員</li></a>
<a href=""><li>紀錄片：志氣</li></a>
<a href=""><li>媒體報導</li></a>
</div>
<div class="footer_row">
<ul>
<p>join</p>
<a href=""><li>成為實習生</li></a>
<a href=""><li>成為全職</li></a>
<a href=""><li>成為講者</li></a>
<li>&nbsp;</li>
</ul>
</div>
<div class="footer_row">
<ul>
<p>follow</p>
<a href=""><li>聯絡&nbsp;IOH</li></a>
<a href=""><li>贊助&nbsp;IOH</li></a>
<a href=""><li>使用&nbsp;IOH</li></a>
<a href=""><li>追蹤&nbsp;IOH</li></a>
</ul>
</div>
<div class="footer_row">
<ul>
<p>more</p>
<a href=""><li>講座影片</li></a>
<a href=""><li>最新文章</li></a>
<a href=""><li>最新活動</li></a>
<li>&nbsp;</li>
</ul>
<form action="" method="get">
<input type="email" required="required" placeholder="輸入電子郵件">
<button type="submit" value="Submit">收到最新消息</button>
</form>
</div>
</div>
<div class="col-sm-8 in-right">
<div class="row">
<div class="col-sm-3 footer_row">
<ul>
<p>about</p>
<a href=""><li>創辦初衷</li></a>
<a href=""><li>團隊成員</li></a>
<a href=""><li>紀錄片：志氣</li></a>
<a href=""><li>媒體報導</li></a>
</div>
<div class="col-sm-3 footer_row">
<ul>
<p>join</p>
<a href=""><li>成為實習生</li></a>
<a href=""><li>成為全職</li></a>
<a href=""><li>成為講者</li></a>

</ul>
</div>
<div class="col-sm-3 footer_row">
<ul>
<p>follow</p>
<a href=""><li>聯絡 IOH</li></a>
<a href=""><li>贊助 IOH</li></a>
<a href=""><li>使用 IOH</li></a>
<a href=""><li>追蹤 IOH</li></a>
</ul>
</div>
<div class="col-sm-3 footer_row">
<ul>
<p>more</p>
<a href=""><li>講座影片</li></a>
<a href=""><li>最新文章</li></a>
<a href=""><li>最新活動</li></a>

</ul>
</div>
</div>


</div>
</div>
<p id="company">&copy; 2017 IOH 開放個人經驗平台</p>
</div>
<p id="company">&copy; 2017 IOH 開放個人經驗平台</p>
</footer>
Loading