remove extra barcode font styling, set directly the correct size as of barcode_config (#116)

This commit is contained in:
FrancescoUK
2016-03-09 14:24:16 +00:00
parent ceac184c30
commit 1f1b9c47ec
2 changed files with 17 additions and 20 deletions

View File

@@ -1,21 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<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" />
<style type="text/css" >
*
{
font-size: 12px;
}
</style>
</head>
<body class=<?php echo "font_".$this->barcode_lib->get_font_name($barcode_config['barcode_font']); ?>
style="font-size:<?php echo $barcode_config['barcode_font_size'] + 5; //5 is size offset for font in display label?>px">
<body class=<?php echo "font_".$this->barcode_lib->get_font_name($barcode_config['barcode_font']); ?>
style="font-size:<?php echo $barcode_config['barcode_font_size']; ?>px">
<table cellspacing=<?php echo $barcode_config['barcode_page_cellspacing']; ?> width='<?php echo $barcode_config['barcode_page_width']."%"; ?>' >
<tr>
<?php
@@ -26,7 +20,7 @@
{
echo '</tr><tr>';
}
echo "<td>" . $this->barcode_lib->display_barcode($item, $barcode_config) . "</td>";
echo '<td>' . $this->barcode_lib->display_barcode($item, $barcode_config) . '</td>';
$count++;
}
?>

View File

@@ -1,11 +1,12 @@
@font-face
{
font-family:'SansationLight';
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_SansationLight
{
font-family: 'SansationLight' !important;
}
@@ -16,29 +17,31 @@
src: local('Arial'), url('../fonts/Arial.woff') format('woff'), url('../fonts/Arial.ttf') format('truetype');
}
.font_Arial {
.font_Arial
{
font-family: 'Arial' !important;
}
@font-face
{
font-family:'JUNEBUG';
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_JUNEBUG
{
font-family: 'JUNEBUG' !important;
}
@font-face
{
font-family:'b-de-bonita-shadow';
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_b-de-bonita-shadow
{
font-family: 'b-de-bonita-shadow' !important;
}
}