Skip to content

GitLab

Commit f4b213b9 authored by Carsten Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/raos_work' into crose_work

parents 210a2881 73e41ca4
Hide whitespace changes
Inline Side-by-side
Gruntfile.js
View file @ f4b213b9
......@@ -4,6 +4,7 @@ module.exports = function (grunt) {
var typo3_fonts = 'extension/Resources/Public/fonts/';
var js_sources = [
'javascript/src/Helper/*.js',
'javascript/src/Element/*.js',
'javascript/src/*.js'
];
......@@ -193,7 +194,8 @@ module.exports = function (grunt) {
less: {
production: {
files: {
"extension/Resources/Public/Css/qfq-jqw.css": "less/qfq-jqw.css.less"
"extension/Resources/Public/Css/qfq-bs.css": "less/qfq-bs.css.less",
"extension/Resources/Public/Css/qfq-plain.css": "less/qfq-plain.css.less"
},
options: {
compress: true
......@@ -201,10 +203,11 @@ module.exports = function (grunt) {
},
devel: {
files: {
"css/qfq-jqw.css": "less/qfq-jqw.css.less"
"css/qfq-bs.css": "less/qfq-bs.css.less",
"css/qfq-plain.css": "less/qfq-plain.css.less"
},
options: {
banner: "/* Change qfq-jqw.css.less, not qfq-jqw.css */"
banner: "/* Change qfq-bs.css.less, not qfq-bs.css */"
}
}
},
......@@ -216,7 +219,7 @@ module.exports = function (grunt) {
'js/jquery.min.js',
'js/bootstrap.min.js',
'js/jqx-all.js',
'js/qfq-jqw.debug.js'
'js/qfq.debug.js'
],
helpers: ['tests/jasmine/helper/mock-ajax.js'],
template: 'tests/jasmine/SpecRunner.tmpl'
......@@ -228,7 +231,8 @@ module.exports = function (grunt) {
files: [
'javascript/src/*.js',
'javascript/src/Helper/*.js',
'less/qfq-jqw.css.less'
'javascript/src/Element/*.js',
'less/qfq-bs.css.less'
],
tasks: [ 'default' ],
options: {
......
mockup/alert.html
View file @ f4b213b9
......@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<link rel="stylesheet" href="../css/bootstrap.min.css">
<link rel="stylesheet" href="../css/bootstrap-theme.min.css">
<link rel="stylesheet" href="../css/qfq-jqw.css">
<link rel="stylesheet" href="../css/qfq-bs.css">
<title>Alert</title>
</head>
<body>
......@@ -16,7 +16,7 @@
<script src="../js/jquery.min.js"></script>
<script src="../js/bootstrap.min.js"></script>
<script src="../js/qfq-jqw.debug.js"></script>
<script src="../js/qfq.debug.js"></script>
<script>
$(function () {
......
mockup/emptyqfqpage.html
View file @ f4b213b9
......@@ -11,7 +11,7 @@
<script src="../js/jquery.min.js"></script>
<script src="../js/bootstrap.min.js"></script>
<script src="../js/jqx-all.js"></script>
<script src="../js/qfq-jqw.debug.js"></script>
<script src="../js/qfq.debug.js"></script>
<script type="text/javascript">
var qfqPage = new QfqNS.QfqPage({
tabsId: 'myTabs',
......
mockup/form.html
View file @ f4b213b9
......@@ -34,7 +34,7 @@
</form>
<script src="../js/jquery.min.js"></script>
<script src="../js/qfq-jqw.debug.js"></script>
<script src="../js/qfq.debug.js"></script>
<script>
$(function () {
......
mockup/navstate.html
View file @ f4b213b9
......@@ -143,7 +143,7 @@
<script src="../packages/jquery/js/jquery.min.js"></script>
<script src="../packages/bootstrap/js/bootstrap.min.js"></script>
<script src="../packages/jqwidgets/js/jqx-all.js"></script>
<script src="../js/qfq-jqw.debug.js"></script>
<script src="../js/qfq.debug.js"></script>
<script type="text/javascript">
$(function () {
'use strict';
......
package.json
View file @ f4b213b9
{
"name": "qfq-jqw",
"name": "qfq",
"version": "0.1.0",
"devDependencies": {
"bootlint": "^0.14.2",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment