fix wrong css file sequence generation with grunt, add bootstrap-select (not used yet) (#329)

This commit is contained in:
FrancescoUK
2016-02-19 23:26:23 +00:00
parent 7236902143
commit fc20b74b57
6 changed files with 9577 additions and 7837 deletions

View File

@@ -22,7 +22,7 @@ module.exports = function(grunt) {
cssmin: {
target: {
files: {
'dist/<%= pkg.name %>.min.css': ['dist/opensourcepos_bower.css', 'css/*.css', '!css/login.css']
'dist/<%= pkg.name %>.min.css': ['dist/opensourcepos_bower.css', 'css/autocomplete.css', 'css/general.css', 'css/invoice.css', 'css/popupbox.css', 'css/receipt.css', 'css/register.css', 'css/reports.css', 'css/tables.css', 'css/ospos.css', 'css/ospos_print.css']
}
}
},
@@ -75,7 +75,7 @@ module.exports = function(grunt) {
closeTag: '<!-- end css template tags -->',
absolutePath: true
},
src: [ 'css/*.css' ],
src: [ 'css/autocomplete.css', 'css/general.css', 'css/invoice.css', 'css/popupbox.css', 'css/receipt.css', 'css/register.css', 'css/reports.css', 'css/tables.css', 'css/ospos.css', 'css/ospos_print.css' ],
dest: 'application/views/partial/header.php'
},
mincss: {

View File

@@ -15,18 +15,15 @@
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/autocomplete.css"/>
<link rel="stylesheet" type="text/css" href="css/barcode_font.css"/>
<link rel="stylesheet" type="text/css" href="css/general.css"/>
<link rel="stylesheet" type="text/css" href="css/invoice.css"/>
<link rel="stylesheet" type="text/css" href="css/invoice_email.css"/>
<link rel="stylesheet" type="text/css" href="css/login.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css"/>
<link rel="stylesheet" type="text/css" href="css/popupbox.css"/>
<link rel="stylesheet" type="text/css" href="css/receipt.css"/>
<link rel="stylesheet" type="text/css" href="css/register.css"/>
<link rel="stylesheet" type="text/css" href="css/reports.css"/>
<link rel="stylesheet" type="text/css" href="css/tables.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos_print.css"/>
<!-- end css template tags -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
@@ -59,10 +56,10 @@
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<![endif]-->
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=4991d0840f"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b8ab5fe79a"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=f57ef65f75" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a2d02c8660" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>

17346
dist/opensourcepos.js vendored
View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

@@ -38,7 +38,7 @@
<!-- end js template tags -->
<?php else : ?>
<!-- start minjs template tags -->
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=f57ef65f75" language="javascript"></script>
<script type="text/javascript" src="dist/opensourcepos.min.js?rel=a2d02c8660" language="javascript"></script>
<!-- end minjs template tags -->
<?php endif; ?>