Store all used stylesheets in dist dir, don't rely on css dir (#409)

This commit is contained in:
FrancescoUK
2016-08-10 10:00:42 +01:00
parent 333067955c
commit 28e776248b
9 changed files with 165 additions and 64 deletions

View File

@@ -31,6 +31,8 @@ module.exports = function(grunt) {
files: {
'login.css': '../css/login.css',
'style.css': '../css/style.css',
'invoice_email.css': '../css/invoice_email.css',
'barcode_font.css': '../css/barcode_font.css',
'jquery-ui.css': 'jquery-ui/themes/base/jquery-ui.css',
'cerulean/bootstrap.min.css': 'bootswatch/cerulean/bootstrap.min.css',
'cosmo/bootstrap.min.css': 'bootswatch/cosmo/bootstrap.min.css',
@@ -61,7 +63,7 @@ module.exports = function(grunt) {
cssmin: {
target: {
files: {
'dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'css/*.css', '!css/login.css', '!css/invoice_email.css', '!css/style.css']
'dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'css/*.css', '!css/login.css', '!css/invoice_email.css', '!css/barcode_font.css', '!css/style.css']
}
}
},
@@ -114,7 +116,7 @@ module.exports = function(grunt) {
closeTag: '<!-- end css template tags -->',
absolutePath: true
},
src: ['css/*.css', '!css/login.css', '!css/invoice_email.css'],
src: ['css/*.css', '!css/login.css', '!css/invoice_email.css', '!css/barcode_font.css'],
dest: 'application/views/partial/header_debug.php',
},
mincss_header: {
@@ -124,7 +126,7 @@ module.exports = function(grunt) {
closeTag: '<!-- end mincss template tags -->',
absolutePath: true
},
src: ['dist/*.css', '!dist/login.css'],
src: ['dist/*.css', '!dist/login.css', '!dist/invoice_email.css', '!dist/barcode_font.css'],
dest: 'application/views/partial/header.php',
},
css_login: {

View File

@@ -5,7 +5,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title><?php echo $this->lang->line('items_generate_barcodes'); ?></title>
<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/barcode_font.css" />
<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>dist/barcode_font.css" />
</head>
<body class=<?php echo "font_".$this->barcode_lib->get_font_name($barcode_config['barcode_font']); ?>

View File

@@ -9,12 +9,12 @@
<?php $this->load->view('partial/header_debug'); ?>
<?php else : ?>
<!--[if lte IE 8]>
<link rel="stylesheet" media="print" href="css/print.css" type="text/css" />
<link rel="stylesheet" media="print" href="dist/print.css" type="text/css" />
<![endif]-->
<link rel="stylesheet" type="text/css" href=<?php echo 'dist/' . $this->config->item('theme') . '/bootstrap.min.css' ?>/>
<!-- start mincss template tags -->
<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=b003b9c4a3"/>
<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=e884819322"/>
<link rel="stylesheet" type="text/css" href="dist/style.css"/>
<!-- end mincss template tags -->
<!-- start minjs template tags -->

View File

@@ -10,7 +10,6 @@
<link rel="stylesheet" href="bower_components/chartist-plugin-tooltip/dist/chartist-plugin-tooltip.css" />
<!-- endbower -->
<!-- start css template tags -->
<link rel="stylesheet" type="text/css" href="css/barcode_font.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap.autocomplete.css"/>
<link rel="stylesheet" type="text/css" href="css/invoice.css"/>
<link rel="stylesheet" type="text/css" href="css/ospos.css"/>

View File

@@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>css/invoice_email.css"/>
<link rel="stylesheet" rev="stylesheet" href="<?php echo base_url();?>dist/invoice_email.css"/>
</head>
<body>

47
dist/barcode_font.css vendored Normal file
View File

@@ -0,0 +1,47 @@
@font-face
{
font-family: 'SansationLight';
src: url('../fonts/SansationLight.eot');
src: local('SansationLight'), url('../fonts/SansationLight.woff') format('woff'), url('../fonts/SansationLight.ttf') format('truetype');
}
.font_SansationLight
{
font-family: 'SansationLight' !important;
}
@font-face
{
font-family:'Arial';
src: url('../fonts/Arial.eot');
src: local('Arial'), url('../fonts/Arial.woff') format('woff'), url('../fonts/Arial.ttf') format('truetype');
}
.font_Arial
{
font-family: 'Arial' !important;
}
@font-face
{
font-family: 'JUNEBUG';
src: url('../fonts/JUNEBUG.eot');
src: local('JUNEBUG'), url('../fonts/JUNEBUG.woff') format('woff'), url('../fonts/JUNEBUG.ttf') format('truetype');
}
.font_JUNEBUG
{
font-family: 'JUNEBUG' !important;
}
@font-face
{
font-family: 'b-de-bonita-shadow';
src: url('../fonts/b-de-bonita-shadow.eot');
src: local('JUNEBUG'), url('../fonts/b-de-bonita-shadow.woff') format('woff'), url('../fonts/b-de-bonita-shadow.ttf') format('truetype');
}
.font_b-de-bonita-shadow
{
font-family: 'b-de-bonita-shadow' !important;
}

53
dist/invoice_email.css vendored Normal file
View File

@@ -0,0 +1,53 @@
/*
CSS-Tricks Example
by Chris Coyier
http://css-tricks.com
*/
#menubar, #footer { display: none; }
* { margin: 0; padding: 0; }
body { font-family: Helvetica; font-size: 13px; }
#page-wrap { width: 750px; margin: 0 auto; }
pre { font-family: Helvetica; font-size: 13px; }
#page-wrap { font-family: Helvetica; }
#page-wrap table { border-collapse: collapse; }
#page-wrap table#items td { padding: 10px; }
#page-wrap #meta table td, #page-wrap table th { border: 1px solid black; padding: 5px; }
#header { height: 30px; width: 100%; margin: 20px 0; background-color: #222222; text-align: center; color: white; font-weight: bold; font-size: 26px; letter-spacing: 4px; padding: 8px 0px; }
/* first row */
#info { width: 100%; margin: 10px 0 30px 0; }
#logo { width: 50%; text-align: left; border: 1px solid #ffffff; overflow: hidden; }
#image { height: 120px; width: 163px; }
#logoctr { display: none; }
#logo:hover #logoctr, #logo.edit #logoctr { display: block; text-align: right; line-height: 25px; background: #eee; padding: 0 5px; }
#logohelp { text-align: left; display: none; font-style: italic; padding: 10px 5px;}
#logohelp input { margin-bottom: 5px; }
.edit #logohelp { display: block; }
.edit #save-logo, .edit #cancel-logo { display: inline; }
.edit #image, #save-logo, #cancel-logo, .edit #change-logo, .edit #delete-logo { display: none; }
#customer-title { text-align: right; }
#terms div { width: 100%; text-align: center; margin-bottom: 10px;}
/* second row */
#company-title { width: 50%; padding-left: 20px; }
#meta td { text-align: right; }
#meta td.meta-head { text-align: left; background: #eee; }
#items { width: 100%; border: 1px solid black; }
#items th { background: #eee; }
#items tr.item-row td { border: 0; vertical-align: top; }
#items td.description { width: 300px; }
#items td.item-name { width: 175px; }
#items td.total-line { text-align: right; border-width: 1px 0 1px 1px; border-style: solid; }
#items td.total-value { text-align: right; border-width: 1px 0px 1px 0; border-style: solid; }
#items td.centered-value { text-align: center; }
#items td.balance { background: #eeeee; }
#items td.blank { border: 0; }
#terms { text-align: center; margin: 20px 0; }
#terms h5 { border-bottom: 1px solid black; font: 13px Helvetica, Sans-Serif; padding: 8px 0; margin: 8px 0; line-height: 1.3em; }
.delete-wpr { position: relative; }
.delete { display: block; color: #000; text-decoration: none; position: absolute; background: #EEEEEE; font-weight: bold; padding: 0px 3px; border: 1px solid; top: -6px; left: -22px; font-family: Verdana; font-size: 12px; }

View File

File diff suppressed because one or more lines are too long

View File

@@ -1,61 +1,61 @@
{
"jquery-form@3.45.0": {
"licenses": "UNKNOWN"
},
"chartist@undefined": {
"licenses": "UNKNOWN"
},
"bootstrap-select@undefined": {
"licenses": [
"MIT"
],
"homepage": "http://silviomoreto.github.io/bootstrap-select"
},
"jquery-form@3.45.0": {
"licenses": "UNKNOWN"
"jquery@undefined": {
"licenses": [
"MIT"
]
},
"bootstrap3-dialog@1.35.2": {
"licenses": "UNKNOWN",
"homepage": "http://nakupanda.github.io/bootstrap3-dialog/"
},
"chartist@undefined": {
"licenses": "UNKNOWN"
},
"file-saver.js@1.20150507.2": {
"chartist-plugin-tooltip@undefined": {
"licenses": [
"LICENSE.md"
],
"homepage": "https://github.com/Teleborder/FileSaver.js"
"MIT*"
]
},
"tableExport.jquery.plugin@undefined": {
"licenses": [
"MIT"
]
},
"js-cookie@undefined": {
"licenses": [
"MIT"
]
},
"chartist-plugin-pointlabels@0.0.4": {
"licenses": [
"WTF*"
]
},
"chartist-plugin-axistitle@0.0.1": {
"licenses": [
"WTF*"
]
},
"chartist-plugin-pointlabels@0.0.4": {
"licenses": [
"WTF*"
]
},
"js-cookie@undefined": {
"licenses": [
"MIT"
]
},
"file-saver.js@1.20150507.2": {
"licenses": [
"LICENSE.md"
],
"homepage": "https://github.com/Teleborder/FileSaver.js"
},
"moment@undefined": {
"licenses": [
"MIT*"
]
},
"chartist-plugin-tooltip@undefined": {
"licenses": [
"MIT*"
]
},
"jquery@undefined": {
"licenses": [
"MIT"
]
},
"bootswatch@undefined": {
"licenses": [
"MIT"
@@ -72,6 +72,12 @@
],
"homepage": "https://github.com/mrrio/jspdf"
},
"jquery-ui@1.11.4": {
"licenses": [
"MIT"
],
"repository": "https://github.com/jquery/jquery-ui"
},
"smalot-bootstrap-datetimepicker@undefined": {
"licenses": [
"Apache 2.0",
@@ -79,13 +85,6 @@
],
"repository": "https://github.com/smalot/bootstrap-datetimepicker"
},
"jasny-bootstrap@3.1.3": {
"licenses": [
"Apache-2.0",
"Apache*"
],
"repository": "git+https://github.com/jasny/bootstrap"
},
"jquery-validation@1.13.1": {
"licenses": [
"MIT"
@@ -93,12 +92,6 @@
"repository": "https://github.com/jzaefferer/jquery-validation",
"homepage": "http://jqueryvalidation.org/"
},
"jquery-ui@1.11.4": {
"licenses": [
"MIT"
],
"repository": "https://github.com/jquery/jquery-ui"
},
"remarkable-bootstrap-notify@3.1.3": {
"licenses": [
"MIT"
@@ -106,12 +99,6 @@
"homepage": "http://bootstrap-notify.remabledesigns.com/",
"repository": "https://github.com/mouse0270/bootstrap-notify"
},
"bootstrap-daterangepicker@undefined": {
"licenses": [
"MIT"
],
"repository": "git+https://github.com/dangrossman/bootstrap-daterangepicker"
},
"bootstrap-table@undefined": {
"licenses": [
"MIT"
@@ -119,24 +106,37 @@
"homepage": "https://github.com/wenzhixin/bootstrap-table",
"repository": "git+https://github.com/wenzhixin/bootstrap-table"
},
"bootstrap-daterangepicker@undefined": {
"licenses": [
"MIT"
],
"repository": "git+https://github.com/dangrossman/bootstrap-daterangepicker"
},
"jasny-bootstrap@3.1.3": {
"licenses": [
"Apache-2.0",
"Apache*"
],
"repository": "git+https://github.com/jasny/bootstrap"
},
"html2canvas@0.4.1": {
"licenses": [
"MIT"
],
"repository": "git+ssh://git@github.com/niklasvh/html2canvas"
},
"bootstrap@undefined": {
"licenses": [
"MIT"
],
"homepage": "http://getbootstrap.com",
"repository": "git+https://github.com/twbs/bootstrap"
},
"jspdf-autotable@undefined": {
"licenses": [
"MIT"
],
"homepage": "https://github.com/simonbengtsson/jspdf-autotable",
"repository": "git+https://github.com/simonbengtsson/jsPDF-AutoTable"
},
"bootstrap@undefined": {
"licenses": [
"MIT"
],
"homepage": "http://getbootstrap.com",
"repository": "git+https://github.com/twbs/bootstrap"
}
}