Commit db1a08f4 authored by Krophil's avatar Krophil

Few changes in css for conv

parent 74667c4f
...@@ -9,15 +9,18 @@ ...@@ -9,15 +9,18 @@
@import 'https://fonts.googleapis.com/css?family=Cinzel'; @import 'https://fonts.googleapis.com/css?family=Cinzel';
body { body {
// background-image: url("/gala/static/blog/img/background.jpg"); background-image: url("/gala/static/blog/img/background.svg");
background-image: linear-gradient(to top left, rgb(8, 58, 117), rgb(13, 26, 41)); // background-image: linear-gradient(to top left, rgb(8, 58, 117), rgb(13, 26, 41));
background-repeat: repeat; background-attachment: no-repeat center center fixed;
background-attachment: fixed; -webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
font-family: 'Roboto', sans-serif; font-family: 'Roboto', sans-serif;
} }
.content { .content {
background-color: #eee; background-color: #DEDEB1;
border-radius: 10px; border-radius: 10px;
// border: 3px #b2810e solid; // border: 3px #b2810e solid;
} }
...@@ -57,13 +60,6 @@ hr { ...@@ -57,13 +60,6 @@ hr {
margin-bottom: 25%; margin-bottom: 25%;
} }
.chronoBloc {
padding-top: 10px;
padding-bottom: 10px;
text-align: center;
display: block;
}
@media (min-width: 1200px) { @media (min-width: 1200px) {
.chronoBloc { .chronoBloc {
margin-top: 10px; margin-top: 10px;
...@@ -79,6 +75,17 @@ hr { ...@@ -79,6 +75,17 @@ hr {
} }
} }
.main-title {
text-align: center;
font-family: 'Cinzel', serif;
color: #ffffff;
font-size: 4em;
}
h1 {
font-size: 1em;
}
.chrono { .chrono {
// background-color: #5A6AFF; // background-color: #5A6AFF;
font-family: 'Cinzel', serif; font-family: 'Cinzel', serif;
...@@ -96,8 +103,10 @@ hr { ...@@ -96,8 +103,10 @@ hr {
.logo { .logo {
// background-color: rgba(255, 255, 255, 0.8); // background-color: rgba(255, 255, 255, 0.8);
min-width: 100%; max-height: 300px;
max-height: 350px; max-width: 100%;
height: 200px;
width:auto;
} }
#logo-mini { #logo-mini {
...@@ -106,6 +115,7 @@ hr { ...@@ -106,6 +115,7 @@ hr {
} }
#logo-mobile { #logo-mobile {
margin: auto;
margin-bottom: 10px; margin-bottom: 10px;
} }
...@@ -122,16 +132,6 @@ hr { ...@@ -122,16 +132,6 @@ hr {
display: block; display: block;
} }
.youtube {
background-color: #EB9388;
color: #ffffff;
}
.youtube:hover {
background-color: #ffffff;
color: #DD4B39;
}
.twitter { .twitter {
background-color: #66CDF4; background-color: #66CDF4;
color: #ffffff; color: #ffffff;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#navbar { #navbar {
border-radius: 10px 10px 0 0; border-radius: 0;
font-size: 20px; font-size: 20px;
} }
#navbar li { #navbar li {
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
line-height: 35px; line-height: 35px;
} }
.navbar-default { .navbar-default {
background-color: #0a0c12; background-color: #CAC291;
border-color: #0a0c12;; border-color: #CAC291;
} }
.navbar-default .navbar-brand { .navbar-default .navbar-brand {
color: #ffffff; color: #ffffff;
...@@ -30,31 +30,31 @@ ...@@ -30,31 +30,31 @@
color: #ffffff; color: #ffffff;
} }
.navbar-default .navbar-nav > li > a { .navbar-default .navbar-nav > li > a {
color: #ffffff; color: #0a0c12;
} }
.navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:hover,
.navbar-default .navbar-nav > li > a:focus { .navbar-default .navbar-nav > li > a:focus {
color: #0a0c12; color: #0a0c12;
background-color: #ffffff; background-color: #CAC291;
} }
.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus { .navbar-default .navbar-nav > .active > a:focus {
color: #0a0c12; color: #ffffff;
background-color: #ffffff; background-color: #CAC291;
} }
.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus { .navbar-default .navbar-nav > .open > a:focus {
color: #0a0c12; color: #0a0c12;
background-color: #ffffff; background-color: #CAC291;
} }
.navbar-default .navbar-toggle { .navbar-default .navbar-toggle {
border-color: #ffffff; border-color: #ffffff;
} }
.navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:hover,
.navbar-default .navbar-toggle:focus { .navbar-default .navbar-toggle:focus {
background-color: #ffffff; background-color: #BCBC95;
} }
.navbar-default .navbar-toggle .icon-bar { .navbar-default .navbar-toggle .icon-bar {
background-color: #ffffff; background-color: #ffffff;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -12,10 +12,10 @@ function SetChrono(file) { ...@@ -12,10 +12,10 @@ function SetChrono(file) {
var now = new Date(); var now = new Date();
var gala = new Date(); var gala = new Date();
var diff = 0; var diff = 0;
$.getJSON(file, function(data) { $.getJSON(file, function(data) {
alert("test");
gala.setFullYear(data.year, data.month - 1, data.day); gala.setFullYear(data.year, data.month - 1, data.day);
alert(gala);
diff = gala.getTime() - now.getTime(); diff = gala.getTime() - now.getTime();
// Il faut retirer 1 au mois puisque l'indice commence à 0 // Il faut retirer 1 au mois puisque l'indice commence à 0
diff = Math.floor(diff / (1000 * 60 * 60 * 24)); diff = Math.floor(diff / (1000 * 60 * 60 * 24));
......
{ {
"day": 19, "day": 17,
"month": 11, "month": 02,
"year": 2016 "year": 2017
} }
\ No newline at end of file
<div class="row">
<div class="row">
<div class="col-lg-offset-2 col-lg-8 col-lg-offset-2">
<div class="chronoBloc chrono">
<div align="center" class="row">
<i>J-<span class="days">0</span></i>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
<div class="row"> <div class="row">
<div class="row"> <!--<div class="row">
<div class="col-md-offset-2 col-md-8 col-md-offset-2"> <div class="col-md-offset-2 col-md-8 col-md-offset-2">
<a target="_blank" href="https://www.youtube.com/channel/UCCovZ5tiZnfAwkR-NP7uBmw" rel="nofollow"> <a target="_blank" href="https://www.youtube.com/channel/UCCovZ5tiZnfAwkR-NP7uBmw" rel="nofollow">
<div class="socialBloc youtube"> <div class="socialBloc youtube">
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
</div> </div>
</a> </a>
</div> </div>
</div> </div>-->
<div class="row"> <div class="row">
<div class="col-md-offset-2 col-md-8 col-md-offset-2"> <div class="col-md-offset-2 col-md-8 col-md-offset-2">
<a target="_blank" href="https://twitter.com/galautbm" rel="nofollow"> <a target="_blank" href="https://twitter.com/ConvTroll" rel="nofollow">
<div class="socialBloc twitter"> <div class="socialBloc twitter">
<div align="center" class="row"> <div align="center" class="row">
<i class="fa fa-twitter fa-2x"></i> <i class="fa fa-twitter fa-2x"></i>
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-offset-2 col-md-8 col-md-offset-2"> <div class="col-md-offset-2 col-md-8 col-md-offset-2">
<a target="_blank" href="https://www.facebook.com/GalaDePrestigeUTBM" rel="nofollow"> <a target="_blank" href="https://www.facebook.com/convTroll" rel="nofollow">
<div class="socialBloc facebook"> <div class="socialBloc facebook">
<div align="center" class="row"> <div align="center" class="row">
<i class="fa fa-facebook fa-2x"></i> <i class="fa fa-facebook fa-2x"></i>
......
...@@ -5,7 +5,10 @@ ...@@ -5,7 +5,10 @@
<html lang="fr"> <html lang="fr">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Gala 2016</title> <title> XXIIIe Convention du Troll Penché</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
<link href="{% static "blog/css/base.css" %}" rel="stylesheet"> <link href="{% static "blog/css/base.css" %}" rel="stylesheet">
...@@ -18,21 +21,21 @@ ...@@ -18,21 +21,21 @@
<body> <body>
<div class="row"> <div class="row">
<div class="col-md-2 col-xs-1 col-lg-2"> <div class="col-xs-1 col-md-3 col-lg-3">
<div class="hidden-xs hidden-sm hidden-md"> <div class="hidden-xs hidden-sm hidden-md">
<img class="img-responsive logo" id="logo-mini" src="{% static "blog/img/banderole.png" %}"> <img class="img-responsive logo" id="logo-mini" src="{% static "blog/img/troll.png"%}">
</div> </div>
</div> </div>
<div class="col-xs-10 col-md-8 col-lg-8">
{# Décompte petit écran #} <div class = "col-xs-12 col-md-6 col-lg-6 main-title">
<div class="col-lg-offset-6 container-fluid hidden-lg"> <h1><em>Convention du Troll Penché</em></h1>
{% include "blog/chrono.html" %} </div>
</div>
<div class="col-xs-10 col-md-3 col-lg-3">
{# Bannière #} {# Bannière #}
<div class="row-fluid hidden-lg"> <div class="row-fluid hidden-lg">
<img class="img-responsive logo" id="logo-mobile" src="{% static "blog/img/banderole.png" %}"> <img class="img-responsive logo" id="logo-mobile" src="{% static "blog/img/troll.png"%}">
</div> </div>
<div class="visible-lg-inline"> <div class="visible-lg-inline">
...@@ -41,20 +44,13 @@ ...@@ -41,20 +44,13 @@
</div> </div>
{# Décompte grand écran #}
<span class="visible-lg-inline">
<div class="col-lg-2">
{% include "blog/chrono.html" %}
</div>
</span>
</div> </div>
<div class="row"> <div class="row">
{# Liens sociaux desktop #} {# Liens sociaux desktop #}
<div class="col-md-2 col-sm-1"> <div class="col-md-1 col-sm-1">
<div class="hidden-sm hidden-xs"> <div class="hidden-sm hidden-xs">
<div class="social-mini"> <div class="social-mini">
...@@ -65,7 +61,7 @@ ...@@ -65,7 +61,7 @@
</div> </div>
{# contenu #} {# contenu #}
<div class="col-xs-offset-1 col-sm-offset-0 col-md-8 col-xs-10"> <div class="col-xs-offset-1 col-sm-offset-0 col-md-10 col-xs-10">
<div class="container-fluid content"> <div class="container-fluid content">
<div class="row"> <div class="row">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment