Merge pull request #137 from gburton/initial_changes

haraldpdl · haraldpdl · commit 438e2d0f526a · 2014-07-24T17:48:23.000+02:00
Bugfix + Future Stylesheets
diff --git a/catalog/custom.css b/catalog/custom.css
@@ -0,0 +1,3 @@
+/* DO NOT CHANGE THIS FILE -------------------------------------------------- */
+/* TO OVER-RIDE ANY ASPECT OF THIS CSS, AMEND THE user.css FILE ------------- */
+
diff --git a/catalog/includes/template_top.php b/catalog/includes/template_top.php
@@ -56,6 +56,11 @@
 
 <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 
+<!-- Custom -->
+<link href="custom.css" rel="stylesheet">
+<!-- Custom -->
+<link href="user.css" rel="stylesheet">
+ 
 <?php echo $oscTemplate->getBlocks('header_tags'); ?>
 </head>
 <body>
diff --git a/catalog/product_info.php b/catalog/product_info.php
@@ -59,7 +59,7 @@
 <?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_PRODUCT_INFO, tep_get_all_get_params(array('action')) . 'action=add_product')); ?>
 
 <div class="page-header">
-  <h1 class="pull-right><?php echo $products_price; ?></h1>
+  <h1 class="pull-right"><?php echo $products_price; ?></h1>
   <h1><?php echo $products_name; ?></h1>
 </div>
 
diff --git a/catalog/user.css b/catalog/user.css
@@ -0,0 +1,2 @@
+/* FOR USER CHANGES TO THE BASE CSS ----------------------------------------- */
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/* DO NOT CHANGE THIS FILE -------------------------------------------------- */`
	`2`	`+/* TO OVER-RIDE ANY ASPECT OF THIS CSS, AMEND THE user.css FILE ------------- */`
	`3`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/* FOR USER CHANGES TO THE BASE CSS ----------------------------------------- */`
	`2`	`+`