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

Ajout des sponsors tabmo/teads/capgemini #1

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Ajout des sponsors tabmo/teads/capgemini #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
46b9a5e
feat(map): change map reference
Jan 17, 2017
9d0934d
Merge pull request #1 from benjamingarcia/feat/map
fteychene Jan 20, 2017
da004fe
style(main): initialise some color and font
Jan 20, 2017
7b8fdc2
style(pages): impact color and font on other page
Jan 20, 2017
10dfa1f
feat(title): change title page
Jan 20, 2017
7880338
Merge pull request #2 from benjamingarcia/feat/logo
fteychene Jan 22, 2017
fa8558c
feat(cfp): change to link to cfp.io dashboard
Jan 24, 2017
cb900de
Merge pull request #3 from benjamingarcia/feat/cfp
fteychene Feb 16, 2017
7f0b2e6
Add Tabmo/Capgemini/Teads sponsors
Feb 19, 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
39 changes: 34 additions & 5 deletions src/assets/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
/* =============================================================
GENERAL STYLES
============================================================ */
@import url('https://fonts.googleapis.com/css?family=Architects+Daughter|Arsenal|Righteous&subset=latin-ext');

.Architects_Daughter {
font-family: 'Architects Daughter', cursive;
}

.righteous {
font-family: 'Righteous', cursive;
}

.crosscolor {
color: #a92401;
}

body {
font-family: 'Open Sans', sans-serif;

Expand All @@ -26,7 +40,7 @@ i.fa {
padding:5px;
}
section {
padding-top:50px;
padding-top: 80px;
}

p {
Expand Down Expand Up @@ -77,7 +91,7 @@ color: #FFF;


.back-light {
background-color:rgba(0, 0, 0, 0.50);
background-color: #29363e;
padding:10px;
}
/*NOTE SECION STYLE*/
Expand Down Expand Up @@ -205,7 +219,7 @@ border-radius: 0px;
.portfolio-item h5 {
margin: 0;
padding: 30px 0 30px 0;
background-color: #000;
background-color: #29363e;
color: #fff;
font-size: 20px;
}
Expand Down Expand Up @@ -256,12 +270,27 @@ border: 1px solid #e1e1e1;


#footer-sec {
background-color:#000;
background-color: #29363e !important;
color:#808080;
}
#footer-sec h4 {
text-transform:uppercase;
color:#fff;
}


.jug-back-color {
background-color: #29363e !important;

}

.btn-invocc {
color: #fff;
background-color: #29363e;
border-color: #29363e;
}

.btn-invocc:hover {
color: #e0e0e0;
background-color: #4b646f;
border-color: #4b646f;
}
Binary file added src/assets/fonts/Righteous-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/assets/img/invocc_logo.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 src/assets/img/sponsors/capgemini.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 src/assets/img/sponsors/capgemini300x100.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.
0 src/assets/img/logo_polytechmontpellier.jpg → ...img/sponsors/logo_polytechmontpellier.jpg
View file
Open in desktop
File renamed without changes
Binary file added src/assets/img/sponsors/polythech300x100.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 src/assets/img/sponsors/tabmo.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 src/assets/img/sponsors/tabmo300x100.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 src/assets/img/sponsors/teads.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 src/assets/img/sponsors/teads300x100.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.
203 changes: 0 additions & 203 deletions src/cfp.html
View file
Open in desktop

This file was deleted.

27 changes: 12 additions & 15 deletions src/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!--[if IE]>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<![endif]-->
<title>Invocc</title>
<title>Inv'Occ</title>
<!-- BOOTSTRAP CORE STYLE CSS -->
<link href="assets/css/bootstrap.css" rel="stylesheet" />
<!-- FONTAWESOME STYLE CSS -->
Expand All @@ -21,22 +21,22 @@
</head>
<body >

<div class="navbar navbar-inverse navbar-fixed-top" >
<div class="navbar navbar-inverse navbar-fixed-top jug-back-color">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">INVOCC</a>
<a class="navbar-brand righteous" href="#">Inv'Occ</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav navbar-right righteous">
<li><a href="index.html">HOME</a></li>
<li><a href="sponsors.html">PARTNERS</a></li>
<!--<li><a href="speakers.html">SPEAKERS</a></li>-->
<li><a href="cfp.html">CFP</a></li>
<li><a href="speakers.html">SPEAKERS</a></li>
<li><a href="https://invocc.cfp.io/#/dashboard" target="_blank">CFP</a></li>
<li><a href="contact.html">CONTACT</a></li>
</ul>
</div>
Expand All @@ -59,9 +59,10 @@ <h1>NOUS CONTACTER</h1>
<!--/.HEADING END-->

<section id="contact-sec">
<iframe class="cnt" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2999841.293321206!2d-75.80920404999999!3d42.75594204999997!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4ccc4bf0f123a5a9%3A0xddcfc6c1de189567!2sNew+York!5e0!3m2!1sen!2s!4v1395313088825" ></iframe>
<div class="add">
<i>Address: </i>234/JK , The Wondre Land, Newyork Street Junction, JUST USA -10909094
<iframe class="cnt"
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2887.7413832048587!2d3.8603591153421886!3d43.63274136177161!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12b6aedefbe5ce25%3A0x91bc01c37c4d1035!2sPolytech!5e0!3m2!1sfr!2sfr!4v1484669961912"></iframe>
<div class="add">
<i>Addresse: </i>Place Eugène Bataillon, 34095 Montpellier
</div>
<hr />
</section>
Expand All @@ -72,11 +73,7 @@ <h1>NOUS CONTACTER</h1>
<div class="col-md-8 col-md-offset-2 col-sm-8 col-sm-offset-2 ">
<i class="fa fa-quote-left fa-3x"></i>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Curabitur nec nisl odio. Mauris vehicula at nunc id posuere.
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Curabitur nec nisl odio. Mauris vehicula at nunc id posuere.
Organisé par l'association JUG de Montpellier, InvOcc ...
</p>
</div>
</div>
Expand All @@ -97,7 +94,7 @@ <h1>NOUS CONTACTER</h1>
</div>
</section>-->
<!--/.CLIENTS END-->
<section id="footer-sec" >
<section id="footer-sec">

<div class="container">
<div class="row pad-bottom" >
Expand Down
Loading