NoLog.cz/decide.nolog.cz
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Smaller Fixes

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/index.html
View file

@ -1,10 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Croodle</title> <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 --> <!-- build:css(tmp/result) /assets/app.min.css -->
<link rel="stylesheet" href="/assets/app.css"> <link rel="stylesheet" href="/assets/app.css">
@ -19,7 +20,8 @@
<!-- @if dist=false --> <!-- @if dist=false -->
<script src="/config/environments/development.js"></script> <script src="/config/environments/development.js"></script>
<!-- @endif --><!-- @if dist=true --> <!-- @endif -->
<!-- @if dist=true -->
<script src="/config/environments/production.js"></script> <script src="/config/environments/production.js"></script>
<!-- @endif --> <!-- @endif -->
@ -75,9 +77,27 @@
<script src="/vendor/qunit/qunit/qunit.js"></script> <script src="/vendor/qunit/qunit/qunit.js"></script>
<script src="/vendor/qunit-shim.js"></script> <script src="/vendor/qunit-shim.js"></script>
<script src="/vendor/ember-qunit/dist/named-amd/main.js"></script> <script src="/vendor/ember-qunit/dist/named-amd/main.js"></script>
</head>
<body>
<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]> <!--[if lt IE 8]>
<p class="browsehappy"> <p class="browsehappy">
You are using an <strong>outdated</strong> browser. Please You are using an <strong>outdated</strong> browser. Please
@ -100,5 +120,6 @@
window.App = require('croodle/app')['default'].create(ENV.APP); window.App = require('croodle/app')['default'].create(ENV.APP);
</script> </script>
<!-- @endif --> <!-- @endif -->
</body>
</body>
</html> </html>

8
bower.json
View file

@ -1,11 +1,11 @@
{ {
"name": "croodle", "name": "croodle",
"dependencies": { "dependencies": {
"handlebars": "~1.1.2", "handlebars": "~1.3.0",
"jquery": "~1.9.1", "jquery": "~1.10.2",
"qunit": "~1.12.0", "qunit": "~1.12.0",
"ember-qunit": "https://github.com/rpflorence/ember-qunit.git#master", "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-data": "~1.0.0-beta.7",
"ember-resolver": "~0.1.1", "ember-resolver": "~0.1.1",
"ic-ajax": "~1.0.4", "ic-ajax": "~1.0.4",
@ -14,7 +14,7 @@
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1", "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
"moment": "~2.7.0", "moment": "~2.7.0",
"sjcl": "~1.0.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": "~3.2.0",
"bootstrap-datepicker": "~1.3.0", "bootstrap-datepicker": "~1.3.0",
"ember-forms": "*", "ember-forms": "*",

2
nbproject/project.xml
View file

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