Merge CSS files and introduce dev theme
This commit is contained in:
parent
2d4e7400cb
commit
d368f0862b
8 changed files with 40 additions and 43 deletions
1
TODO
1
TODO
|
@ -2,3 +2,4 @@
|
|||
- Résoudre le problème potentiel de famine de l'ordonnanceur en cas de brute-force d'une équipe
|
||||
- Ajouter dans la conf de nginx un ssl_dhparam + générer le fichier dans un script
|
||||
- Mettre à jour Smarty (et passer en « secure mode » ?)
|
||||
- Mettre à jour les logos
|
||||
|
|
3
htdocs/css/dev.css
Normal file
3
htdocs/css/dev.css
Normal file
|
@ -0,0 +1,3 @@
|
|||
.clock {
|
||||
display: none;
|
||||
}
|
|
@ -1,19 +0,0 @@
|
|||
.clock #ficlogo {
|
||||
float: left;
|
||||
height: 100px;
|
||||
margin-left: 25px;
|
||||
width: 12%;
|
||||
}
|
||||
.clock #epitalogo {
|
||||
float: right;
|
||||
height: 100px;
|
||||
width: 14%;
|
||||
}
|
||||
.clock #ficlogo img {
|
||||
max-height: 170px;
|
||||
max-width: 100%;
|
||||
}
|
||||
.clock #epitalogo img {
|
||||
max-height: 170px;
|
||||
max-width: 100%;
|
||||
}
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
.clock {
|
||||
background:#202020;
|
||||
margin: 0 auto;
|
||||
|
@ -6,6 +5,25 @@
|
|||
border: 1px solid #333;
|
||||
color: #fff;
|
||||
}
|
||||
.clock #ficlogo {
|
||||
float: left;
|
||||
height: 100px;
|
||||
margin-left: 25px;
|
||||
width: 12%;
|
||||
}
|
||||
.clock #epitalogo {
|
||||
float: right;
|
||||
height: 100px;
|
||||
width: 14%;
|
||||
}
|
||||
.clock #ficlogo img {
|
||||
max-height: 170px;
|
||||
max-width: 100%;
|
||||
}
|
||||
.clock #epitalogo img {
|
||||
max-height: 170px;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
#Date {
|
||||
background:#202020;
|
||||
|
@ -13,7 +31,6 @@
|
|||
text-align:center;
|
||||
text-shadow:0 0 5px #00c6ff;
|
||||
}
|
||||
|
||||
#Date + ul {
|
||||
width: 800px;
|
||||
margin: 0 auto;
|
||||
|
@ -21,7 +38,6 @@
|
|||
list-style: none;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#Date + ul li {
|
||||
display: inline;
|
||||
font-size: 5em;
|
||||
|
@ -32,14 +48,12 @@
|
|||
|
||||
.point {
|
||||
position: relative;
|
||||
-moz-animation: mymove 1s ease infinite;
|
||||
-webkit-animation: mymove 1s ease infinite;
|
||||
-moz-animation: clockanim 1s ease infinite;
|
||||
-webkit-animation: clockanim 1s ease infinite;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
/* Simple Animation */
|
||||
@-webkit-keyframes mymove {
|
||||
@-webkit-keyframes clockanim {
|
||||
0% {
|
||||
opacity: 1.0;
|
||||
text-shadow: 0 0 20px #00c6ff;
|
||||
|
@ -55,8 +69,7 @@
|
|||
text-shadow: 0 0 20px #00c6ff;
|
||||
}
|
||||
}
|
||||
|
||||
@-moz-keyframes mymove {
|
||||
@-moz-keyframes clockanim {
|
||||
0% {
|
||||
opacity: 1.0;
|
||||
text-shadow: 0 0 20px #00c6ff;
|
|
@ -3,9 +3,10 @@
|
|||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>{block name=title}Challenge FIC2015{/block}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link href="{$SALT_CDN}/css/bootstrap.min.css" rel="stylesheet" media="screen">
|
||||
<link href="{$SALT_CDN}/css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<link href="{$SALT_CDN}/css/bootstrap.min.css" type="text/css" rel="stylesheet" media="screen">
|
||||
<link href="{$SALT_CDN}/css/bootstrap-theme.min.css" type="text/css" rel="stylesheet" media="screen">
|
||||
|
||||
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
|
||||
<!--[if lt IE 9]>
|
||||
|
@ -19,6 +20,7 @@
|
|||
<meta name="language" content="{$smarty.const.LANG}">
|
||||
<meta http-equiv="Content-Language" content="{$smarty.const.LANG}">
|
||||
{block name=head}{/block}
|
||||
<link href="{$SALT_CDN}/css/dev.css" type="text/css" rel="stylesheet">
|
||||
</head>
|
||||
<body>
|
||||
{block name=body}
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{extends file="layout.tpl"}
|
||||
|
||||
{block name=head}
|
||||
<link href="/css/home.css" rel="stylesheet">
|
||||
<link href="/css/score.css" rel="stylesheet">
|
||||
<link href="{$SALT_CDN}/css/main.css" type="text/css" rel="stylesheet">
|
||||
{block name=head2}{/block}
|
||||
{/block}
|
||||
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{extends file="layout.tpl"}
|
||||
|
||||
{block name=head}
|
||||
<link href="/css/home.css" rel="stylesheet">
|
||||
<link href="/css/score.css" rel="stylesheet">
|
||||
<link href="{$SALT_CDN}/css/main.css" type="text/css" rel="stylesheet">
|
||||
{/block}
|
||||
|
||||
{block name=end}
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
{extends file="layout.tpl"}
|
||||
|
||||
{block name=head}
|
||||
<link href="/css/home.css" rel="stylesheet">
|
||||
<link href="/css/score.css" rel="stylesheet">
|
||||
<link href="{$SALT_CDN}/css/main.css" type="text/css" rel="stylesheet">
|
||||
<meta http-equiv="refresh" content="30">
|
||||
{block name=head2}{/block}
|
||||
{/block}
|
||||
|
|
Reference in a new issue