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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-10-21 19:00:18 +02:00
parent c89f6c1adb f336cc599b
commit fadbc4c250
32 changed files with 87 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+30 -23
View File
@@ -10286,34 +10286,41 @@ li.sortable-placeholder {
height: 350px; }
/* line 162, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons {
padding: 20px 20px 0 20px; }
/* line 163, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons header a {
background-color: white;
border: 1px dashed #dfdfdf;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
padding: 10px 20px; }
/* line 166, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a {
display: block; }
/* line 165, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons header a:hover {
/* line 168, admin-theme/_admin-dashboard.sass */
#dashboard #dashaddons a:hover {
text-decoration: none; }
/* line 170, admin-theme/_admin-dashboard.sass */
/* line 173, admin-theme/_admin-dashboard.sass */
#dashboard #dashactivity svg {
height: 150px; }
/* line 177, admin-theme/_admin-dashboard.sass */
/* line 180, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value {
min-width: 30px;
text-align: center; }
/* line 180, admin-theme/_admin-dashboard.sass */
/* line 183, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value:before {
font-size: 0.7em;
font-family: FontAwesome;
content: "\f021";
color: #cccccc; }
/* line 186, admin-theme/_admin-dashboard.sass */
/* line 189, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_value span, #dashboard .loading .data_value small {
display: none; }
/* line 188, admin-theme/_admin-dashboard.sass */
/* line 191, admin-theme/_admin-dashboard.sass */
#dashboard .loading .data_trend {
display: none; }
/* line 213, admin-theme/_admin-dashboard.sass */
/* line 216, admin-theme/_admin-dashboard.sass */
.data_loading, #dashboard .data_value span, #dashboard .data_value .dash_trend {
opacity: 1;
-webkit-animation-name: bounceG;
@@ -10327,7 +10334,7 @@ li.sortable-placeholder {
transform: scale(0.7); }
@-webkit-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10335,7 +10342,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10344,7 +10351,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-moz-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10352,7 +10359,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10361,7 +10368,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-ms-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10369,7 +10376,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10378,7 +10385,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@-o-keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10386,7 +10393,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10395,7 +10402,7 @@ li.sortable-placeholder {
transform: scale(1); } }
@keyframes bounceG {
/* line 221, admin-theme/_admin-dashboard.sass */
/* line 224, admin-theme/_admin-dashboard.sass */
0% {
opacity: 0;
filter: alpha(opacity=0);
@@ -10403,7 +10410,7 @@ li.sortable-placeholder {
-ms-transform: scale(0.1);
transform: scale(0.1); }
/* line 224, admin-theme/_admin-dashboard.sass */
/* line 227, admin-theme/_admin-dashboard.sass */
100% {
opacity: 1;
filter: alpha(opacity=100);
@@ -10411,11 +10418,11 @@ li.sortable-placeholder {
-ms-transform: scale(1);
transform: scale(1); } }
/* line 228, admin-theme/_admin-dashboard.sass */
/* line 231, admin-theme/_admin-dashboard.sass */
#dash_version {
padding: 0 !important;
overflow: hidden; }
/* line 232, admin-theme/_admin-dashboard.sass */
/* line 235, admin-theme/_admin-dashboard.sass */
#dash_version iframe {
height: 80px;
width: 100%; }
admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass
+5 -2
View File
@@ -160,11 +160,14 @@
#dashproducts
#dashaddons
header a
background-color: white
border: 1px dashed #DFDFDF
@include border-radius(3px)
a
display: block
&:hover
text-decoration: none
padding: 20px 20px 0 20px
padding: 10px 20px
#dashactivity
svg
admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+1 -3
View File
@@ -29,9 +29,7 @@
{include file='controllers/cart_rules/actions.tpl'}
{include file="footer_toolbar.tpl"}
</div>
<button type="submit" class="btn btn-primary btn-large pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn">
<i class="icon-save"></i>
{l s='Save'}
<button type="submit" class="btn btn-default pull-right" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn">{l s='Save'}
</button>
<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
</form>
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
+1 -1
View File
@@ -361,7 +361,7 @@
</div>
<div class="row">
<div class="col-lg-12">
<button type="submit" id="submitCustomerNote" class="btn btn-primary pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button>
<button type="submit" id="submitCustomerNote" class="btn btn-default pull-right" disabled="disabled" /><i class="icon-save"></i> {l s='Save'}</button>
</div>
</div>
<span id="note_feedback"></span>
admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+7 -9
View File
@@ -26,9 +26,9 @@
<script>
var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}';
var adminstats_ajax_url = '{$link->getAdminLink('AdminStats')}';
var no_results_translation = '{l s='No result'}';
var no_results_translation = '{l s='No result' js='1'}';
var dashboard_use_push = '{$dashboard_use_push|intval}';
var read_more = '{l s='Read more'}'
var read_more = '{l s='Read more' js='1'}';
</script>
<div id="dashboard">
@@ -46,13 +46,11 @@
</div>
<div class="col-lg-7" id="hookDashboardZoneTwo">
{$hookDashboardZoneTwo}
<section id="dashaddons" class="panel widget">
<header class="panel-heading">
<a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank">
<i class="icon-plus"></i> {l s='Add more graph and data'}
</a>
</header>
</section>
<div id="dashaddons" class="widget">
<a href="http://addons.prestashop.com/208-dashboards?utm_source=backoffice_dashboard" target="_blank">
<i class="icon-plus"></i> {l s='Add more graph and data'}
</a>
</div>
</div>
<div class="col-lg-2">
admin-dev/themes/default/template/controllers/images/content.tpl
+2 -2
View File
@@ -123,7 +123,7 @@
</div>
<div class="row">
<div class="col-lg-9 col-lg-push-3">
<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
<input type="Submit" name="submitRegenerate{$table}" value="{l s='Regenerate thumbnails'}" class="btn btn-default" onclick="return confirm('{l s='Are you sure?'}');" />
</div>
</div>
</div>
@@ -151,7 +151,7 @@
</div>
<div class="row">
<div class="col-lg-12 pull-right">
<input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-primary" onclick="return confirm('{l s='Are you sure?'}');" />
<input type="Submit" name="submitMoveImages{$table}" value="{l s='Move images'}" class="btn btn-default" onclick="return confirm('{l s='Are you sure?'}');" />
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+1 -1
View File
@@ -80,7 +80,7 @@
<input type="hidden" name="id_module" value="{$id_module}" />
<input type="hidden" name="id_hook" value="{$id_hook}" />
{/if}
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-primary" />
<input type="submit" value="{l s='Save'}" name="{if $edit_graft}submitEditGraft{else}submitAddToHook{/if}" id="{$table}_form_submit_btn" class="btn btn-default" />
</div>
</div>
</div>
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
+1 -1
View File
@@ -119,7 +119,7 @@
</table>
</div>
<div class="row pull-right">
<button type="submit" class="btn btn-primary" name="submitModule{$list['name_id']}">
<button type="submit" class="btn btn-default" name="submitModule{$list['name_id']}">
<i class="icon-save"></i>
{l s='Save restrictions'}
</button>
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+1 -1
View File
@@ -258,7 +258,7 @@
<input type="hidden" name="id_product_attribute" id="id_product_attribute" value="0" />
<input type="hidden" name="key_tab" id="key_tab" value="Informations" />
<button id="product_form_submit_btn" type="submit" name="submitAddproduct" class="btn btn-primary">{l s='Save'}</button>
<button id="product_form_submit_btn" type="submit" name="submitAddproduct" class="btn btn-default">{l s='Save'}</button>
{include file="footer_toolbar.tpl"}
</form>
</div>
admin-dev/themes/default/template/controllers/states/helpers/list/list_footer.tpl
+2 -2
View File
@@ -37,7 +37,7 @@
</select>
</div>
<div class="col-lg-6">
<input type="submit" class="btn btn-primary" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
<input type="submit" class="btn btn-default" name="submitBulk" id="submitBulk" value="{l s='Apply'}" />
</div>
</div>
{else}
@@ -53,7 +53,7 @@
{/if}
</div>
<div class="col-lg-6">
<input type="submit" class="btn btn-primary" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
<input type="submit" class="btn btn-default" name="submitBulk{$key}{$table}" value="{$params.text}" {if isset($params.confirm)}onclick="return confirm('{$params.confirm}');"{/if} />
</div>
</div>
{/foreach}
admin-dev/themes/default/template/helpers/options/options.tpl
+1 -2
View File
@@ -350,10 +350,9 @@
</p>
</div>
{/if}
{/block}{* end block field *}
</div>
</div>
{/block}{* end block field *}
{/if}
{/foreach}
{if isset($categoryData['submit'])}
admin-dev/themes/default/template/helpers/required_fields.tpl
+1 -1
View File
@@ -57,6 +57,6 @@
{/foreach}
</tbody>
</table>
<button class="btn btn-primary pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
<button class="btn btn-default pull-right" type="submit" name="submitFields"><i class="icon-save"></i> {l s='Save'}</button>
</form>
</div>