Skip to content
GitLab
Commit ea51bb1e authored by Rafael Ostertag's avatar Rafael Ostertag
Browse files

Added qfq-jqw.css.less.

parent 411b079c
Hide whitespace changes
Inline Side-by-side
Gruntfile.js
View file @ ea51bb1e
...@@ -185,11 +185,30 @@ module.exports = function (grunt) { ...@@ -185,11 +185,30 @@ module.exports = function (grunt) {
dest: 'js/<%= pkg.name %>.debug.js' dest: 'js/<%= pkg.name %>.debug.js'
} }
}, },
less: {
production: {
files: {
"extension/Resources/Public/Css/qfq-jqw.css": "less/qfq-jqw.css.less"
},
options: {
compress: true
}
},
devel: {
files: {
"css/qfq-jqw.css": "less/qfq-jqw.css.less"
},
options: {
banner: "/* Change qfq-jqw.css.less, not qfq-jqw.css */"
}
}
},
watch: { watch: {
scripts: { scripts: {
files: [ files: [
'javascript/src/*.js', 'javascript/src/*.js',
'javascript/src/Helper/*.js' 'javascript/src/Helper/*.js',
'less/qfq-jqw.css.less'
], ],
tasks: [ 'default' ], tasks: [ 'default' ],
options: { options: {
...@@ -206,8 +225,9 @@ module.exports = function (grunt) { ...@@ -206,8 +225,9 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-less');
// Default task(s). // Default task(s).
grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'copy']); grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'copy', 'less']);
}; };
\ No newline at end of file
less/qfq-jqw.css.less 0 → 100644
View file @ ea51bb1e
#qfqAlertContainer {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
/*inline elements in horizontal mode are too much left*/
.form-horizontal .form-inline .form-group {
margin: 0;
}
.form-inline .control-label {
font-weight: normal;
}
\ No newline at end of file
mockup/alert.html
View file @ ea51bb1e
...@@ -4,15 +4,8 @@ ...@@ -4,15 +4,8 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<link rel="stylesheet" href="../css/bootstrap.min.css"> <link rel="stylesheet" href="../css/bootstrap.min.css">
<link rel="stylesheet" href="../css/bootstrap-theme.min.css"> <link rel="stylesheet" href="../css/bootstrap-theme.min.css">
<link rel="stylesheet" href="../css/qfq-jqw.css">
<title>Alert</title> <title>Alert</title>
<style>
#qfqAlertContainer {
position: absolute;
top: 100px;
left: 0;
}
</style>
</head> </head>
<body> <body>
...@@ -28,12 +21,24 @@ ...@@ -28,12 +21,24 @@
<script> <script>
$(function () { $(function () {
$('#showalert1').click(function () { $('#showalert1').click(function () {
var alert = new QfqNS.Alert("This is alert 1"); var alert = new QfqNS.Alert("This is alert 1", 'error', 'okcancel');
alert.addOkButtonHandler(function () {
console.log("OK button alert 1");
});
alert.addCancelButtonHandler(function () {
console.log("Cancel button alert 1");
});
alert.show(); alert.show();
}); });
$('#showalert2').click(function () { $('#showalert2').click(function () {
var alert = new QfqNS.Alert("This is alert 2"); var alert = new QfqNS.Alert("This is alert 2", 'warning');
alert.addOkButtonHandler(function () {
console.log("OK button alert 2");
});
alert.addCancelButtonHandler(function () {
console.log("Cancel button alert 2");
});
alert.show(); alert.show();
}); });
......
mockup/personmock.html
View file @ ea51bb1e
...@@ -9,18 +9,10 @@ ...@@ -9,18 +9,10 @@
<link rel="stylesheet" href="../css/bootstrap-theme.min.css"> <link rel="stylesheet" href="../css/bootstrap-theme.min.css">
<link rel="stylesheet" href="../css/jqx.base.css"> <link rel="stylesheet" href="../css/jqx.base.css">
<link rel="stylesheet" href="../css/jqx.darkblue.css"> <link rel="stylesheet" href="../css/jqx.darkblue.css">
<link rel="stylesheet" href="../css/qfq-jqw.css">
<title>Person Form Mockup</title> <title>Person Form Mockup</title>
<style>
/*inline elements in horizontal mode are too much left*/
.form-horizontal .form-inline .form-group {
margin: 0;
}
.form-inline .control-label {
font-weight: normal;
}
</style>
</head> </head>
<body> <body>
...@@ -946,6 +938,8 @@ ...@@ -946,6 +938,8 @@
tabsId: 'myTabs', tabsId: 'myTabs',
formId: 'myForm' formId: 'myForm'
}); });
QfqNS.Log.level = 0;
}); });
</script> </script>
</body> </body>
......
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