From 1f1b9c47ece7ce09d6a3d3571e605c1fb50b491f Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Wed, 9 Mar 2016 14:24:16 +0000 Subject: [PATCH] remove extra barcode font styling, set directly the correct size as of barcode_config (#116) --- application/views/barcodes/barcode_sheet.php | 16 +++++---------- css/barcode_font.css | 21 +++++++++++--------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/application/views/barcodes/barcode_sheet.php b/application/views/barcodes/barcode_sheet.php index 6f4cb4cbc..a3c349c93 100644 --- a/application/views/barcodes/barcode_sheet.php +++ b/application/views/barcodes/barcode_sheet.php @@ -1,21 +1,15 @@ - + + <?php echo $this->lang->line('items_generate_barcodes'); ?> - -barcode_lib->get_font_name($barcode_config['barcode_font']); ?> - style="font-size:px"> +barcode_lib->get_font_name($barcode_config['barcode_font']); ?> + style="font-size:px"> width='' > '; } - echo ""; + echo ''; $count++; } ?> diff --git a/css/barcode_font.css b/css/barcode_font.css index 70f604f5f..6c7fffe0b 100644 --- a/css/barcode_font.css +++ b/css/barcode_font.css @@ -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; -} - +} \ No newline at end of file
" . $this->barcode_lib->display_barcode($item, $barcode_config) . "' . $this->barcode_lib->display_barcode($item, $barcode_config) . '