// start css refactor + optimisation

themes/default-bootstrap/config.rb

@@ -15,7 +15,7 @@ environment = :development
 # relative_assets = true
 
 # To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
+line_comments = false
 color_output = false
 
 # If you prefer the indented syntax, you might want to regenerate this

themes/default-bootstrap/header.tpl

@@ -45,14 +45,12 @@
 		<link rel="icon" type="image/vnd.microsoft.icon" href="{$favicon_url}?{$img_update_time}" />
 		<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
 
-		<link rel="stylesheet" href="{$css_dir}highdpi.css" type="text/css" media="screen" />
+		<!-- <link rel="stylesheet" href="{$css_dir}highdpi.css" type="text/css" media="screen" /> -->
-		<link rel="stylesheet" href="{$css_dir}bootstrap_lib/bootstrap.css" type="text/css" media="all" />
+
-		<link rel="stylesheet" href="{$css_dir}font-awesome.css" type="text/css" media="all" />
 		<link rel="stylesheet" href="{$css_dir}jquery/uniform.default.css" type="text/css" media="all" />
 		<link rel="stylesheet" href="{$css_dir}jquery/footable.core.css" type="text/css" media="all" />
 		<link rel="stylesheet" href="{$css_dir}jquery/jquery.bxslider.css" type="text/css" media="all" />
 
-		<link rel='stylesheet' href='//fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic'  type='text/css' />
 		{if isset($css_files)}
 			{foreach from=$css_files key=css_uri item=media}
 				<link rel="stylesheet" href="{$css_uri}" type="text/css" media="{$media}" />
@@ -103,12 +101,10 @@
 			</div>
 		{/if}
 		<div id="page">
-			<!-- Header -->
 			<div class="header-container">
 				<header id="header">
 					<div class="header-row">
 						<nav class="container clearfix">
-							 
 							<div id="header_user_info">
 								{if $logged}
 									<a class="logout" href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" rel="nofollow" title="{l s='Log me out'}">{l s='Sign out'}</a>
@@ -182,13 +178,13 @@
 							{/if}
 							<div id="contact-link">
 								<a href="{$link->getPageLink('contact', true)|escape:'html'}" title="{l s='contact'}">{l s='Contact Us'}</a>
-							</div> <!-- #contact-link -->
+							</div>
 						   {if $shop_phone}
 								<span class="shop-phone">
 									<i class="icon-phone"></i>{l s='Call us now toll free:'} <strong>{$shop_phone}</strong>
 								</span>
 							{/if}
-						</nav><!-- .container-row -->
+						</nav>
 					</div> <!-- .header-row -->
 					<div class="container header-row-2">
 						<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
@@ -198,7 +194,7 @@
 							{$HOOK_TOP}
 						</div>
 					</div> <!-- .header-row-2 -->
-				</header> <!-- #header -->
+				</header>
 			</div> <!-- .header-container -->
 			<div class="columns-container">
 				<div id="columns" class="container">

themes/default-bootstrap/sass/_bootstrap.scss

