// reorganize some css and stuff on backward compatibility

This commit is contained in:
Kevin Granger
2013-11-20 16:24:01 +01:00
parent c61d1bc309
commit dc29fae59d
13 changed files with 186 additions and 237 deletions
+8 -6
View File
@@ -190,13 +190,13 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before,
.icon-zoom-out:before { content: "\f010"; }
.icon-power-off:before, .icon-off:before { content: "\f011"; }
.icon-power-off:before, .icon-off:before, .bootstrap .process-icon-off:before { content: "\f011"; }
.icon-signal:before { content: "\f012"; }
.icon-gear:before, .icon-cog:before, .icon-AdminAdmin:before, .bootstrap .process-icon-configure:before { content: "\f013"; }
.icon-trash:before, .bootstrap .process-icon-delete:before { content: "\f014"; }
.icon-trash:before, .bootstrap .process-icon-delete:before, .bootstrap .process-icon-uninstall:before { content: "\f014"; }
.icon-home:before { content: "\f015"; }
@@ -558,7 +558,7 @@ a .icon-rotate-90:before, a .icon-rotate-180:before, a .icon-rotate-270:before,
.icon-linkedin:before { content: "\f0e1"; }
.icon-rotate-left:before, .icon-undo:before { content: "\f0e2"; }
.icon-rotate-left:before, .bootstrap .process-icon-reset:before, .icon-undo:before { content: "\f0e2"; }
.icon-legal:before { content: "\f0e3"; }
@@ -2306,7 +2306,7 @@ table { border-collapse: collapse; border-spacing: 0; }
.bootstrap .dropdown-menu.pull-right, #content.bootstrap h3:not(.modal-title) .dropdown-menu.panel-heading-action, #content.bootstrap .panel-heading .dropdown-menu.panel-heading-action, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel .notifs_panel_header .dropdown-menu.panel-heading-action, #header_notifs_icon_wrapper .notifs_panel #content.bootstrap .notifs_panel_header .dropdown-menu.panel-heading-action { right: 0; left: auto; }
.bootstrap .dropdown-menu .divider { height: 1px; margin: 7.5px 0; overflow: hidden; background-color: #e5e5e5; }
.bootstrap .dropdown-menu > li > a { display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.42857; color: #333333; white-space: nowrap; }
.bootstrap .dropdown-menu > li > a:hover, .bootstrap .dropdown-menu > li > a:focus { text-decoration: none; color: #262626; background-color: whitesmoke; }
.bootstrap .dropdown-menu > li > a:hover, .bootstrap .dropdown-menu > li > a:focus { text-decoration: none; color: white; background-color: #1ba6e5; }
.bootstrap .dropdown-menu > .active > a, .bootstrap .dropdown-menu > .active > a:hover, .bootstrap .dropdown-menu > .active > a:focus { color: white; text-decoration: none; outline: 0; background-color: #1ba6e5; }
.bootstrap .dropdown-menu > .disabled > a, .bootstrap .dropdown-menu > .disabled > a:hover, .bootstrap .dropdown-menu > .disabled > a:focus { color: #999999; }
.bootstrap .dropdown-menu > .disabled > a:hover, .bootstrap .dropdown-menu > .disabled > a:focus { text-decoration: none; background-color: transparent; background-image: none; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); cursor: not-allowed; }
@@ -2906,9 +2906,9 @@ th.hidden-lg, td.hidden-lg { display: table-cell !important; }
.hidden-print, tr.hidden-print, th.hidden-print, td.hidden-print { display: none !important; } }
html { min-height: 100%; height: 100%; font-size: 62.5%; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
body { min-height: 100%; height: 100%; font-family: "Open Sans", Helvetica, Arial, sans-serif; font-size: 12px; line-height: 1.42857; color: #555555; background-color: #515561; }
body { min-height: 100%; height: 100%; font: 400 12px/1.42857 "Open Sans", Helvetica, Arial, sans-serif; color: #555555; background-color: #515561; }
#main { z-index: 10; float: left; width: 100%; min-height: 100%; padding: 36px 0 60px; margin: 0 0 -60px 0; background-color: #f8f8f8; background-image: url("../img/patterns/bedge_grunge.png"); }
#main { z-index: 10; float: left; width: 100%; min-height: 100%; padding: 36px 0 60px; margin: 0 0 -60px 0; background-color: #f8f8f8; }
#content.bootstrap { padding: 80px 10px 0; -webkit-transition-property: margin; transition-property: margin; -webkit-transition-duration: 0.4s; transition-duration: 0.4s; -webkit-transition-timing-function: ease-out; -moz-transition-timing-function: ease-out; -o-transition-timing-function: ease-out; transition-timing-function: ease-out; }
#content.bootstrap .panel, #content.bootstrap #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper #content.bootstrap .notifs_panel, #content.bootstrap #dash_version { padding: 20px; margin-bottom: 20px; border: solid 1px #dfdfdf; background-color: white; -webkit-border-radius: 5px; -moz-border-radius: 5px; -ms-border-radius: 5px; -o-border-radius: 5px; border-radius: 5px; -webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 2px 0, white 0 0 0 3px inset; box-shadow: rgba(0, 0, 0, 0.1) 0 2px 0, white 0 0 0 3px inset; }
@@ -3523,3 +3523,5 @@ a.link-social:hover { text-decoration: none; }
.bootstrap #dash_version { padding: 0 !important; overflow: hidden; }
.bootstrap #dash_version iframe { height: 80px; width: 100%; }
.bootstrap .adminsearch #content .panel .panel, .bootstrap .adminsearch #content #header_notifs_icon_wrapper .notifs_panel .panel, #header_notifs_icon_wrapper .bootstrap .adminsearch #content .notifs_panel .panel, .bootstrap .adminsearch #content #dash_version .panel, .bootstrap .adminsearch #content .panel #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper .bootstrap .adminsearch #content .panel .notifs_panel, .bootstrap .adminsearch #content #header_notifs_icon_wrapper .notifs_panel .notifs_panel, #header_notifs_icon_wrapper .bootstrap .adminsearch #content .notifs_panel .notifs_panel, .bootstrap .adminsearch #content #dash_version #header_notifs_icon_wrapper .notifs_panel, #header_notifs_icon_wrapper .bootstrap .adminsearch #content #dash_version .notifs_panel, .bootstrap .adminsearch #content .panel #dash_version, .bootstrap .adminsearch #content #header_notifs_icon_wrapper .notifs_panel #dash_version, #header_notifs_icon_wrapper .bootstrap .adminsearch #content .notifs_panel #dash_version, .bootstrap .adminsearch #content #dash_version #dash_version { padding: 0; margin: 0; border: none; -webkit-border-radius: 0; -moz-border-radius: 0; -ms-border-radius: 0; -o-border-radius: 0; border-radius: 0; -webkit-box-shadow: 0; box-shadow: 0; }
#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
@@ -0,0 +1 @@
#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
@@ -1 +1 @@
#content.nobootstrap { background-color: white; width: 1200px; padding: 40px; }
#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; }
+4 -134
View File
@@ -57,140 +57,7 @@
@import "../bower_components/sass-bootstrap/lib/utilities"
@import "../bower_components/sass-bootstrap/lib/responsive-utilities"
html
min-height: 100%
height: 100%
font-size: 62.5%
-webkit-tap-highlight-color: rgba(0,0,0,0)
body
min-height: 100%
height: 100%
font-family: $font-family-base
font-size: $font-size-base
line-height: $line-height-base
color: $text-color
background-color: $body-bg
#main
z-index: 10
float: left
width: 100%
min-height: 100%
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
@include transition-property(margin)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
.panel
padding: 20px
margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%)
background-color: lighten($bg-content-color,20%)
@include border-radius(5px)
@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
.panel-heading
@extend h3
h3:not(.modal-title), .panel-heading
border: none
padding: 0 5px
margin: -16px -16px 15px -16px
color: contrasted($bg-panel-heading-color)
font-size: 1.2em
line-height: 30px
font-weight: 300
text-transform: uppercase
background-color: white
border-bottom: solid 1px #ccc
i, a
color: contrasted($bg-panel-heading-color)
.badge
background-color: $brand-primary
+border-radius(0)
height: 29px
line-height: 25px
font-size: 1.3em
margin-right: 7px
font-weight: 300
float: left
margin-left: -5px
.panel-heading-action
@extend .pull-right
margin-right: -5px
a.list-toolbar-btn
float: left
height: 30px
width: 30px
color: $brand-primary
border-left: solid 1px #ccc
&:hover
text-decoration: none
color: black
i
text-align: center
font-size: 1.3em
line-height: 30px
.panel-danger .panel-heading
background-color: $badge-notif-color!important
form .alert
clear: both
@media (max-width: $screen-phone)
margin: 0
padding: 80px 5px 0
//data-focus
.data-focus
&.data-focus-primary
background-color: $brand-primary
color: white
@include border-radius(10px)
//orders
#customer_part
.customerCard
&.selected-customer .panel
color: $brand-success
border: solid 2px $brand-success
//modal
body.display-modal
#content, #main
margin: 0
padding: 0
background: #F8F8F8
//todo: remove temp fix for bootstrap RC1 -> final
.bootstrap
input[type="text"],input[type="search"],input[type="password"], textarea, select
@extend .form-control
//panels
.bootstrap
.panel
.panel-footer
margin: 15px -20px -20px
height: 73px
.btn.pull-right
margin-left: 3px
#header
.panel-footer
margin: 15px 0 0!important
height: 40px!important
//colors
.attributes-color-container
width: 40px
height: 25px
display: block
border: solid 1px black
@import "admin-theme/admin-content"
@import "admin-theme/admin-header"
@import "admin-theme/admin-footer"
@import "admin-theme/admin-nav"
@@ -212,3 +79,6 @@ body.display-modal
@import "admin-theme/admin-modules"
@import "admin-theme/admin-dashboard"
@import "admin-theme/admin-search"
//backward compatibility
@import "admin-theme/admin-backward"
@@ -1,6 +1,4 @@
@import compass
#content.nobootstrap
//width: 100%
background-color: white
width: 1200px
padding: 40px
padding: 80px 40px
@@ -0,0 +1,128 @@
html
min-height: 100%
height: 100%
font-size: 62.5%
-webkit-tap-highlight-color: rgba(0,0,0,0)
body
min-height: 100%
height: 100%
font: 400 #{$font-size-base}/#{$line-height-base} $font-family-base
color: $text-color
background-color: $body-bg
#main
z-index: 10
float: left
width: 100%
min-height: 100%
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
@include transition-property(margin)
@include transition-duration(0.4s)
@include transition-timing-function(ease-out)
.panel
padding: 20px
margin-bottom: 20px
border: solid 1px darken($bg-content-color,10%)
background-color: lighten($bg-content-color,20%)
@include border-radius(5px)
@include box-shadow(rgba(black,0.10) 0 2px 0, white 0 0 0 3px inset)
.panel-heading
@extend h3
h3:not(.modal-title), .panel-heading
border: none
padding: 0 5px
margin: -16px -16px 15px -16px
color: contrasted($bg-panel-heading-color)
font-size: 1.2em
line-height: 30px
font-weight: 300
text-transform: uppercase
background-color: white
border-bottom: solid 1px #ccc
i, a
color: contrasted($bg-panel-heading-color)
.badge
background-color: $brand-primary
+border-radius(0)
height: 29px
line-height: 25px
font-size: 1.3em
margin-right: 7px
font-weight: 300
float: left
margin-left: -5px
.panel-heading-action
@extend .pull-right
margin-right: -5px
a.list-toolbar-btn
float: left
height: 30px
width: 30px
color: $brand-primary
border-left: solid 1px #ccc
&:hover
text-decoration: none
color: black
i
text-align: center
font-size: 1.3em
line-height: 30px
.panel-danger .panel-heading
background-color: $badge-notif-color!important
form .alert
clear: both
@media (max-width: $screen-phone)
margin: 0
padding: 80px 5px 0
//data-focus
.data-focus
&.data-focus-primary
background-color: $brand-primary
color: white
@include border-radius(10px)
//orders
#customer_part
.customerCard
&.selected-customer .panel
color: $brand-success
border: solid 2px $brand-success
//modal
body.display-modal
#content, #main
margin: 0
padding: 0
background: #F8F8F8
//todo: remove temp fix for bootstrap RC1 -> final
.bootstrap
input[type="text"],input[type="search"],input[type="password"], textarea, select
@extend .form-control
//panels
.bootstrap
.panel
.panel-footer
margin: 15px -20px -20px
height: 73px
.btn.pull-right
margin-left: 3px
#header
.panel-footer
margin: 15px 0 0!important
height: 40px!important
//colors
.attributes-color-container
width: 40px
height: 25px
display: block
border: solid 1px black
@@ -116,4 +116,11 @@
@extend .icon-refresh
.process-icon-configure
@extend .icon-cog
.process-icon-uninstall
@extend .icon-trash
.process-icon-off
@extend .icon-off
.process-icon-reset
@extend .icon-rotate-left
@@ -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 "../bower_components/sass-bootstrap/lib/variables";
@import "../bower_components/sass-bootstrap/lib/mixins";
// Reset
@import "../bower_components/sass-bootstrap/lib/normalize";
@import "../bower_components/sass-bootstrap/lib/print";
// Core CSS
@import "../bower_components/sass-bootstrap/lib/scaffolding";
@import "../bower_components/sass-bootstrap/lib/type";
@import "../bower_components/sass-bootstrap/lib/code";
@import "../bower_components/sass-bootstrap/lib/grid";
@import "../bower_components/sass-bootstrap/lib/tables";
@import "../bower_components/sass-bootstrap/lib/forms";
@import "../bower_components/sass-bootstrap/lib/buttons";
// Components
@import "../bower_components/sass-bootstrap/lib/component-animations";
@import "../bower_components/sass-bootstrap/lib/glyphicons";
@import "../bower_components/sass-bootstrap/lib/dropdowns";
@import "../bower_components/sass-bootstrap/lib/button-groups";
@import "../bower_components/sass-bootstrap/lib/input-groups";
@import "../bower_components/sass-bootstrap/lib/navs";
@import "../bower_components/sass-bootstrap/lib/navbar";
@import "../bower_components/sass-bootstrap/lib/breadcrumbs";
@import "../bower_components/sass-bootstrap/lib/pagination";
@import "../bower_components/sass-bootstrap/lib/pager";
@import "../bower_components/sass-bootstrap/lib/labels";
@import "../bower_components/sass-bootstrap/lib/badges";
@import "../bower_components/sass-bootstrap/lib/jumbotron";
@import "../bower_components/sass-bootstrap/lib/thumbnails";
@import "../bower_components/sass-bootstrap/lib/alerts";
@import "../bower_components/sass-bootstrap/lib/progress-bars";
@import "../bower_components/sass-bootstrap/lib/media";
@import "../bower_components/sass-bootstrap/lib/list-group";
@import "../bower_components/sass-bootstrap/lib/panels";
@import "../bower_components/sass-bootstrap/lib/wells";
@import "../bower_components/sass-bootstrap/lib/close";
// Components w/ JavaScript
@import "../bower_components/sass-bootstrap/lib/modals";
@import "../bower_components/sass-bootstrap/lib/tooltip";
@import "../bower_components/sass-bootstrap/lib/popovers";
@import "../bower_components/sass-bootstrap/lib/carousel";
// Utility classes
@import "../bower_components/sass-bootstrap/lib/utilities";
@import "../bower_components/sass-bootstrap/lib/responsive-utilities";
@@ -136,8 +136,8 @@ $input-height-base: ($line-height-computed + ($padding-base-vertica
// $dropdown-link-active-bg: $component-active-bg ;
// $dropdown-link-color: $gray-dark ;
// $dropdown-link-hover-color: #fff ;
// $dropdown-link-hover-bg: $dropdown-link-active-bg ;
$dropdown-link-hover-color: white ;
$dropdown-link-hover-bg: $brand-primary ;
// Grid system
@@ -22,11 +22,12 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="panel">
<div class="bootstrap">
<h3><i class="icon-cogs"></i> {l s='Configuration'}</h3>
<div class="row">
<div class="input-group">
<button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown">
<i class="icon-flag"></i>
{l s='Manage translations'}
<span class="caret"></span>
</button>
@@ -38,13 +38,13 @@
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
<i class="process-icon-minus-sign-alt"></i>
<i class="process-icon-uninstall"></i>
<div>{l s='Uninstall'}</div>
</a>
</li>
<li>
<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
<i class="process-icon-share-alt"></i>
<i class="process-icon-reset"></i>
<div>{l s='Reset'}</div>
</a>
</li>
@@ -26,7 +26,6 @@
<div class="leadin">{block name="leadin"}{/block}</div>
<form action="{$url_submit}" id="{$table}_form" method="post" class="form-horizontal">
{if $display_key}
<input type="hidden" name="show_modules" value="{$display_key}" />
{/if}
@@ -35,9 +34,9 @@
<i class="icon-paste"></i>
{l s='Transplant a module'}
</h3>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required"> {l s='Module:'}</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="id_module" {if $edit_graft} disabled="disabled"{/if}>
{foreach $modules as $module}
<option value="{$module->id}" {if $id_module == $module->id || (!$id_module && $show_modules == $module->id)}selected="selected"{/if}>{$module->displayName|stripslashes}</option>
@@ -45,9 +44,9 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3 required"> {l s='Hook into'} :</label>
<div class="col-lg-6">
<div class="col-lg-9">
<select name="id_hook" {if $edit_graft} disabled="disabled"{/if}>
{foreach $hooks as $hook}
<option value="{$hook['id_hook']}" {if $id_hook == $hook['id_hook']} selected="selected"{/if}>{$hook['name']}{if $hook['name'] != $hook['title']} ({$hook['title']}){/if}</option>
@@ -55,10 +54,10 @@
</select>
</div>
</div>
<div class="row">
<div class="form-group">
<label class="control-label col-lg-3">{l s='Exceptions'} :</label>
<div class="col-lg-6">
<div class="alert alert-warning">
<div class="col-lg-9">
<div class="well">
<p>
{l s='Please specify the files for which you do not want the module to be displayed.'}<br />
{l s='Please input each filename, separated by a comma.'}<br />
@@ -73,22 +72,18 @@
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
{if $edit_graft}
<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-default" />
</div>
<div class="panel-footer">
{if $edit_graft}
<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-default" />
</div>
</div>
</form>
<script type="text/javascript">
//<![CDATA
function position_exception_textchange()
{
function position_exception_textchange() {
// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
var obj = $(this);
var shopID = obj.attr('id').replace(/\D/g, '');
@@ -100,21 +95,16 @@
for (var i = 0; i < len; i++)
list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
}
function position_exception_listchange()
{
function position_exception_listchange() {
var obj = $(this);
var shopID = obj.attr('id').replace(/\D/g, '');
var str = obj.val().join(', ');
obj.closest('form').find('#em_text_' + shopID).val(str);
}
$(document).ready(function(){
$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
$(this).change(position_exception_textchange).change();
});
$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
$(this).change(position_exception_listchange);
});
+15 -4
View File
@@ -47,10 +47,21 @@
</div>
<div class="col-sm-5">
<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Contact'}</a>
|&nbsp;<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Bug Tracker'}</a>
|&nbsp;<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Forum'}</a>
|&nbsp;<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">{l s='Addons'}</a>
<a href="http://www.prestashop.com/en/contact_us?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Contact'}
</a>
|&nbsp;
<a href="http://forge.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Bug Tracker'}
</a>
|&nbsp;
<a href="http://www.prestashop.com/forums/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Forum'}
</a>
|&nbsp;
<a href="http://addons.prestashop.com/?utm_source=backoffice_footer" target="_blank" class="footer_link">
{l s='Addons'}
</a>
{if $iso_is_fr}
<p>Questions / Renseignements / Formations :
<strong>+33 (0)1.40.18.30.04</strong>