github-mirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 09:42:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

CSS include

Browse source
This commit is contained in:
Michael Teeuw 2014-02-25 15:41:44 +01:00
parent 20090b5acd
commit 2ea15c1c0b
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
css/main.css
View file

@ -7,6 +7,7 @@ body, html {
font-family: "helvetica-neue"; font-family: "helvetica-neue";
font-weight: 200px;
color: #fff; color: #fff;
font-size: 75px; font-size: 75px;
} }
@ -106,11 +107,11 @@ body, html {
@font-face { @font-face {
font-family: 'helvetica-neue'; font-family: 'helvetica-neue';
src: url('../font/helvetica-neue-webfont.eot'); src: url('font/helvetica-neue-webfont.eot');
src: url('../font/helvetica-neue-webfont.eot?#iefix') format('embedded-opentype'), src: url('font/helvetica-neue-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/helvetica-neue-webfont.woff') format('woff'), url('font/helvetica-neue-webfont.woff') format('woff'),
url('../font/helvetica-neue-webfont.ttf') format('truetype'), url('font/helvetica-neue-webfont.ttf') format('truetype'),
url('../font/helvetica-neue-webfont.svg#helvetica-neue-webfontRg') format('svg'); url('font/helvetica-neue-webfont.svg#helvetica-neue-webfontRg') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

4
index.php
View file

@ -1,7 +1,9 @@
<html> <html>
<head> <head>
<title>Magic Mirror</title> <title>Magic Mirror</title>
<link rel="stylesheet" type="text/css" href="css/main.css?nocache=<?php echo md5(microtime()) ?>"> <style type="text/css">
<?php include('css/main.css') ?>
</style>
<link rel="stylesheet" type="text/css" href="css/weather-icons.css"> <link rel="stylesheet" type="text/css" href="css/weather-icons.css">
<script type="text/javascript"> <script type="text/javascript">
var gitHash = '<?php echo trim(`git rev-parse HEAD`) ?>'; var gitHash = '<?php echo trim(`git rev-parse HEAD`) ?>';