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
commit d368f0862b
8 changed files with 39 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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