diff --git a/.gitignore b/.gitignore index a3c85616..8bb784d1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,8 @@ db.sqlite db.sqlite-journal public_html/media/js/jquery.tagit.js public_html/media/css/jquery.tagit.css +public_html/media/js/jquery.min.js +public_html/media/js/jquery-ui.min.js +public_html/media/css/jquery-ui.css +public_html/media/fonts/DroidSans-Bold.ttf +public_html/media/fonts/DroidSans.ttf diff --git a/init.php b/init.php index c155b79e..275db2a3 100644 --- a/init.php +++ b/init.php @@ -7,5 +7,17 @@ function download($source, $destination) file_put_contents($destination, $content); } -download('http://raw.github.com/aehlke/tag-it/master/css/jquery.tagit.css', './public_html/media/css/jquery.tagit.css'); -download('http://raw.github.com/aehlke/tag-it/master/js/tag-it.min.js', './public_html/media/js/jquery.tagit.js'); +$path = './public_html/'; + +//jQuery +download('http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js', $path . 'media/js/jquery.min.js'); +download('http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js', $path . 'media/js/jquery-ui.min.js'); +download('http://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/flick/jquery-ui.css', $path . 'media/css/jquery-ui.css'); + +//jQuery Tag-it! +download('http://raw.github.com/aehlke/tag-it/master/css/jquery.tagit.css', $path . 'media/css/jquery.tagit.css'); +download('http://raw.github.com/aehlke/tag-it/master/js/tag-it.min.js', $path . 'media/js/jquery.tagit.js'); + +//fonts +download('http://googlefontdirectory.googlecode.com/hg/apache/droidsans/DroidSans.ttf', $path . 'media/fonts/DroidSans.ttf'); +download('http://googlefontdirectory.googlecode.com/hg/apache/droidsans/DroidSans-Bold.ttf', $path . 'media/fonts/DroidSans-Bold.ttf'); diff --git a/public_html/media/css/core.css b/public_html/media/css/core.css index 249f83b8..bed1ac8f 100644 --- a/public_html/media/css/core.css +++ b/public_html/media/css/core.css @@ -1,3 +1,17 @@ +@font-face { + font-family: 'Droid Sans'; + font-style: normal; + font-weight: 400; + src: local('Droid Sans'), local('DroidSans'), url(../fonts/DroidSans.ttf) format('truetype'); +} + +@font-face { + font-family: 'Droid Sans'; + font-style: normal; + font-weight: 700; + src: local('Droid Sans Bold'), local('DroidSans-Bold'), url(../fonts/DroidSans-Bold.ttf) format('truetype'); +} + body { background: white; color: black; diff --git a/public_html/media/fonts/.gitignore b/public_html/media/fonts/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/public_html/media/fonts/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml index 6e4fc657..75dfac9f 100644 --- a/src/Views/layout-normal.phtml +++ b/src/Views/layout-normal.phtml @@ -10,10 +10,6 @@ context->stylesheets as $name): ?> - - - - context->scripts as $name): ?>