Skip to content

update #10

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

Merged
merged 1 commit into from
Nov 4, 2019
Merged

update #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 87 additions & 15 deletions css/creativeOrigin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10790,6 +10790,7 @@ a.text-dark:hover {
}

.date {
font-family: 'Merriweather';
color: #fff
}

Expand Down Expand Up @@ -10930,8 +10931,12 @@ header.masthead {
max-width: 100%
}

header.masthead h1 {
font-size: 2.25rem
header.masthead h1, {
font-size: 2.25rem;
}

.spaca{
height: 2rem;
}

@media (min-width:992px) {
Expand All @@ -10942,17 +10947,25 @@ header.masthead h1 {
padding-bottom: 0
}
header.masthead p {
font-size: 1.15rem
font-size: 1.15rem;
}
header.masthead h1 {
font-size: 3rem
font-size: 3rem;
}

.spaca{
height: 2.5rem;
}
}

@media (min-width:1200px) {
header.masthead h1 {
font-size: 3.5rem
font-size: 3.5rem;
}

.spaca{
height: 3rem;
}
}

video {
Expand Down Expand Up @@ -11018,7 +11031,8 @@ video {
}

#small-dialog,
#small-dialog2 {
#small-dialog2,
#small-dialog3{
border-radius: 20px;
background: #fff;
padding: 20px 30px;
Expand Down Expand Up @@ -11369,6 +11383,10 @@ video {
font-size: 12px
}

#first-day ul{
padding-left: 0;
}

.mgandpadzero {
padding: 0;
margin: 0
Expand Down Expand Up @@ -11486,7 +11504,7 @@ button.questionTitle {

@media (max-width:776px) {
.joinUsButton {
padding-bottom: 5rem
padding-bottom: 2rem;
}
.mu-event-timeline ul li {
margin-left: 15%;
Expand Down Expand Up @@ -11516,8 +11534,7 @@ button.questionTitle {
}
}

.fa,
.tba {
.fa, .tba {
text-align: center
}

Expand All @@ -11544,29 +11561,80 @@ button.questionTitle {

.fa-transform-fb {
right: 6px;
bottom: 9px
bottom: 9px;
}

.fa-transform-li {
right: 7.25px;
bottom: 9px
bottom: 9px;
}

.fa-transform-ig {
right: 8px;
bottom: 9px
bottom: 9px;
}

.fb {
background: #3B5998
background: #3B5998;
}

.li {
background: #007bb5
background: #007bb5;
}

.ig {
background: #125688
background: #125688;
}

.sp-bubbles{
position:relative;
z-index: 1;
}

.sp-bubble{
position:absolute;
}

.sp1{
left:150px;
/*add +30 for it to kiss the line*/
}

.sp2{
right:230px;
/*add +30 for it to kiss the line*/
}

.spleft{
left:0px;
right:30px;
}

.spright{
left:30px;
right:0px;
}

.sptop{
top:10px;
}

.spmiddle{
top:75px;
}

.spbottom{
top:135px;
}

.spaca{
display:inline;
position:relative;
bottom:5px;
}

.nowrap{
white-space:nowrap;
}

@media (max-width:480px) {
Expand Down Expand Up @@ -11622,6 +11690,10 @@ button.questionTitle {
.Promotion{
width:85%;
}
#SpaceforjoinUs{
margin-top:0 !important;
}

}

@media(max-width:400px){
Expand Down
93 changes: 58 additions & 35 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<html lang="en">

<head>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, shrink-to-fit=no">
<meta name="description" content="">
Expand All @@ -11,7 +10,6 @@
<title>SPAC 2020</title>

<!-- Font Awesome Icons -->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">

<!-- Google Fonts -->
Expand All @@ -22,7 +20,6 @@
<link href="vendor/magnific-popup/magnific-popup.css" rel="stylesheet">

<!-- Theme CSS - Includes Bootstrap -->
<!--<link href="css/creative.min.css" rel="stylesheet">-->
<link href="css/animate.min.css" rel="stylesheet">
<link href="css/creativeOrigin.css" rel="stylesheet">
<!-- Website Icon-->
Expand All @@ -43,6 +40,9 @@
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#about">About</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#BuyTicket">Tickets</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" href="#speakers">Speakers</a>
</li>
Expand All @@ -53,7 +53,10 @@
<a class="nav-link js-scroll-trigger" href="#patronage">Patronage</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" style="padding-right: 10px;" href="#mu-schedule">Agenda</a>
<a class="nav-link js-scroll-trigger" href="#mu-schedule">Agenda</a>
</li>
<li class="nav-item">
<a class="nav-link js-scroll-trigger" style="padding-right: 10px;" href="#contactUs">Contact Us</a>
</li>
<!-- <li class="nav-item">
<a class="nav-link js-scroll-trigger" style="padding-right: 20px;" href="#FAQ">FAQ</a>
Expand All @@ -69,7 +72,7 @@
<div class="row h-100 align-items-center justify-content-center text-center">
<div class="col-lg-10 align-self-end">
<!-----changed by Guy-->
<h1 class="text-uppercase text-white font-weight-bold paddingforAndroid">IEEE Student Professional<br>Awareness Conference</h1>
<h1 class="text-uppercase text-white font-weight-bold paddingforAndroid">IEEE Student Professional <br> Awareness Conference</h1>
<!-----end of the change-->
<hr class="divider my-4">
</div>
Expand Down Expand Up @@ -118,10 +121,6 @@ <h2 class="text-body mt-0">About the Conference</h2>
<div class="col-md-6 col-sm-12">

<iframe height="315" class="video" src="https://www.youtube.com/embed/dpGWq9Mq3k4" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
<!--<video class="wow fadeInLeft" style="max-width: 100%" controls>
<source src="videos/trailer.mp4" type="video/mp4">
Your browser does not support the video tag.
</video>-->
</div>
<div class="col-md-6 col-sm-12" style="text-align: center">
<p class="wow fadeIn">
Expand Down Expand Up @@ -183,16 +182,25 @@ <h2 class="text-body mt-0">About the Conference</h2>
</div>
</div>

<div class="col-lg-6 col-md-6 text-center JoinUs">
<div class="col-lg-6 col-md-6 text-center JoinUs" id="BuyTicket">
<div class="JoinUsCon">
<h2 class="text-center mt-5">Join Us</h2>
<hr class="divider my-4">
<div class="row mt-5">
<!--<div class="col-md-6 text-center">
<a class="btn btn-light btn-xl bt-join" href="https://startbootstrap.com/themes/creative/">Submit Resume</a>
</div>-->
<div class="col-md-12 text-center joinUsButton">
<a class="btn btn-light btn-xl bt-join js-scroll-trigger" href="#patronage">Become A Patron Today!</a>
<div class="row mt-5" id="SpaceforjoinUs">

<div class="col-md-6 text-center joinUsButton">
<a class="btn btn-light btn-xl bt-join popup-with-zoom-anim" href="#small-dialog3">Attendee? Buy your ticket!</a>
</div>

<div id="small-dialog3" class="zoom-anim-dialog mfp-hide">
<div class="cognito">
<script src="https://services.cognitoforms.com/s/bkBngNoSYU2zSPstnzXF4A"></script>
<script>Cognito.load("forms", { id: "1" });</script>
</div>
</div>

<div class="col-md-6 text-center joinUsButton">
<a class="btn btn-light btn-xl bt-join js-scroll-trigger" href="#patronage">Recruiter? Become a Patron Today!</a>
</div>
</div>
</div>
Expand All @@ -206,14 +214,21 @@ <h2 class="text-center mt-5">Join Us</h2>
<h2 class="text-center mt-0">Speakers</h2>
<hr class="divider my-4">
<!-- <div class="row">


<div class="sp-bubbles sp1">
<a href="" class="fa fb sp-bubble spright sptop" target="_blank"><p class="fa-transform-fb fa-facebook"></p></a>
<a href="" class="fa li sp-bubble spleft spmiddle" target="_blank"><p class="fa-transform-li fa-linkedin"></p></a>
<a href="" class="fa ig sp-bubble spright spbottom" target="_blank"><p class="fa-transform-ig fa-instagram"></p></a>
</div>

<div class="col-lg-6 col-md-6 text-center">
<a class="mt-5 wow zoomInLeft popup-with-zoom-anim speakerlink" href="#small-dialog">
Guy added read more- ->
<img src="img/speakers/unknown.png" class="speakerimg">
<img src="img/speakers/unknown.png" class="speakerimg">
<h3 class="h4 mb-2">Speaker Name 1</h3>
<p class="text-muted mb-0">Founder of Company 1</p>
<p class="text-muted mb-0"><i><u>Read More...</u></i></p>
End of change- ->
</a>

<div id="small-dialog" class="zoom-anim-dialog mfp-hide">
Expand All @@ -232,29 +247,20 @@ <h3>Speaker Name 1</h3>
</div>
</div>
</div>

<div class="col-lg-6 col-md-6 text-center">
<a class="mt-5 wow zoomInRight popup-with-zoom-anim speakerlink" href="#small-dialog2">
<img src="img/speakers/unknown.png" class="speakerimg">
<img src="img/speakers/unknown.png" class="speakerimg">
<h3 class="h4 mb-2">Speaker Name 2</h3>
<p class="text-muted mb-0">Project Lead at Company 2</p>
<p class="text-muted mb-0"><i><u>Read More...</u></i></p>
</a>
</div>
<div id="small-dialog2" class="zoom-anim-dialog mfp-hide">
<div class="row text-center">
<div class="container">
<img src="img/speakers/unknown.png" class="speakerimg">
</div>

<div class="container">
<h3>Second Speaker</h3>
<hr class="divider my-4">
<p> icons</p>
</div>
<div class="container">
<img src="img/speakers/unknown.png" class="speakerimg">
</div>
<div class="container">
<img src="img/speakers/unknown.png" class="speakerimg">
</div>
<div class="container">
<h3>Speaker Name 2</h3>
<hr class="divider my-4">
Expand All @@ -265,8 +271,14 @@ <h3>Speaker Name 2</h3>
</div>
</div>
</div>

<div class="sp-bubbles sp2">
<a href="" class="fa fb sp-bubble spleft sptop" target="_blank"><p class="fa-transform-fb fa-facebook"></p></a>
<a href="" class="fa li sp-bubble spright spmiddle" target="_blank"><p class="fa-transform-li fa-linkedin"></p></a>
<a href="" class="fa ig sp-bubble spleft spbottom" target="_blank"><p class="fa-transform-ig fa-instagram"></p></a>
</div>

</div> Comment out as requested by Rafid -->
</div> Comment out as requested by Rafid-->

<p class="text-muted tba"><i>To be announced!</i></p>
</div>
Expand Down Expand Up @@ -540,6 +552,17 @@ <h3 class="h4 mb-2" style="color: white">Sala San Marco<br>Event & Conference Ce
</section>


<!--ContactUs Section -->
<section class="page-section text-white" id="contactUs" style="padding: 0;">
<div class="container-fluid" style="padding:0;">
<iframe src="https://services.cognitoforms.com/f/bkBngNoSYU2zSPstnzXF4A?id=2" style="position:relative;width:1px;min-width:100%;*width:100%;" frameborder="0" scrolling="yes" seamless="seamless" height="527" width="100%"></iframe>
<script src="https://services.cognitoforms.com/scripts/embed.js"></script>
</div>
</section>




<!---FAQ start
<section class="page-section" id="FAQ">
<div class="container-fluid">
Expand Down Expand Up @@ -648,7 +671,7 @@ <h2 class="mb-0">
<!-- Footer -->
<footer class="bg-light py-5">
<div class="container text-center">
<div class="small text-center text-muted">Managed and Created by Yi Liu and Guillaume Labasse<br>
<div class="small text-center text-muted">Managed and created by Yi Liu and Guillaume Labasse<br>
Copyright© 2019 IEEE Carleton. Website available under MIT Licensing</div>
</div>
</footer>
Expand Down