// config Compass + Bower Update

This commit is contained in:
Kevin Granger
2013-08-30 15:18:20 +02:00
parent 0c494912a4
commit d4023ce0a3
7 changed files with 19 additions and 14751 deletions
File diff suppressed because it is too large Load Diff
+3 -12
View File
@@ -1,25 +1,16 @@
# Require any additional compass plugins here.
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "css"
sass_dir = "css"
images_dir = "img"
javascripts_dir = "js"
fonts_dir = "font"
output_style = :nested
environment = :development
output_style = :compressed
environment = :production
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
line_comments = false
color_output = false
# If you prefer the indented syntax, you might want to regenerate this
# project again passing --syntax sass, or you can uncomment this:
# preferred_syntax = :sass
# and then run:
# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
preferred_syntax = :sass
File diff suppressed because one or more lines are too long
@@ -2,7 +2,7 @@
//$main-color: #F7F7F7
//$main-color: #DBD8CF //sable
//$main-color: #CFD7DD //bleu
//$main-color: #E0E0E0
//$main-color: #E0E0E0 //gris
//$main-color: #D7D6DE //violet
//$main-color: #F1F8FE //theme wordpress
//dark
@@ -15,7 +15,6 @@
//$main-color: #443A42 //violet
//$main-color: #373E35 //vert camo
//$main-color: #262C3F //bleu nuit - pretty sure that a girl could do better naming the colors, sorry about that...
//$main-color: white
//$main-color: #8C8574
$main-color: #3A3A4A
@@ -38,13 +37,13 @@ $main-color: #3A3A4A
//$secondary-color: #8BC954 //vert PrestaShop
//some tests
$secondary-color: #00A89C
//$secondary-color: #79C09D
//$secondary-color: invert($main-color)
//$secondary-color: lighten(invert($main-color),20%)
//$secondary-color: adjust-hue($main-color, 80%)
//$hue: hue(adjust-hue($main-color, 80%))
//$secondary-color: hsl($hue, 50%, 50%) //Creates a Color from hue, saturation, and lightness values
$secondary-color: #00A89C
//dark and light, love and war, fire and ice, etc...
$contrasted-dark-default: #333
@@ -54,9 +53,9 @@ $contrasted-lightness-threshold: 10% //30% default
//50 shades of gray
//$bg-content-color: #F8F9FB //bleu gris clair
//$bg-content-color: #F8FBF8 //vert gris clair
$bg-content-color: #F8F8F8 //gris
//$bg-content-color: #F8F4E3 //gris foncé
//$bg-content-color: #F6F6F6 //gris
$bg-content-color: #F8F8F8 //gris
//heading
//$bg-header-color: darken($secondary-color,20%)
@@ -27,11 +27,11 @@
<tr>
<td class="center">
<img width="57" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
<img width="32" alt="" src="{if isset($module->image)}{$module->image}{else}../modules/{$module->name}/{$module->logo}{/if}">
</td>
<td>
<div id="anchor{$module->name|ucfirst}">
<h4>
<span>
{$module->displayName|truncate:40:'…'} {$module->version}
{if isset($module->id) && $module->id gt 0 }
{if $module->active}
@@ -46,14 +46,12 @@
<span class="label label-warning">{l s='Not installed'}</span>
{/if}
{/if}
</h4>
<p>
{if isset($module->description) && $module->description ne ''}
{$module->description|truncate:100:'…'}
{else}
&nbsp;
{/if}
</span>
{if isset($module->description) && $module->description ne ''}
<p class="text-muted">
{$module->description|truncate:100:'…'}
</p>
{/if}
</div>
</td>
{if isset($module->type) && $module->type == 'addonsMustHave'}
@@ -100,4 +98,4 @@
</p>
</td>
{/if}
</tr>
</tr>
@@ -23,6 +23,7 @@
* International Registered Trademark & Property of PrestaShop SA
*}
</table>
</div>
{if $bulk_actions}
<div class="btn-group">
@@ -235,8 +235,9 @@
</span>
{/if}
{/if}
<div class="table-responsive">
<table
class="table table-hover"
class="table"
name="list_table"
{if $table_id} id={$table_id}{/if}
class="table {if $table_dnd}tableDnD{/if} {$table}"