fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Merge CSS files and introduce dev theme

Browse source
This commit is contained in:
nemunaire 2014-11-20 11:17:45 +01:00
parent 2d4e7400cb
commit d368f0862b
8 changed files with 40 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TODO
View file

@ -2,3 +2,4 @@
- Résoudre le problème potentiel de famine de l'ordonnanceur en cas de brute-force d'une équipe - 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 - 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 Smarty (et passer en « secure mode » ?)
- Mettre à jour les logos

3
htdocs/css/dev.css Normal file
View file

@ -0,0 +1,3 @@
.clock {
display: none;
}

19
htdocs/css/home.css
View file

@ -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%;
}

43
htdocs/css/score.css → htdocs/css/main.css
View file

@ -1,4 +1,3 @@
.clock { .clock {
background:#202020; background:#202020;
margin: 0 auto; margin: 0 auto;
@ -6,14 +5,32 @@
border: 1px solid #333; border: 1px solid #333;
color: #fff; color: #fff;
} }
.clock #ficlogo {
#Date { float: left;
background:#202020; height: 100px;
font-family: bold, sans-serif; margin-left: 25px;
text-align:center; width: 12%;
text-shadow:0 0 5px #00c6ff; }
.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;
font-family: bold, sans-serif;
text-align:center;
text-shadow:0 0 5px #00c6ff;
}
#Date + ul { #Date + ul {
width: 800px; width: 800px;
margin: 0 auto; margin: 0 auto;
@ -21,7 +38,6 @@
list-style: none; list-style: none;
text-align: center; text-align: center;
} }
#Date + ul li { #Date + ul li {
display: inline; display: inline;
font-size: 5em; font-size: 5em;
@ -32,14 +48,12 @@
.point { .point {
position: relative; position: relative;
-moz-animation: mymove 1s ease infinite; -moz-animation: clockanim 1s ease infinite;
-webkit-animation: mymove 1s ease infinite; -webkit-animation: clockanim 1s ease infinite;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
} }
@-webkit-keyframes clockanim {
/* Simple Animation */
@-webkit-keyframes mymove {
0% { 0% {
opacity: 1.0; opacity: 1.0;
text-shadow: 0 0 20px #00c6ff; text-shadow: 0 0 20px #00c6ff;
@ -55,8 +69,7 @@
text-shadow: 0 0 20px #00c6ff; text-shadow: 0 0 20px #00c6ff;
} }
} }
@-moz-keyframes clockanim {
@-moz-keyframes mymove {
0% { 0% {
opacity: 1.0; opacity: 1.0;
text-shadow: 0 0 20px #00c6ff; text-shadow: 0 0 20px #00c6ff;

8
onyx/tpl/bootstrap/layout.tpl
View file

@ -3,9 +3,10 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{block name=title}Challenge FIC2015{/block}</title> <title>{block name=title}Challenge FIC2015{/block}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="{$SALT_CDN}/css/bootstrap.min.css" rel="stylesheet" media="screen"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="{$SALT_CDN}/css/bootstrap-theme.min.css" rel="stylesheet" media="screen"> <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 --> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -19,6 +20,7 @@
<meta name="language" content="{$smarty.const.LANG}"> <meta name="language" content="{$smarty.const.LANG}">
<meta http-equiv="Content-Language" content="{$smarty.const.LANG}"> <meta http-equiv="Content-Language" content="{$smarty.const.LANG}">
{block name=head}{/block} {block name=head}{/block}
<link href="{$SALT_CDN}/css/dev.css" type="text/css" rel="stylesheet">
</head> </head>
<body> <body>
{block name=body} {block name=body}

3
onyx/tpl/bootstrap/public/layout.tpl
View file

@ -1,8 +1,7 @@
{extends file="layout.tpl"} {extends file="layout.tpl"}
{block name=head} {block name=head}
<link href="/css/home.css" rel="stylesheet"> <link href="{$SALT_CDN}/css/main.css" type="text/css" rel="stylesheet">
<link href="/css/score.css" rel="stylesheet">
{block name=head2}{/block} {block name=head2}{/block}
{/block} {/block}

3
onyx/tpl/bootstrap/teams/layout.tpl
View file

@ -1,8 +1,7 @@
{extends file="layout.tpl"} {extends file="layout.tpl"}
{block name=head} {block name=head}
<link href="/css/home.css" rel="stylesheet"> <link href="{$SALT_CDN}/css/main.css" type="text/css" rel="stylesheet">
<link href="/css/score.css" rel="stylesheet">
{/block} {/block}
{block name=end} {block name=end}

3
onyx/tpl/bootstrap/teams/lobby.tpl
View file

@ -1,8 +1,7 @@
{extends file="layout.tpl"} {extends file="layout.tpl"}
{block name=head} {block name=head}
<link href="/css/home.css" rel="stylesheet"> <link href="{$SALT_CDN}/css/main.css" type="text/css" rel="stylesheet">
<link href="/css/score.css" rel="stylesheet">
<meta http-equiv="refresh" content="30"> <meta http-equiv="refresh" content="30">
{block name=head2}{/block} {block name=head2}{/block}
{/block} {/block}