@@ -0,0 +1,59 @@
+/*!
+ * Bootstrap v3.0.0
+ *
+ * Copyright 2013 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+// Core variables and mixins
+@import "bootstrap_lib/variables";
+@import "bootstrap_lib/mixins";
+
+// Reset
+@import "bootstrap_lib/normalize";
+//@import "bootstrap_lib/print";
+
+// Core CSS
+@import "bootstrap_lib/scaffolding";
+@import "bootstrap_lib/type";
+@import "bootstrap_lib/code";
+@import "bootstrap_lib/grid";
+@import "bootstrap_lib/tables";
+@import "bootstrap_lib/forms";
+@import "bootstrap_lib/buttons";
+
+// Components
+@import "bootstrap_lib/component-animations";
+//@import "bootstrap_lib/glyphicons";
+@import "bootstrap_lib/dropdowns";
+@import "bootstrap_lib/button-groups";
+@import "bootstrap_lib/input-groups";
+@import "bootstrap_lib/navs";
+@import "bootstrap_lib/navbar";
+@import "bootstrap_lib/breadcrumbs";
+@import "bootstrap_lib/pagination";
+@import "bootstrap_lib/pager";
+@import "bootstrap_lib/labels";
+@import "bootstrap_lib/badges";
+//@import "bootstrap_lib/jumbotron";
+@import "bootstrap_lib/thumbnails";
+@import "bootstrap_lib/alerts";
+@import "bootstrap_lib/progress-bars";
+@import "bootstrap_lib/media";
+@import "bootstrap_lib/list-group";
+@import "bootstrap_lib/panels";
+@import "bootstrap_lib/wells";
+@import "bootstrap_lib/close";
+
+// Components w/ JavaScript
+//@import "bootstrap_lib/modals";
+//@import "bootstrap_lib/tooltip";
+//@import "bootstrap_lib/popovers";
+//@import "bootstrap_lib/carousel";
+
+// Utility classes
+@import "bootstrap_lib/utilities";
+@import "bootstrap_lib/responsive-utilities";

themes/default-bootstrap/sass/_theme_variables.scss

@@ -1,4 +1,3 @@
-@import 'compass';
 @import 'bootstrap_lib/_variables';
 
 //------- FONTS
@@ -97,5 +96,4 @@ $tr-even-bg:										#fdfdfd;
 	border: 1px solid $base-border-color;
 	border-bottom: none;
 	background: $base-box-bg;
-	
 }

themes/default-bootstrap/sass/bootstrap_lib/bootstrap.scss

@@ -1,59 +0,0 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
-// Core variables and mixins
-@import "variables";
-@import "mixins";
-
-// Reset
-@import "normalize";
-@import "print";
-
-// Core CSS
-@import "scaffolding";
-@import "type";
-@import "code";
-@import "grid";
-@import "tables";
-@import "forms";
-@import "buttons";
-
-// Components
-@import "component-animations";
-@import "glyphicons";
-@import "dropdowns";
-@import "button-groups";
-@import "input-groups";
-@import "navs";
-@import "navbar";
-@import "breadcrumbs";
-@import "pagination";
-@import "pager";
-@import "labels";
-@import "badges";
-@import "jumbotron";
-@import "thumbnails";
-@import "alerts";
-@import "progress-bars";
-@import "media";
-@import "list-group";
-@import "panels";
-@import "wells";
-@import "close";
-
-// Components w/ JavaScript
-@import "modals";
-@import "tooltip";
-@import "popovers";
-@import "carousel";
-
-// Utility classes
-@import "utilities";
-@import "responsive-utilities";

themes/default-bootstrap/sass/global.sass

@@ -1,8 +1,33 @@
 @import compass
 @import compass/reset
-@import _theme_variables
+@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,400italic,300italic,300,600,600italic,700,700italic,800,800italic)
+@import theme_variables
+@import bootstrap
 
-//struture
+@import ../css/font-awesome.css
+
+
+a:hover
+	text-decoration: none
+
+@media only screen and (min-width: 1200px)
+	.container
+		padding-left: 0
+		padding-right: 0
+
+body
+	min-width: 320px
+	height: 100%
+	background: $dark-background
+	line-height: 18px
+	font-size: 13px
+	color: $base-body-color
+	&.content_only
+		background: none
+textarea
+	resize: none
+
+//structure
 #page
 #header
 	z-index: 10
@@ -23,6 +48,8 @@
 		h3
 			@include sub-heading
 
+
+
 //text
 p.info-title
 	font-weight: bold
@@ -500,7 +527,7 @@ table.table_block  td
 		tr
 			background: $table-background
 
-/******************** product elements ****************/
+//product elements
 .product-name
 	font-size: 17px
 	line-height: 23px
@@ -1167,7 +1194,7 @@ ul.footer_links
 		// max 479px
 		@media (max-width: $screen-xs - 1)
 			float: left
-			width: 00%
+			width: 100%
 			text-align: left
 			padding-bottom: 10px
 			clear: both
@@ -1733,8 +1760,7 @@ div.star a:hover
 		#social_block
 			float: left
 			width: 50%
-			padding: 23px 30px 16px 0
+			padding: 22px 15px 0 15px
-			background: #3F3F3F
 			// max 767px 
 			@media (max-width: $screen-xs-max)
 				width: 100%
@@ -1852,7 +1878,8 @@ div.star a:hover
 	text-align: center
 	width: 57px
 
-.table tbody > tr > td
+.table
+	tbody > tr > td
 		vertical-align: middle
 		&.cart_quantity
 			padding: 41px 14px 25px
@@ -1867,10 +1894,9 @@ div.star a:hover
 		&.cart_delete,
 		&.price_discount_del
 			padding: 5px
-.table tfoot > tr > td
+	tfoot > tr > td
 		vertical-align: middle
 
-
 .cart_delete a.cart_quantity_delete,
 a.price_discount_delete
 	font-size: 23px

themes/default-bootstrap/sass/global.scss

@@ -1,4 +1,7 @@
+@import 'compass';
 @import '_theme_variables';
+@import 'bootstrap';
+
 /* ##################################################################################################
 	PRESTASHOP SCSS
 ################################################################################################## */