David A. Windham
david
/
lychee
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Fixed view.php

Tobias Reich 11 years ago
parent
e5f0e8138c
commit
27bdc7dbe6
5 changed files with 26 additions and 8 deletions
Unified View Show Diff Stats
  1. 1 0
      assets/min/frameworks.js
  2. 1 1
      assets/min/main.css
  3. 1 1
      assets/min/main.js
  4. 14 0
      build/Gruntfile.coffee
  5. 9 6
      view.php

File diff suppressed because it is too large
+ 1 - 0
assets/min/frameworks.js


File diff suppressed because it is too large
+ 1 - 1
assets/min/main.css


File diff suppressed because it is too large
+ 1 - 1
assets/min/main.js


+ 14 - 0
build/Gruntfile.coffee
View File 

@@ -6,6 +6,19 @@ module.exports = (grunt) ->
 
 
 
 		concat:
 
 		concat:
 
 
 
+			frameworks:
 
+
 
+				options:
 
+					separator: "\n"
 
+				src: [
 
+					'bower_components/jQuery/dist/jquery.min.js'
 
+					'bower_components/js-md5/js/md5.min.js'
 
+					'bower_components/mousetrap/mousetrap.min.js'
 
+					'bower_components/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js'
 
+					'../assets/js/_frameworks.js'
 
+				]
 
+				dest: '../assets/min/frameworks.js'
 
+
 
 			js:
 
 			js:
 
 				options:
 
 				options:
 
 					separator: "\n"
 
 					separator: "\n"
 
@@ -66,6 +79,7 @@ module.exports = (grunt) ->
 
 
 
 	grunt.registerTask 'default', ->
 
 	grunt.registerTask 'default', ->
 
 		grunt.task.run [
 
 		grunt.task.run [
 
+			'concat:frameworks'
 
 			'js'
 
 			'js'
 
 			'css'
 
 			'css'
 
 		]
 
 		]

+ 9 - 6
view.php
View File 

@@ -3,18 +3,21 @@
 
 	<head>
 
 	<head>
 
 
 
 		<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 
 		<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 
-		<title></title>
 
+		<title>Lychee</title>
 
 
 
-		<meta name="author" content="Tobias Reich, Philipp Maurer">
 
+		<meta name="author" content="Tobias Reich">
 
 		<meta name="keywords" content="">
 
 		<meta name="keywords" content="">
 
 		<meta name="description" content="">
 
 		<meta name="description" content="">
 
 
 
-		<link type="text/css" rel="stylesheet" href="assets/build/main.css">
 
+		<!-- CSS -->
 
+		<link type="text/css" rel="stylesheet" href="assets/min/main.css">
 
 
 
 		<link rel="shortcut icon" href="favicon.ico">
 
 		<link rel="shortcut icon" href="favicon.ico">
 
+		<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-iphone.png" sizes="120x120">
 
+		<link rel="apple-touch-icon" href="assets/img/apple-touch-icon-ipad.png" sizes="152x152">
 
 
 
-		<meta name="apple-mobile-web-app-status-bar-style" content="black" >
 
-		<meta name="viewport" content="user-scalable=no, initial-scale=1">
 
+		<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0">
 
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 
 		<meta name="apple-mobile-web-app-capable" content="yes">
 
 		<meta name="apple-mobile-web-app-capable" content="yes">
 
 
 
 		<?php
 
 		<?php
 
@@ -56,7 +59,7 @@
 
 	<div id="infobox"></div>
 
 	<div id="infobox"></div>
 
 
 
 	<!-- JS -->
 
 	<!-- JS -->
 
-	<script type="text/javascript" src="assets/js/_frameworks.js"></script>
 
+	<script type="text/javascript" src="assets/min/frameworks.js"></script>
 
 	<script type="text/javascript" src="assets/js/build.js"></script>
 
 	<script type="text/javascript" src="assets/js/build.js"></script>
 
 	<script type="text/javascript" src="assets/js/view/main.js"></script>
 
 	<script type="text/javascript" src="assets/js/view/main.js"></script>

Some files were not shown because too many files changed in this diff