Smaller Fixes

This commit is contained in:
jelhan 2014-07-06 18:06:25 +02:00
parent b066b8806c
commit 26828bb6f3
3 changed files with 108 additions and 87 deletions

View file

@ -1,104 +1,125 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Croodle</title>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Croodle</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- build:css(tmp/result) /assets/app.min.css -->
<link rel="stylesheet" href="/assets/app.css">
<!-- endbuild -->
<!-- build:css(tmp/result) /assets/app.min.css -->
<link rel="stylesheet" href="/assets/app.css">
<!-- endbuild -->
<!-- for more details visit: https://github.com/yeoman/grunt-usemin -->
<!-- build:js(tmp/result) /assets/config.min.js -->
<!-- for more details visit: https://github.com/yeoman/grunt-usemin -->
<script src="/config/environment.js"></script>
<!-- @if tests=false -->
<!-- build:js(tmp/result) /assets/config.min.js -->
<!-- @if dist=false -->
<script src="/config/environments/development.js"></script>
<!-- @endif --><!-- @if dist=true -->
<script src="/config/environments/production.js"></script>
<!-- @endif -->
<!-- @endif --><!-- @if tests=true -->
<script src="/config/environments/test.js"></script>
<!-- @endif -->
<!-- endbuild -->
<!-- build:js(tmp/result) /assets/vendor.min.js -->
<script src="/vendor/jquery/jquery.js"></script>
<script src="/config/environment.js"></script>
<!-- @if tests=false -->
<!-- @if dist=false -->
<script src="/vendor/handlebars/handlebars.js"></script>
<script src="/vendor/ember/ember.js"></script>
<script src="/config/environments/development.js"></script>
<!-- @endif -->
<!-- @if dist=true -->
<script src="/vendor/handlebars/handlebars.runtime.js"></script>
<script src="/vendor/ember/ember.prod.js"></script>
<script src="/config/environments/production.js"></script>
<!-- @endif -->
<script src="/vendor/ember-data/ember-data.js"></script>
<script src="/vendor/loader.js/loader.js"></script>
<script src="/vendor/ember-resolver/dist/ember-resolver.js"></script>
<script src="/vendor/ember-shim.js"></script>
<script src="/vendor/ic-ajax/dist/named-amd/main.js"></script>
<script src="/vendor/ember-load-initializers/ember-load-initializers.js"></script>
<script src="/vendor/ember-validations/index.js"></script>
<script src="/vendor/ember-forms/dist/ember_forms.js"></script>
<script src="/vendor/ember-data-extensions/dist/embedded-adapter.js"></script>
<script src="/vendor/moment/moment.js"></script>
<!-- @endif --><!-- @if tests=true -->
<script src="/config/environments/test.js"></script>
<!-- @endif -->
<!-- endbuild -->
<!-- endbuild -->
<!-- build:js(tmp/result) /assets/app.min.js -->
<!-- build:js(tmp/result) /assets/vendor.min.js -->
<script src="/assets/app.js"></script>
<script src="/assets/templates.js"></script>
<!-- endbuild -->
<script src="/vendor/jquery/jquery.js"></script>
<!-- @if dist=false -->
<style>
@keyframes domChanged { from { background: yellow; } }
@-webkit-keyframes domChanged { from { background: yellow; } }
.ember-view { animation: domChanged 1s; -webkit-animation: domChanged 1s; }
</style>
<script src="/vendor/handlebars/handlebars.js"></script>
<script src="/vendor/ember/ember.js"></script>
<!-- @endif -->
<!-- @if tests=true -->
<!-- @if dist=true -->
<script src="/vendor/handlebars/handlebars.runtime.js"></script>
<script src="/vendor/ember/ember.prod.js"></script>
<!-- @endif -->
<script src="/vendor/ember-data/ember-data.js"></script>
<script src="/vendor/loader.js/loader.js"></script>
<script src="/vendor/ember-resolver/dist/ember-resolver.js"></script>
<script src="/vendor/ember-shim.js"></script>
<link rel="stylesheet" href="/vendor/qunit/qunit/qunit.css">
<script src="/vendor/qunit/qunit/qunit.js"></script>
<script src="/vendor/qunit-shim.js"></script>
<script src="/vendor/ember-qunit/dist/named-amd/main.js"></script>
</head>
<body>
<!--[if lt IE 8]>
<p class="browsehappy">
You are using an <strong>outdated</strong> browser. Please
<a href="http://browsehappy.com/">upgrade your browser</a>
to improve your experience.
</p>
<![endif]-->
<script src="/vendor/ic-ajax/dist/named-amd/main.js"></script>
<script src="/vendor/ember-load-initializers/ember-load-initializers.js"></script>
<script src="/vendor/ember-validations/index.js"></script>
<script src="/vendor/ember-forms/dist/ember_forms.js"></script>
<script src="/vendor/ember-data-extensions/dist/embedded-adapter.js"></script>
<script src="/vendor/moment/moment.js"></script>
<!-- @if tests=true -->
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script src="/tests/tests.js"></script>
<script src="/tests/test-helper.js"></script>
<script src="/tests/test-loader.js"></script>
<script src="/testem.js"></script>
<!-- @endif -->
<!-- endbuild -->
<!-- @if tests=false -->
<script>
window.App = require('croodle/app')['default'].create(ENV.APP);
</script>
<!-- @endif -->
</body>
<!-- build:js(tmp/result) /assets/app.min.js -->
<script src="/assets/app.js"></script>
<script src="/assets/templates.js"></script>
<!-- endbuild -->
<!-- @if dist=false -->
<style>
@keyframes domChanged { from { background: yellow; } }
@-webkit-keyframes domChanged { from { background: yellow; } }
.ember-view { animation: domChanged 1s; -webkit-animation: domChanged 1s; }
</style>
<!-- @endif -->
<!-- @if tests=true -->
<script src="/vendor/ember-shim.js"></script>
<link rel="stylesheet" href="/vendor/qunit/qunit/qunit.css">
<script src="/vendor/qunit/qunit/qunit.js"></script>
<script src="/vendor/qunit-shim.js"></script>
<script src="/vendor/ember-qunit/dist/named-amd/main.js"></script>
<style>
#ember-testing-container {
position: absolute;
background: white;
bottom: 0;
right: 0;
width: 640px;
height: 384px;
overflow: auto;
z-index: 9999;
border: 1px solid #ccc;
}
#ember-testing {
zoom: 50%;
}
</style>
<!-- @endif -->
</head>
<body>
<!--[if lt IE 8]>
<p class="browsehappy">
You are using an <strong>outdated</strong> browser. Please
<a href="http://browsehappy.com/">upgrade your browser</a>
to improve your experience.
</p>
<![endif]-->
<!-- @if tests=true -->
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<script src="/tests/tests.js"></script>
<script src="/tests/test-helper.js"></script>
<script src="/tests/test-loader.js"></script>
<script src="/testem.js"></script>
<!-- @endif -->
<!-- @if tests=false -->
<script>
window.App = require('croodle/app')['default'].create(ENV.APP);
</script>
<!-- @endif -->
</body>
</html>

View file

@ -1,11 +1,11 @@
{
"name": "croodle",
"dependencies": {
"handlebars": "~1.1.2",
"jquery": "~1.9.1",
"handlebars": "~1.3.0",
"jquery": "~1.10.2",
"qunit": "~1.12.0",
"ember-qunit": "https://github.com/rpflorence/ember-qunit.git#master",
"ember": "~1.5.0",
"ember": "~1.6.0-beta.5",
"ember-data": "~1.0.0-beta.7",
"ember-resolver": "~0.1.1",
"ic-ajax": "~1.0.4",
@ -14,7 +14,7 @@
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
"moment": "~2.7.0",
"sjcl": "~1.0.0",
"ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/tags/1-0-beta-2/ember-validations.min.js",
"ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/tags/1-0-beta-2/ember-validations.js",
"bootstrap": "~3.2.0",
"bootstrap-datepicker": "~1.3.0",
"ember-forms": "*",

View file

@ -3,7 +3,7 @@
<type>org.netbeans.modules.php.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/php-project/1">
<name>croodle EAK</name>
<name>croodle</name>
</data>
</configuration>
</project>