From dc29fae59d1e11d2008ab31593536b92c65ecf77 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Wed, 20 Nov 2013 16:24:01 +0100 Subject: [PATCH] // reorganize some css and stuff on backward compatibility --- admin-dev/themes/default/css/admin-theme.css | 14 +- .../css/admin-theme/_admin-backward.css | 1 + .../css/backward-admin-bootstrap-reset.css | 2 +- .../themes/default/scss/admin-theme.sass | 138 +----------------- .../_admin-backward.sass} | 4 +- .../scss/admin-theme/_admin-content.sass | 128 ++++++++++++++++ .../scss/admin-theme/_admin-toolbar.sass | 7 + .../scss/admin-theme/_bootstrap-init.scss | 59 -------- .../admin-theme/_bootstrap-variables.scss | 4 +- .../controllers/modules/configuration_bar.tpl | 3 +- .../controllers/modules/configure.tpl | 4 +- .../controllers/modules_positions/form.tpl | 40 ++--- admin-dev/themes/default/template/footer.tpl | 19 ++- 13 files changed, 186 insertions(+), 237 deletions(-) create mode 100644 admin-dev/themes/default/css/admin-theme/_admin-backward.css rename admin-dev/themes/default/scss/{backward-admin-bootstrap-reset.sass => admin-theme/_admin-backward.sass} (57%) create mode 100644 admin-dev/themes/default/scss/admin-theme/_admin-content.sass delete mode 100644 admin-dev/themes/default/scss/admin-theme/_bootstrap-init.scss diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 629b7fcd0..5fa4f8539 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -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; } diff --git a/admin-dev/themes/default/css/admin-theme/_admin-backward.css b/admin-dev/themes/default/css/admin-theme/_admin-backward.css new file mode 100644 index 000000000..25fc3a7a4 --- /dev/null +++ b/admin-dev/themes/default/css/admin-theme/_admin-backward.css @@ -0,0 +1 @@ +#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; } diff --git a/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css b/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css index 3b2f0ef6e..25fc3a7a4 100644 --- a/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css +++ b/admin-dev/themes/default/css/backward-admin-bootstrap-reset.css @@ -1 +1 @@ -#content.nobootstrap { background-color: white; width: 1200px; padding: 40px; } +#content.nobootstrap { background-color: white; width: 1200px; padding: 80px 40px; } diff --git a/admin-dev/themes/default/scss/admin-theme.sass b/admin-dev/themes/default/scss/admin-theme.sass index f82238e30..a9f3d977d 100755 --- a/admin-dev/themes/default/scss/admin-theme.sass +++ b/admin-dev/themes/default/scss/admin-theme.sass @@ -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" \ No newline at end of file diff --git a/admin-dev/themes/default/scss/backward-admin-bootstrap-reset.sass b/admin-dev/themes/default/scss/admin-theme/_admin-backward.sass similarity index 57% rename from admin-dev/themes/default/scss/backward-admin-bootstrap-reset.sass rename to admin-dev/themes/default/scss/admin-theme/_admin-backward.sass index 600de0402..da3f7b97d 100644 --- a/admin-dev/themes/default/scss/backward-admin-bootstrap-reset.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-backward.sass @@ -1,6 +1,4 @@ -@import compass #content.nobootstrap - //width: 100% background-color: white width: 1200px - padding: 40px \ No newline at end of file + padding: 80px 40px \ No newline at end of file diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-content.sass b/admin-dev/themes/default/scss/admin-theme/_admin-content.sass new file mode 100644 index 000000000..53c9a53f5 --- /dev/null +++ b/admin-dev/themes/default/scss/admin-theme/_admin-content.sass @@ -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 \ No newline at end of file diff --git a/admin-dev/themes/default/scss/admin-theme/_admin-toolbar.sass b/admin-dev/themes/default/scss/admin-theme/_admin-toolbar.sass index 875ba6325..d41a09ae1 100644 --- a/admin-dev/themes/default/scss/admin-theme/_admin-toolbar.sass +++ b/admin-dev/themes/default/scss/admin-theme/_admin-toolbar.sass @@ -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 + diff --git a/admin-dev/themes/default/scss/admin-theme/_bootstrap-init.scss b/admin-dev/themes/default/scss/admin-theme/_bootstrap-init.scss deleted file mode 100644 index d674ede04..000000000 --- a/admin-dev/themes/default/scss/admin-theme/_bootstrap-init.scss +++ /dev/null @@ -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"; diff --git a/admin-dev/themes/default/scss/admin-theme/_bootstrap-variables.scss b/admin-dev/themes/default/scss/admin-theme/_bootstrap-variables.scss index a9a750317..1444f4237 100644 --- a/admin-dev/themes/default/scss/admin-theme/_bootstrap-variables.scss +++ b/admin-dev/themes/default/scss/admin-theme/_bootstrap-variables.scss @@ -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 diff --git a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl index 970a6d754..f0ed1213a 100644 --- a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl +++ b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl @@ -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 *} -
+

{l s='Configuration'}

diff --git a/admin-dev/themes/default/template/controllers/modules/configure.tpl b/admin-dev/themes/default/template/controllers/modules/configure.tpl index a2a011fbe..d4d28d619 100644 --- a/admin-dev/themes/default/template/controllers/modules/configure.tpl +++ b/admin-dev/themes/default/template/controllers/modules/configure.tpl @@ -38,13 +38,13 @@
  • - +
    {l s='Uninstall'}
  • - +
    {l s='Reset'}
    • diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl index 76174deec..5169bdef0 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl @@ -26,7 +26,6 @@
    {block name="leadin"}{/block}
    - {if $display_key} {/if} @@ -35,9 +34,9 @@ {l s='Transplant a module'} -
    +
    -
    +
    -
    +
    -
    +
    -
    +
    -
    -
    +
    +

    {l s='Please specify the files for which you do not want the module to be displayed.'}
    {l s='Please input each filename, separated by a comma.'}
    @@ -73,22 +72,18 @@

    - -
    -
    - {if $edit_graft} - - - {/if} - -
    +
    + {if $edit_graft} + + + {/if} +