dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix dropdown menu

Browse Source
This commit is contained in:
Kevin Granger
2013-12-02 14:13:41 +01:00
parent 2ef8333e6a
commit bf3c27e864
7 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+1 -2
View File
File diff suppressed because one or more lines are too long
admin-dev/themes/default/scss/admin-theme/_admin-content.sass
+2 -3
View File
@@ -18,7 +18,6 @@ body
padding: 36px 0 60px
margin: 0 0 -60px 0
background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png') // texture
#content.bootstrap
padding: 80px 10px 0
@@ -113,8 +112,8 @@ body.display-modal
.panel-footer
margin: 15px -20px -20px
height: 73px
.btn.pull-right
margin-left: 3px
.btn.pull-right:not(:first-child)
margin-left: 5px
#header
.panel-footer
margin: 15px 0 0!important
admin-dev/themes/default/scss/admin-theme/_admin-forms.sass
-2
View File
@@ -72,8 +72,6 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
.btn-group-action
width: 160px
float: right
.btn-group
float: right
a
text-decoration: none
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+2 -12
View File
@@ -310,50 +310,40 @@
</div>
<div class="panel">
<div class="panel-heading">
<i class="icon-info-sign"></i>
{l s='Download sample csv files.'}
<i class="icon-download"></i>
{l s='Download sample csv files'}
</div>
<div class="list-group">
<a class="list-group-item" href="../docs/csv_import/categories_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Categories file'}
</a>
<a class="list-group-item" href="../docs/csv_import/products_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Products file'}
</a>
<a class="list-group-item" href="../docs/csv_import/combinations_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Combinations file'}
</a>
<a class="list-group-item" href="../docs/csv_import/customers_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Customers file'}
</a>
<a class="list-group-item" href="../docs/csv_import/addresses_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Addresses file'}
</a>
<a class="list-group-item" href="../docs/csv_import/manufacturers_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Manufacturers file'}
</a>
<a class="list-group-item" href="../docs/csv_import/suppliers_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Suppliers file'}
</a>
<a class="list-group-item" href="../docs/csv_import/alias_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Sample Alias file'}
</a>
{if $PS_ADVANCED_STOCK_MANAGEMENT}
<a class="list-group-item" href="../docs/csv_import/supply_orders_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Supply Orders sample file'}
</a>
<a class="list-group-item" href="../docs/csv_import/supply_orders_details_import.csv" target="_blank">
<i class="icon-download"></i>
{l s='Supply Orders Details sample file'}
</a>
{/if}
admin-dev/themes/default/template/controllers/modules/list.tpl
+1 -1
View File
@@ -94,7 +94,7 @@
</td>
<td>
<div class="btn-group-action">
<div class="btn-group">
<div class="btn-group pull-right">
{if isset($module->type) && $module->type == 'addonsMustHave'}
<a class="btn btn-default" href="{$module->addons_buy_url}" target="_blank">
<i class="icon-shopping-cart"></i> &nbsp;{if isset($module->id_currency) && isset($module->price)}{displayPrice price=$module->price currency=$module->id_currency}{/if}
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
+1 -1
View File
@@ -129,7 +129,7 @@
{/foreach}
{if $compiled_actions|count > 0}
{if $compiled_actions|count > 1}<div class="btn-group-action">{/if}
<div class="btn-group">
<div class="btn-group pull-right">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">
admin-dev/themes/default/template/helpers/list/list_content.tpl
+1 -1
View File
@@ -155,7 +155,7 @@
{/foreach}
{if $compiled_actions|count > 0}
{if $compiled_actions|count > 1}<div class="btn-group-action">{/if}
<div class="btn-group">
<div class="btn-group pull-right">
{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
{if $compiled_actions|count > 1}
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">