diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 4bd7bc12b..6fe55d2c4 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -264,12 +264,12 @@ textarea { line-height: inherit; } a { - color: #3d3d3d; + color: #272822; text-decoration: none; } a:hover, a:focus { - color: #171717; + color: black; text-decoration: underline; } a:focus { @@ -970,13 +970,15 @@ th { .table-bordered > colgroup + tbody > tr:first-child > td:last-child { border-top-right-radius: 3px; } -.table-striped > tbody > tr:nth-child(odd) > td, -.table-striped > tbody > tr:nth-child(odd) > th { +.table-striped > tbody > tr:nth-child(odd) > td, .table > tbody > tr:nth-child(odd) > td, +.table-striped > tbody > tr:nth-child(odd) > th, +.table > tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -.table-hover > tbody > tr:hover > td, -.table-hover > tbody > tr:hover > th { - background-color: #a3a3a3; } +.table-hover > tbody > tr:hover > td, .table > tbody > tr:hover > td, +.table-hover > tbody > tr:hover > th, +.table > tbody > tr:hover > th { + background-color: #e1f3e5; } table col[class^="col-"] { float: none; @@ -1000,16 +1002,19 @@ table th[class^="col-"] { background-color: #fcf8e3; border-color: #fbeed5; } -.table-hover > tbody > tr > td.success:hover, -.table-hover > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td { +.table-hover > tbody > tr > td.success:hover, .table > tbody > tr > td.success:hover, +.table-hover > tbody > tr > th.success:hover, +.table > tbody > tr > th.success:hover, .table-hover > tbody > tr.success:hover > td, .table > tbody > tr.success:hover > td { background-color: #d0e9c6; border-color: #c9e2b3; } -.table-hover > tbody > tr > td.danger:hover, -.table-hover > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td { +.table-hover > tbody > tr > td.danger:hover, .table > tbody > tr > td.danger:hover, +.table-hover > tbody > tr > th.danger:hover, +.table > tbody > tr > th.danger:hover, .table-hover > tbody > tr.danger:hover > td, .table > tbody > tr.danger:hover > td { background-color: #ebcccc; border-color: #e6c1c7; } -.table-hover > tbody > tr > td.warning:hover, -.table-hover > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td { +.table-hover > tbody > tr > td.warning:hover, .table > tbody > tr > td.warning:hover, +.table-hover > tbody > tr > th.warning:hover, +.table > tbody > tr > th.warning:hover, .table-hover > tbody > tr.warning:hover > td, .table > tbody > tr.warning:hover > td { background-color: #faf2cc; border-color: #f8e5be; } @@ -1496,14 +1501,14 @@ input[type="color"].input-small { .btn-primary { color: white; - background-color: #3d3d3d; - border-color: #3d3d3d; } + background-color: #272822; + border-color: #272822; } .btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active { - background-color: #303030; - border-color: #242424; } + background-color: #1a1a16; + border-color: #0c0c0b; } .btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary:active, fieldset[disabled] .btn-primary.active { - background-color: #3d3d3d; - border-color: #3d3d3d; } + background-color: #272822; + border-color: #272822; } .btn-warning { color: white; @@ -1550,7 +1555,7 @@ input[type="color"].input-small { border-color: #5bc0de; } .btn-link { - color: #3d3d3d; + color: #272822; font-weight: normal; cursor: pointer; border-radius: 0; } @@ -1562,7 +1567,7 @@ input[type="color"].input-small { .btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { border-color: transparent; } .btn-link:hover, .btn-link:focus { - color: #171717; + color: black; text-decoration: underline; background-color: transparent; } .btn-link[disabled]:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:hover, fieldset[disabled] .btn-link:focus { @@ -1666,25 +1671,25 @@ input[type="button"].btn-block { .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { text-decoration: none; color: white; - background-color: #303030; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3d3d3d), to(#303030)); - background-image: -webkit-linear-gradient(top, #3d3d3d, #303030); - background-image: -moz-linear-gradient(top, #3d3d3d, #303030); - background-image: linear-gradient(to bottom, #3d3d3d, #303030); + background-color: #1a1a16; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#272822), to(#1a1a16)); + background-image: -webkit-linear-gradient(top, #272822, #1a1a16); + background-image: -moz-linear-gradient(top, #272822, #1a1a16); + background-image: linear-gradient(to bottom, #272822, #1a1a16); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF3D3D3D', endColorstr='#FF303030', GradientType=0); } + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF272822', endColorstr='#FF1A1A16', GradientType=0); } .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { color: white; text-decoration: none; outline: 0; - background-color: #303030; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#3d3d3d), to(#303030)); - background-image: -webkit-linear-gradient(top, #3d3d3d, #303030); - background-image: -moz-linear-gradient(top, #3d3d3d, #303030); - background-image: linear-gradient(to bottom, #3d3d3d, #303030); + background-color: #1a1a16; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#272822), to(#1a1a16)); + background-image: -webkit-linear-gradient(top, #272822, #1a1a16); + background-image: -moz-linear-gradient(top, #272822, #1a1a16); + background-image: linear-gradient(to bottom, #272822, #1a1a16); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF3D3D3D', endColorstr='#FF303030', GradientType=0); } + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF272822', endColorstr='#FF1A1A16', GradientType=0); } .dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { color: #999999; } @@ -1768,12 +1773,12 @@ a.list-group-item:hover, a.list-group-item:focus { a.list-group-item.active { z-index: 2; color: white; - background-color: #3d3d3d; - border-color: #3d3d3d; } + background-color: #272822; + border-color: #272822; } a.list-group-item.active .list-group-item-heading { color: inherit; } a.list-group-item.active .list-group-item-text { - color: #a3a3a3; } + color: #919482; } .panel { padding: 15px; @@ -1803,11 +1808,11 @@ a.list-group-item.active { border-bottom-right-radius: 2px; } .panel-primary { - border-color: #3d3d3d; } + border-color: #272822; } .panel-primary .panel-heading { color: white; - background-color: #3d3d3d; - border-color: #3d3d3d; } + background-color: #272822; + border-color: #272822; } .panel-success { border-color: #d6e9c6; } @@ -1924,8 +1929,8 @@ button.close { margin-top: 9px; } .nav.open > a, .nav.open > a:hover, .nav.open > a:focus { color: #fff; - background-color: #3d3d3d; - border-color: #3d3d3d; } + background-color: #272822; + border-color: #272822; } .nav.open > a .caret, .nav.open > a:hover .caret, .nav.open > a:focus .caret { border-top-color: #fff; border-bottom-color: #fff; } @@ -1965,7 +1970,7 @@ button.close { margin-left: 2px; } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { color: #fff; - background-color: #3d3d3d; } + background-color: #272822; } .nav-stacked > li { float: none; } @@ -2017,12 +2022,12 @@ button.close { display: block; } .nav .caret { - border-top-color: #3d3d3d; - border-bottom-color: #3d3d3d; } + border-top-color: #272822; + border-bottom-color: #272822; } .nav a:hover .caret { - border-top-color: #171717; - border-bottom-color: #171717; } + border-top-color: black; + border-bottom-color: black; } .nav-tabs .dropdown-menu { margin-top: -1px; @@ -2048,8 +2053,8 @@ button.close { margin-top: 10px; margin-bottom: 15px; } .navbar-nav > li > a { - padding-top: 16.5px; - padding-bottom: 16.5px; + padding-top: 9px; + padding-bottom: 9px; color: #777777; line-height: 20px; border-radius: 3px; } @@ -2119,8 +2124,8 @@ button.close { margin-top: 4px; } .navbar-form { - margin-top: 11.5px; - margin-bottom: 11.5px; } + margin-top: 4px; + margin-bottom: 4px; } .navbar-nav > li > .dropdown-menu { margin-top: 0; @@ -2217,11 +2222,11 @@ button.close { height: auto !important; overflow: visible !important; } } .navbar-btn { - margin-top: 11.5px; } + margin-top: 4px; } .navbar-text { - margin-top: 16.5px; - margin-bottom: 16.5px; } + margin-top: 9px; + margin-bottom: 9px; } .navbar-link { color: #777777; } @@ -2855,7 +2860,7 @@ button.close { a.thumbnail:hover, a.thumbnail:focus { - border-color: #3d3d3d; } + border-color: #272822; } .thumbnail > img { margin-left: auto; @@ -2883,7 +2888,7 @@ a.thumbnail:focus { .media-heading { margin: 0 0 5px; } -.media > .pull-left, .page-head .media > h2.page-title { +.media > .pull-left, #content .page-head .media > h2.page-title { margin-right: 10px; } .media > .pull-right { margin-left: 10px; } @@ -2959,7 +2964,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a. .nav-pills > .active > a > .badge, .nav-pills > .active > a > .badge-success, .nav-pills > .active > a > .badge-error { - color: #3d3d3d; + color: #272822; background-color: #fff; } .nav-pills > li > a > .badge, .nav-pills > li > a > .badge-success, .nav-pills > li > a > .badge-error { @@ -3017,7 +3022,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a. color: #fff; text-align: center; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #3d3d3d; + background-color: #272822; -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -webkit-transition: width 0.6s ease; @@ -3026,7 +3031,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a. transition: width 0.6s ease; } .progress-striped .progress-bar { - background-color: #3d3d3d; + background-color: #272822; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); @@ -3109,7 +3114,7 @@ a.list-group-item.active > .badge, a.list-group-item.active > .badge-success, a. .pull-right { float: right; } -.pull-left, .page-head h2.page-title { +.pull-left, #content .page-head h2.page-title { float: left; } .hide { @@ -3434,12 +3439,12 @@ a [class*=" icon-"] { .pull-right { float: right; } -.pull-left, .page-head h2.page-title { +.pull-left, #content .page-head h2.page-title { float: left; } -[class^="icon-"].pull-left, .page-head h2[class^="icon-"].page-title, +[class^="icon-"].pull-left, #content .page-head h2[class^="icon-"].page-title, [class*=" icon-"].pull-left, -.page-head h2[class*=" icon-"].page-title { +#content .page-head h2[class*=" icon-"].page-title { margin-right: .3em; } [class^="icon-"].pull-right, @@ -3500,10 +3505,10 @@ a [class*=" icon-"] { .nav-pills [class*=" icon-"].icon-large { line-height: .9em; } -.btn [class^="icon-"].pull-left.icon-2x, .btn .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn h2[class^="icon-"].icon-2x.page-title, +.btn [class^="icon-"].pull-left.icon-2x, .btn #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn h2[class^="icon-"].icon-2x.page-title, .btn [class*=" icon-"].pull-left.icon-2x, -.btn .page-head h2[class*=" icon-"].icon-2x.page-title, -.page-head .btn h2[class*=" icon-"].icon-2x.page-title, +.btn #content .page-head h2[class*=" icon-"].icon-2x.page-title, +#content .page-head .btn h2[class*=" icon-"].icon-2x.page-title, .btn [class^="icon-"].pull-right.icon-2x, .btn [class*=" icon-"].pull-right.icon-2x { margin-top: .18em; } @@ -3512,10 +3517,10 @@ a [class*=" icon-"] { .btn [class*=" icon-"].icon-spin.icon-large { line-height: .8em; } -.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-small h2[class^="icon-"].icon-2x.page-title, +.btn.btn-small [class^="icon-"].pull-left.icon-2x, .btn.btn-small #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn.btn-small h2[class^="icon-"].icon-2x.page-title, .btn.btn-small [class*=" icon-"].pull-left.icon-2x, -.btn.btn-small .page-head h2[class*=" icon-"].icon-2x.page-title, -.page-head .btn.btn-small h2[class*=" icon-"].icon-2x.page-title, +.btn.btn-small #content .page-head h2[class*=" icon-"].icon-2x.page-title, +#content .page-head .btn.btn-small h2[class*=" icon-"].icon-2x.page-title, .btn.btn-small [class^="icon-"].pull-right.icon-2x, .btn.btn-small [class*=" icon-"].pull-right.icon-2x { margin-top: .25em; } @@ -3524,18 +3529,18 @@ a [class*=" icon-"] { .btn.btn-large [class*=" icon-"] { margin-top: 0; } -.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title, +.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title, .btn.btn-large [class*=" icon-"].pull-left.icon-2x, -.btn.btn-large .page-head h2[class*=" icon-"].icon-2x.page-title, -.page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title, +.btn.btn-large #content .page-head h2[class*=" icon-"].icon-2x.page-title, +#content .page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title, .btn.btn-large [class^="icon-"].pull-right.icon-2x, .btn.btn-large [class*=" icon-"].pull-right.icon-2x { margin-top: .05em; } -.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large .page-head h2[class^="icon-"].icon-2x.page-title, .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title, +.btn.btn-large [class^="icon-"].pull-left.icon-2x, .btn.btn-large #content .page-head h2[class^="icon-"].icon-2x.page-title, #content .page-head .btn.btn-large h2[class^="icon-"].icon-2x.page-title, .btn.btn-large [class*=" icon-"].pull-left.icon-2x, -.btn.btn-large .page-head h2[class*=" icon-"].icon-2x.page-title, -.page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title { +.btn.btn-large #content .page-head h2[class*=" icon-"].icon-2x.page-title, +#content .page-head .btn.btn-large h2[class*=" icon-"].icon-2x.page-title { margin-right: .2em; } .btn.btn-large [class^="icon-"].pull-right.icon-2x, @@ -5013,13 +5018,12 @@ html, body { body.fixed-top { position: relative; - top: 53px; + top: 35px; margin-bottom: 50px; - background-color: #e0e0e0; } + background-color: #272822; } #header_infos { - height: 53px; - background-color: #0a0a0a; + background-color: #0c0c0b; z-index: 9999; } #header_infos #header_shopname { font-size: 1.6em; @@ -5031,15 +5035,29 @@ body.fixed-top { background-color: #dc315e; } #main { - min-height: 100%; - height: 100%; position: relative; } +.container-fluid, .row-fluid { + width: 100%; } + #content { - min-height: 100%; - padding: 90px 20px 90px; - margin: 0 0 0 240px; - background-color: #e0e0e0; } + min-height: 700px; + padding: 90px 20px 20px; + margin-left: 240px; + -webkit-transition-property: margin; + -moz-transition-property: margin; + -o-transition-property: margin; + transition-property: margin; + -webkit-transition-duration: 0.4s; + -moz-transition-duration: 0.4s; + -o-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; + background-color: #e0e0e0; + background-image: url("../img/patterns/bedge_grunge.png"); } #content fieldset, #content .panel { padding: 20px; margin-bottom: 20px; @@ -5062,11 +5080,11 @@ body.fixed-top { font-size: 1.2em; font-weight: 300; text-transform: uppercase; - background-color: #3d3d3d; } + background-color: #272822; } #content h3 i, #content .panel-heading i, #content h3 a, #content .panel-heading a, #content .panel-heading i, #content .panel-heading a { - color: #665d5c !important; } + color: #60c276 !important; } #content h3 .badge, #content .panel-heading .badge, #content h3 .badge-success, #content .panel-heading .badge-success, #content h3 .badge-error, #content .panel-heading .badge-error, #content .panel-heading .badge, #content .panel-heading .badge-success, #content .panel-heading .badge-error { - background-color: #707070; + background-color: #5d5f51; border-radius: 0; height: 29px; line-height: 25px; @@ -5092,79 +5110,72 @@ body.fixed-top { border-bottom: solid 1px #c7c7c7; -webkit-box-shadow: white 0 0 0 1px inset; box-shadow: white 0 0 0 1px inset; } - -.page-head { - width: 100%; - height: 69px; - padding: 5px 10px 0 0; - margin: 0; - border-bottom: 4px solid #302c2c; - position: fixed; - top: 53px; - left: 0px; - z-index: 9000; - background-color: #665d5c; - -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset; - box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset; } - .page-head h2.page-title { - padding: 0 0 0 260px; - font-size: 20px; - line-height: 25px; - color: white; - text-transform: uppercase; } - .page-head .btn-toolbar { - margin: 0; } - .page-head .btn-toolbar .nav-tabs { + #content .page-head { + width: 100%; + height: 69px; + padding: 5px 10px 0 0; + margin: 0; + border-bottom: 4px solid #348847; + position: fixed; + top: 37px; + left: 0px; + z-index: 9000; + background-color: #60c276; + -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset; + box-shadow: rgba(0, 0, 0, 0.15) 0 7px 0, rgba(255, 255, 255, 0.15) 0 -1px 0 inset; } + #content .page-head h2.page-title { + padding: 0 0 0 260px; + font-size: 20px; + line-height: 25px; + color: white; + text-transform: uppercase; } + #content .page-head .btn-toolbar { margin: 0; } - .page-head .btn-toolbar .nav-tabs > li > a { - color: #333333; } - .page-head .btn-toolbar .nav-tabs > li > a > .active > a, .page-head .btn-toolbar .nav-tabs > li > a > .active > a:hover { - color: #3399ff; - background: whitesmoke; } + #content .page-head .btn-toolbar .nav-tabs { + margin: 0; } + #content .page-head .btn-toolbar .nav-tabs > li > a { + color: #333333; } + #content .page-head .btn-toolbar .nav-tabs > li > a > .active > a, #content .page-head .btn-toolbar .nav-tabs > li > a > .active > a:hover { + color: #3399ff; + background: whitesmoke; } -.page-sidebar { +#sidebar { z-index: 9001; - top: 53px; - position: fixed; + float: left; + position: absolute; width: 240px; - border-bottom: solid 1px black; - background-color: #3d3d3d; - -webkit-box-shadow: #949494 0 4px 0; - box-shadow: #949494 0 4px 0; - min-height: 700px; - height: 100%; } - .page-sidebar > ul > li > ul.sub-menu { + background-color: #272822; + border-bottom: 1px solid #34362e; + border-right: 1px solid black; } + #sidebar > ul > li > ul.sub-menu { display: none; list-style: none; clear: both; margin: 8px 0px 8px 0px; } - .page-sidebar > ul { - height: 100%; - overflow: scroll; + #sidebar > ul { margin: 0; - padding: 0; - padding-bottom: 100px; } - .page-sidebar > ul li { - background-color: #3d3d3d; + padding: 0; } + #sidebar > ul li { + background-color: #272822; list-style: none; } - .page-sidebar > ul li:not(.active) ul { + #sidebar > ul li:not(.active) ul { display: none; } - .page-sidebar > ul li.expanded ul { + #sidebar > ul li.expanded ul { display: block; background-color: white; } - .page-sidebar > ul > li:hover > a, .page-sidebar > ul > li.active > a { + #sidebar > ul > li:hover > a, #sidebar > ul > li.active > a { color: white; - background-color: #303030; - -webkit-box-shadow: #665d5c -4px 0 0 inset; - box-shadow: #665d5c -4px 0 0 inset; } - .page-sidebar > ul > li:hover > a i, .page-sidebar > ul > li.active > a i { - color: #665d5c !important; } - .page-sidebar > ul > li > a { + background-color: #1a1a16; + -webkit-box-shadow: #60c276 -4px 0 0 inset; + box-shadow: #60c276 -4px 0 0 inset; } + #sidebar > ul > li:hover > a i, #sidebar > ul > li.active > a i { + color: #60c276 !important; } + #sidebar > ul > li > a { display: block; padding: 5px 0 5px 5px; - border-top: 1px solid #4a4a4a; - border-bottom: 1px solid #171717; - color: #b0b0b0; + border-top: 1px solid #34362e; + border-bottom: 1px solid black; + color: #9da08f; text-transform: uppercase; text-decoration: none; -webkit-transition-property: background-color, border, box-shadow; @@ -5179,9 +5190,10 @@ body.fixed-top { -moz-transition-timing-function: ease-out; -o-transition-timing-function: ease-out; transition-timing-function: ease-out; - -webkit-box-shadow: #171717 -4px 0 0 inset; - box-shadow: #171717 -4px 0 0 inset; } - .page-sidebar > ul > li > a i { + -webkit-box-shadow: black -4px 0 0 inset; + box-shadow: black -4px 0 0 inset; } + #sidebar > ul > li > a i { + color: #6a6d5d !important; -webkit-transition-property: color; -moz-transition-property: color; -o-transition-property: color; @@ -5194,33 +5206,68 @@ body.fixed-top { -moz-transition-timing-function: ease-out; -o-transition-timing-function: ease-out; transition-timing-function: ease-out; } - .page-sidebar > ul > li img { + #sidebar > ul > li img { margin-right: 10px; } - .page-sidebar > ul > li ul { + #sidebar > ul > li ul { margin: 0; padding: 0; border-bottom: 1px solid #cecece; background-color: white; } - .page-sidebar > ul > li ul li a { + #sidebar > ul > li ul li a { display: block; padding: 3px 10px 3px 10px; font-size: 12px; border: none; - border-bottom: 1px solid #a69d9c; + border-bottom: 1px solid #bce5c5; background-color: white; } - .page-sidebar > ul > li ul li a i { + #sidebar > ul > li ul li a i { margin-top: 3px; - color: #665d5c; } - .page-sidebar > ul > li ul li a:hover { - background-color: #beb7b7; + color: #60c276; } + #sidebar > ul > li ul li a:hover { + background-color: #e1f3e5; text-decoration: none; } - .page-sidebar > ul > li ul li a:hover i { - color: #3d3d3d; } - .page-sidebar > ul > li ul li.active a { + #sidebar > ul > li ul li a:hover i { + color: #272822; } + #sidebar > ul > li ul li.active a { color: #1a1a1a; - background-color: #665d5c; } - .page-sidebar > ul > li ul li.active a i { - color: #3d3d3d; } + background-color: #60c276; } + #sidebar > ul > li ul li.active a i { + color: #272822; } + +.page-sidebar-closed #sidebar { + width: 50px; + white-space: nowrap; + -webkit-transition-property: width; + -moz-transition-property: width; + -o-transition-property: width; + transition-property: width; + -webkit-transition-duration: 0.4s; + -moz-transition-duration: 0.4s; + -o-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; } + .page-sidebar-closed #sidebar span.title { + display: none; } + .page-sidebar-closed #sidebar ul.submenu { + display: none !important; } +.page-sidebar-closed #content { + margin-left: 50px; } + .page-sidebar-closed #content .page-head h2.page-title { + padding: 0 0 0 70px; } + +.menu-collapse { + height: 70px; + width: 100%; + font-size: 2em; + text-align: center; + line-height: 68px; + display: block; + background-color: black; } + .menu-collapse i { + color: white !important; } #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] { font-size: 22px; @@ -5233,7 +5280,7 @@ body.fixed-top { line-height: 35px; } .toolbar_btn { - border: solid 1px #736968; + border: solid 1px #97d7a6; position: relative; padding: 2px 5px !important; margin-right: 3px; @@ -5243,7 +5290,9 @@ body.fixed-top { text-align: center; text-shadow: none; } .toolbar_btn:hover { - background-color: #736968 !important; } + color: #348847; + border-color: white; + background-color: white; } .icon-AdminDashboard { background-color: #87c795; } @@ -5285,9 +5334,9 @@ body.fixed-top { background-color: #87c795; } [class^="icon-Admin"] { - background-color: #242424; + background-color: #0c0c0b; margin-right: 6px; - color: #575757 !important; } + color: #424439 !important; } [class^="process-icon-"], [class*=" process-icon-"] { height: 32px; @@ -5363,41 +5412,48 @@ input[type="password"].input-tiny { .btn-default { border-color: #adadad; - color: #636363; - background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e0e0e0), color-stop(100%, #c7c7c7)); - background: -webkit-linear-gradient(top, #e0e0e0, #c7c7c7); - background: -moz-linear-gradient(top, #e0e0e0, #c7c7c7); - background: -o-linear-gradient(top, #e0e0e0, #c7c7c7); - background: linear-gradient(top, #e0e0e0, #c7c7c7); - -webkit-box-shadow: white 0 0 0 1px inset; - box-shadow: white 0 0 0 1px inset; } + color: #4f5145; + background-color: white; + -webkit-box-shadow: rgba(0, 0, 0, 0.1) 0 -2px 0 inset; + box-shadow: rgba(0, 0, 0, 0.1) 0 -2px 0 inset; } .btn-default:hover, .btn-default:focus { border-color: #949494; - color: #636363; - background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c7c7c7), color-stop(100%, #adadad)); - background: -webkit-linear-gradient(top, #c7c7c7, #adadad); - background: -moz-linear-gradient(top, #c7c7c7, #adadad); - background: -o-linear-gradient(top, #c7c7c7, #adadad); - background: linear-gradient(top, #c7c7c7, #adadad); } + color: #4f5145; + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e0e0e0), color-stop(100%, #d3d3d3)); + background: -webkit-linear-gradient(top, #e0e0e0, #d3d3d3); + background: -moz-linear-gradient(top, #e0e0e0, #d3d3d3); + background: -o-linear-gradient(top, #e0e0e0, #d3d3d3); + background: linear-gradient(top, #e0e0e0, #d3d3d3); } .btn-primary { - border-color: #665d5c; - color: white; - background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #817574), color-stop(100%, #665d5c)); - background: -webkit-linear-gradient(top, #817574, #665d5c); - background: -moz-linear-gradient(top, #817574, #665d5c); - background: -o-linear-gradient(top, #817574, #665d5c); - background: linear-gradient(top, #817574, #665d5c); - -webkit-box-shadow: #817574 0 0 0 1px inset; - box-shadow: #817574 0 0 0 1px inset; } + border-color: #60c276; + color: #4f5145; + background-color: #f3fbf5; + -webkit-box-shadow: #aadeb6 0 -2px 0 inset; + box-shadow: #aadeb6 0 -2px 0 inset; } .btn-primary:hover, .btn-primary:focus { - border-color: #665d5c; + border-color: #60c276; color: white; - background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #665d5c), color-stop(100%, #4b4544)); - background: -webkit-linear-gradient(top, #665d5c, #4b4544); - background: -moz-linear-gradient(top, #665d5c, #4b4544); - background: -o-linear-gradient(top, #665d5c, #4b4544); - background: linear-gradient(top, #665d5c, #4b4544); } + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #60c276), color-stop(100%, #42ad5a)); + background: -webkit-linear-gradient(top, #60c276, #42ad5a); + background: -moz-linear-gradient(top, #60c276, #42ad5a); + background: -o-linear-gradient(top, #60c276, #42ad5a); + background: linear-gradient(top, #60c276, #42ad5a); } + +.btn-default[disabled] { + border-color: #858874; + color: #4f5145; + background-color: #cecfc7; + -webkit-box-shadow: #b5b8ab 0 -2px 0 inset; + box-shadow: #b5b8ab 0 -2px 0 inset; } + .btn-default[disabled]:hover, .btn-default[disabled]:focus { + border-color: #60c276; + color: white; + background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #60c276), color-stop(100%, #42ad5a)); + background: -webkit-linear-gradient(top, #60c276, #42ad5a); + background: -moz-linear-gradient(top, #60c276, #42ad5a); + background: -o-linear-gradient(top, #60c276, #42ad5a); + background: linear-gradient(top, #60c276, #42ad5a); } .btn-group-action { display: inline-block; @@ -5406,7 +5462,7 @@ input[type="password"].input-tiny { text-decoration: none; } .btn .caret { - border-top-color: #636363 !important; } + border-top-color: #4f5145 !important; } hr { border-color: #c7c7c7; @@ -5443,23 +5499,6 @@ hr { font-size: 12px; -webkit-box-shadow: rgba(0, 0, 0, 0.15) 0 1px 0; box-shadow: rgba(0, 0, 0, 0.15) 0 1px 0; } - .table tbody > tr:hover > td { - cursor: pointer; - background-color: #8d8281; - -webkit-transition-property: background-color; - -moz-transition-property: background-color; - -o-transition-property: background-color; - transition-property: background-color; - -webkit-transition-duration: 0.4s; - -moz-transition-duration: 0.4s; - -o-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; - -webkit-box-shadow: rgba(102, 93, 92, 0.8) 0 2px 0; - box-shadow: rgba(102, 93, 92, 0.8) 0 2px 0; } .table td.center, .table th.center { text-align: center; } .table tr td:first-child, @@ -5487,7 +5526,7 @@ tr.filter { background-color: #f2f2f2; } .badge, .badge-success, .badge-error { - background-color: #665d5c; } + background-color: #60c276; } .badge-success { background-color: #5cb85c; } @@ -5506,17 +5545,43 @@ tr.filter { margin: 0; padding: 0; background-color: transparent; - color: #3d3d3d; + color: #272822; font-weight: 500; } #footer { - z-index: 9002; - display: block; - bottom: 0; + width: 100%; + float: left; padding: 5px 0; - background-color: lightgrey; - -webkit-box-shadow: #7a7a7a 0 2px 10px inset; - box-shadow: #7a7a7a 0 2px 10px inset; } + background-color: black; + color: #888888; } + #footer a { + color: #cccccc; } + #footer a.link-social:hover { + text-decoration: none; } + #footer a.link-social i { + font-size: 2em; + width: 30px; + height: 30px; + display: inline-block; + line-height: 30px; + text-align: center; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + -ms-border-radius: 30px; + -o-border-radius: 30px; + border-radius: 30px; } + #footer .link-twitter i { + color: white; + background-color: #7cceef; } + #footer .link-facebook i { + color: white; + background-color: #557dbb; } + #footer .link-github i { + color: black; + background-color: white; } + #footer .link-google i { + color: white; + background-color: #e6644e; } #footer #go-top { position: fixed; bottom: 10px; @@ -5538,27 +5603,3 @@ tr.filter { color: #666666; font-size: 22px; margin-bottom: 5px; } - #footer .link-social:hover { - text-decoration: none; } - #footer .link-social i { - font-size: 2em; - width: 30px; - height: 30px; - display: inline-block; - line-height: 30px; - text-align: center; - -webkit-border-radius: 30px; - -moz-border-radius: 30px; - -ms-border-radius: 30px; - -o-border-radius: 30px; - border-radius: 30px; } - #footer .link-twitter i { - background-color: #7cceef; } - #footer .link-facebook i { - color: white; - background-color: #557dbb; } - #footer .link-github i { - background-color: white; } - #footer .link-google i { - color: white; - background-color: #e6644e; } diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass index 41dfbadb5..a09aca74c 100755 --- a/admin-dev/themes/default/css/admin-theme.sass +++ b/admin-dev/themes/default/css/admin-theme.sass @@ -19,27 +19,26 @@ $bg-content-color: #E0E0E0 // gris foncé //$bg-head-color: #F8235A //rose //$bg-head-color: #F2B100 //moutarde //$bg-head-color: #F7854E // abricot -$bg-head-color: #665D5C // taupe clair -//$bg-head-color: #60C276 +//$bg-head-color: #665D5C // taupe clair +$bg-head-color: #60C276 //vert -//light (experimental) +//light //$brand-primary: #98958C // sable //$brand-primary: #92979B //gris //$brand-primary: #A9B6C1 //bleu - //dark -$brand-primary: #3D3D3D // taupe +//$brand-primary: #3D3D3D // gris //$brand-primary: #515561 // gris bleu clair //$brand-primary: #4D4645 //taupe -//$brand-primary: #272822 // gris vert +$brand-primary: #272822 // gris vert //$brand-primary: #313A45 // gris //$brand-primary: #4F2E4A // violet //$brand-primary: #373E35 // vert camo //$brand-primary: #262C3F // bleu nuit $panel-color: $brand-primary +$bg-body-color: $brand-primary $badge-panel-color: #DC315E -$bg-body-color: $bg-content-color @import "compass" @import "bootstrap/variables" @@ -53,16 +52,13 @@ html, body body.fixed-top position: relative - top: 53px + top: 35px margin-bottom: 50px background-color: $bg-body-color #header_infos - height: 53px - //border-bottom: solid 2px black - background-color: darken($brand-primary,20%) + background-color: darken($brand-primary,10%) z-index: 9999 - //@include box-shadow(rgba(black,0.15) 0 2px 0) #header_shopname font-size: 1.6em font-family: "ubuntu" @@ -74,21 +70,20 @@ body.fixed-top background-color: $badge-panel-color #main - min-height: 100% - height: 100% position: relative +.container-fluid, .row-fluid + width: 100% + #content - //float: left - min-height: 100% - //width: 1278px - padding: 90px 20px 90px - margin: 0 0 0 240px - //border-left: 2px solid black - //border-right: 2px solid black + min-height: 700px + padding: 90px 20px 20px + margin-left: 240px + @include transition-property(margin) + @include transition-duration(0.4s) + @include transition-timing-function(ease-out) background-color: $bg-content-color - //background-image: url('../img/patterns/bedge_grunge.png') - //@include box-shadow(darken($bg-content-color,30%) 0 0 0 4px) + background-image: url('../img/patterns/bedge_grunge.png') fieldset, .panel padding: 20px margin-bottom: 20px @@ -123,11 +118,9 @@ body.fixed-top margin-left: -5px .panel-danger .panel-heading background-color: $badge-panel-color!important - .panel-heading-big font-size: 2em text-align: center - form .alert clear: both color: darken(#D6D2CF,40%) @@ -139,57 +132,51 @@ body.fixed-top border: none border-bottom: solid 1px darken($bg-content-color,10%) @include box-shadow(white 0 0 0 1px inset) - -.page-head - width: 100% - height: 69px - padding: 5px 10px 0 0 - margin: 0 - border-bottom: 4px solid darken($bg-head-color,20%) - position: fixed - top: 53px - left: 0px - z-index: 9000 - background-color: $bg-head-color - @include box-shadow(rgba(black,0.15) 0 7px 0, rgba(white,0.15) 0 -1px 0 inset) - h2.page-title - @extend .pull-left - padding: 0 0 0 260px - font-size: 20px - line-height: 25px - color: white - text-transform: uppercase - .btn-toolbar + .page-head + width: 100% + height: 69px + padding: 5px 10px 0 0 margin: 0 - .nav-tabs + border-bottom: 4px solid darken($bg-head-color,20%) + position: fixed + top: 37px + left: 0px + z-index: 9000 + background-color: $bg-head-color + @include box-shadow(rgba(black,0.15) 0 7px 0, rgba(white,0.15) 0 -1px 0 inset) + h2.page-title + @extend .pull-left + padding: 0 0 0 260px + font-size: 20px + line-height: 25px + color: white + text-transform: uppercase + .btn-toolbar margin: 0 - .nav-tabs > li > a - color: #333 - > .active > a, > .active > a:hover - color: #3399ff - background: #f5f5f5 + .nav-tabs + margin: 0 + .nav-tabs > li > a + color: #333 + > .active > a, > .active > a:hover + color: #3399ff + background: #f5f5f5 -.page-sidebar +#sidebar z-index: 9001 - top: 53px - position: fixed + float: left + position: absolute width: 240px - border-bottom: solid 1px black background-color: $brand-primary - @include box-shadow(darken($bg-content-color,30%) 0 4px 0) - min-height: 700px - height: 100% + border-bottom: 1px solid lighten($brand-primary,5%) + border-right: 1px solid black > ul > li > ul.sub-menu display: none list-style: none clear: both margin: 8px 0px 8px 0px > ul - height: 100% - overflow: scroll margin: 0 padding: 0 - padding-bottom: 100px li background-color: lighten($brand-primary,0) list-style: none @@ -219,6 +206,7 @@ body.fixed-top @include transition-timing-function(ease-out) @include box-shadow(darken($brand-primary,15%) -4px 0 0 inset) i + color: lighten($brand-primary,25%)!important @include transition-property(color) @include transition-duration(0.4s) @include transition-timing-function(ease-out) @@ -252,6 +240,35 @@ body.fixed-top i color: $brand-primary +.page-sidebar-closed + #sidebar + width: 50px + white-space: nowrap + @include transition-property(width) + @include transition-duration(0.4s) + @include transition-timing-function(ease-out) + span.title + display: none + ul.submenu + display: none!important + #content + margin-left: 50px + .page-head h2.page-title + padding: 0 0 0 70px + + +.menu-collapse + height: 70px + width: 100% + font-size: 2em + text-align: center + line-height: 68px + display: block + background-color: black + i + color: white!important + + #menu .maintab > a [class^="icon-"], #menu .maintab > a [class*=" icon-"] font-size: 22px border-radius: 40px @@ -264,30 +281,19 @@ body.fixed-top // Tool bar .toolbar_btn - //@extend .btn - //@extend .btn-primary - //background-color: $brand-primary - border: solid 1px lighten($bg-head-color,5%) + border: solid 1px lighten($bg-head-color,15%) position: relative padding: 2px 5px !important margin-right: 3px - //border-bottom: 4px solid darken($brand-primary,7%) font-size: 12px font-weight: 600 color: white text-align: center text-shadow: none - //@include background(linear-gradient(top, lighten($brand-primary,15%), $brand-primary)) - //@include box-shadow(rgba(black,0.15) 0 3px 0, rgba(white,0.1) 0 0 0 1px inset) &:hover - //top: 2px - //border-color: $brand-primary - //border-bottom: 2px solid lighten($brand-primary,10%) - //color: $brand-primary - //@include text-shadow(lighten($bg-head-color,15%) 1px 1px 0) - background-color: lighten($bg-head-color,5%)!important - //@include background(linear-gradient(top left, lighten($brand-primary,75%), lighten($brand-primary,55%))) - //@include box-shadow(rgba(black,0.3) 0 1px 3px, rgba(white,0.4) 0 0 0 1px inset) + color: darken($bg-head-color,20%) + border-color: white + background-color: white .icon-AdminDashboard @extend .icon-dashboard @@ -389,13 +395,10 @@ body.fixed-top @extend .icon-bar-chart .process-icon-duplicate @extend .icon-copy - .process-icon-newCombination.toolbar-new @extend .icon-plus-sign - .process-icon-newCombination.toolbar-cancel @extend .icon-minus-sign - .process-icon-partial_refund @extend .icon-exchange .process-icon-cancel @@ -456,18 +459,30 @@ input[type="password"].input-tiny .btn-default border-color: darken($bg-content-color,20%) color: lighten($brand-primary,15%) - @include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%))) - @include box-shadow(rgba(white,1) 0 0 0 1px inset) + //@include background(linear-gradient(top,$bg-content-color, darken($bg-content-color,10%))) + background-color: white + @include box-shadow(rgba(black,0.10) 0 -2px 0 inset) &:hover, &:focus border-color: darken($bg-content-color,30%) color: lighten($brand-primary,15%) - @include background(linear-gradient(top, darken($bg-content-color,10%), darken($bg-content-color,20%))) + @include background(linear-gradient(top, darken($bg-content-color,0%), darken($bg-content-color,5%))) .btn-primary border-color: $bg-head-color - color: lighten($bg-head-color,70%) - @include background(linear-gradient(top,lighten($bg-head-color,10%),lighten($bg-head-color,0%))) - @include box-shadow(lighten($bg-head-color,10%) 0 0 0 1px inset) + color: lighten($brand-primary,15%) + background-color: lighten($bg-head-color,40%) + //@include background(linear-gradient(top,lighten($bg-head-color,10%),lighten($bg-head-color,0%))) + @include box-shadow(lighten($bg-head-color,20%) 0 -2px 0 inset) + &:hover, &:focus + border-color: $bg-head-color + color: lighten($bg-head-color,70%) + @include background(linear-gradient(top,darken($bg-head-color,0%),darken($bg-head-color,10%))) + +.btn-default[disabled] + border-color: lighten($brand-primary,35%) + color: lighten($brand-primary,15%) + background-color: lighten($brand-primary,65%) + @include box-shadow(lighten($brand-primary,55%) 0 -2px 0 inset) &:hover, &:focus border-color: $bg-head-color color: lighten($bg-head-color,70%) @@ -488,13 +503,13 @@ hr //table .table + @extend .table-striped + @extend .table-hover border-collapse: separate border-spacing: 0 2px margin-bottom: 5px thead th background-color: darken($bg-content-color,10%) - //border-bottom: solid 2px lighten($brand-primary,20%) - //@include box-shadow(rgba(black,0.15) 0 2px 3px inset) thead > tr > th font-weight: normal vertical-align: top @@ -519,13 +534,7 @@ hr word-wrap: nowrap font-size: 12px @include box-shadow(rgba(black,0.15) 0 1px 0) - tbody > tr:hover > td - cursor: pointer - background-color: lighten($bg-head-color,15%) - @include transition-property(background-color) - @include transition-duration(0.4s) - @include transition-timing-function(ease-out) - @include box-shadow(rgba($bg-head-color,0.80) 0 2px 0) + td.center, th.center text-align: center tr td:first-child, @@ -582,14 +591,36 @@ tr.filter font-weight: 500 #footer - z-index: 9002 - display: block - //position: absolute - //width: 100% - bottom: 0 + width: 100% + float: left padding: 5px 0 - background-color: darken($bg-content-color,5%) - @include box-shadow(darken($bg-content-color,40%) 0 2px 10px inset) + background-color: black + color: #888 + a + color: #ccc + a.link-social + &:hover + text-decoration: none + i + font-size: 2em + width: 30px + height: 30px + display: inline-block + line-height: 30px + text-align: center + @include border-radius(30px) + .link-twitter i + color: white + background-color: #7CCEEF + .link-facebook i + color: white + background-color: #557DBB + .link-github i + color: black + background-color: white + .link-google i + color: white + background-color: #E6644E #go-top position: fixed bottom: 10px @@ -613,24 +644,4 @@ tr.filter color: #666 font-size: 22px margin-bottom: 5px - .link-social - &:hover - text-decoration: none - i - font-size: 2em - width: 30px - height: 30px - display: inline-block - line-height: 30px - text-align: center - @include border-radius(30px) - .link-twitter i - background-color: #7CCEEF - .link-facebook i - color: white - background-color: #557DBB - .link-github i - background-color: white - .link-google i - color: white - background-color: #E6644E \ No newline at end of file + diff --git a/admin-dev/themes/default/css/bootstrap/_variables.scss b/admin-dev/themes/default/css/bootstrap/_variables.scss index ad8d87d00..0d0b1ea5b 100644 --- a/admin-dev/themes/default/css/bootstrap/_variables.scss +++ b/admin-dev/themes/default/css/bootstrap/_variables.scss @@ -84,7 +84,7 @@ $border-radius-base: 3px ; // $table-bg: transparent ; overall background-color // $table-bg-accent: #f9f9f9 ; for striping -$table-bg-hover: lighten($brand-primary,40%) ; +$table-bg-hover: lighten($bg-head-color,35%) ; // $table-border-color: #ddd ; table and cell border @@ -180,7 +180,7 @@ $grid-gutter-width: 10px ; // ------------------------- // Basics of a navbar -// $navbar-height: 50px ; +$navbar-height: 35px ; // $navbar-color: #777 ; // $navbar-bg: #eee ; // $navbar-padding: floor($grid-gutter-width / 2) ; ~15px diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl index bd938e305..ec53eeee2 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl @@ -157,7 +157,7 @@ {l s='Carrier selection'}
- +

{l s='Unselected carriers'}

@@ -190,7 +190,7 @@ {l s='Customer group selection'}
- +

{l s='Unselected groups'}

diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl index 04bf8747a..477af2bb0 100644 --- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl +++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl @@ -1,10 +1,10 @@ -
+
{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
{block name="leadin"}{/block}
-
+
  • @@ -20,23 +20,22 @@
-
+
{if $currentObject->id}{/if}
- {l s='Cart-rule information'} +

{l s='Cart-rule information'}

{include file='controllers/cart_rules/informations.tpl'}
- {l s='Cart-rule conditions'} +

{l s='Cart-rule conditions'}

{include file='controllers/cart_rules/conditions.tpl'}
- {l s='Cart-rule actions'} +

{l s='Cart-rule actions'}

{include file='controllers/cart_rules/actions.tpl'}
-
diff --git a/admin-dev/themes/default/template/controllers/images/content.tpl b/admin-dev/themes/default/template/controllers/images/content.tpl index 35584b1b4..214d2ab42 100644 --- a/admin-dev/themes/default/template/controllers/images/content.tpl +++ b/admin-dev/themes/default/template/controllers/images/content.tpl @@ -28,7 +28,7 @@ {if isset($display_regenerate)}
-
+

{l s='Regenerate thumbnails'} @@ -103,7 +103,7 @@

{else} -
+

{l s='Move images'} diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index fb3d43182..d8dd8d651 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -104,7 +104,7 @@ *} -
+

{l s='Import'} @@ -251,7 +251,7 @@

-
+

{l s='Available fields'} diff --git a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl index 6d032ad57..cedcfcfe8 100644 --- a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl @@ -69,164 +69,176 @@ }); -
-

- - {l s='Configuration information'} -

-

{l s='This information must be provided when you report an issue on our bug tracker or forum.'}

-
-
-

- - {l s='Server information'} -

- {if count($uname)} -

- {l s='Server information'}: {$uname|escape:'htmlall':'UTF-8'} -

- {/if} -

- {l s='Server software version'}: {$version.server|escape:'htmlall':'UTF-8'} -

-

- {l s='PHP version'}: {$version.php|escape:'htmlall':'UTF-8'} -

-

- {l s='Memory limit'}: {$version.memory_limit|escape:'htmlall':'UTF-8'} -

-

- {l s='Max execution time'}: {$version.max_execution_time|escape:'htmlall':'UTF-8'} -

- {if $apache_instaweb} -

{l s='PageSpeed module for Apache installed (mod_instaweb)'}

- {/if} -
-
-

- - {l s='Database information'} -

-

- {l s='MySQL version'}: {$database.version|escape:'htmlall':'UTF-8'} -

-

- {l s='MySQL engine'}: {$database.engine|escape:'htmlall':'UTF-8'} -

-

- {l s='Tables prefix'}: {$database.prefix|escape:'htmlall':'UTF-8'} -

-
-
-

- - {l s='Store information'} -

-

- {l s='PrestaShop version'}: {$shop.ps|escape:'htmlall':'UTF-8'} -

-

- {l s='Shop URL'}: {$shop.url|escape:'htmlall':'UTF-8'} -

-

- {l s='Current theme in use'}: {$shop.theme|escape:'htmlall':'UTF-8'} -

-
-
-

- - {l s='Mail configuration'} -

-

- {l s='Mail method'}: - - {if $mail} - {l s='You are using the PHP mail function.'}

- {else} - {l s='You are using your own SMTP parameters.'}

-

- {l s='SMTP server'}: {$smtp.server|escape:'htmlall':'UTF-8'} -

-

- {l s='SMTP user'}: - {if $smtp.user neq ''} - {l s='Defined'} - {else} - {l s='Not defined'} - {/if} -

-

- {l s='SMTP password'}: - {if $smtp.password neq ''} - {l s='Defined'} - {else} - {l s='Not defined'} - {/if} -

-

- {l s='Encryption'}: {$smtp.encryption|escape:'htmlall':'UTF-8'} -

-

- {l s='Port'}: {$smtp.port|escape:'htmlall':'UTF-8'} -

- {/if} -
-
-

- - {l s='Your information'} -

-

- {l s='Your web browser'}: {$user_agent|escape:'htmlall':'UTF-8'} -

-
-
-

- - {l s='Check your configuration'} -

-

- {l s='Required parameters'}: - {if !$failRequired} - OK -

- {else} - {l s='Please fix the following error(s)'} -

-
    - {foreach from=$testsRequired item='value' key='key'} - {if $value eq 'fail'} -
  • {$testsErrors[$key]}
    • - {/if} - {/foreach} -
- {/if} - +
+
+
+

+ + {l s='Configuration information'} +

+

{l s='This information must be provided when you report an issue on our bug tracker or forum.'}

+
+ +
+

+ + {l s='Server information'} +

+ {if count($uname)}

- {l s='Optional parameters'}: - {if !$failOptional} - OK + {l s='Server information'}: {$uname|escape:'htmlall':'UTF-8'}

- {else} - {l s='Please fix the following error(s)'} -

-
    - {foreach from=$testsOptional item='value' key='key'} - {if $value eq 'fail'} -
  • {$key}
    • - {/if} - {/foreach} -
{/if} -
+

+ {l s='Server software version'}: {$version.server|escape:'htmlall':'UTF-8'} +

+

+ {l s='PHP version'}: {$version.php|escape:'htmlall':'UTF-8'} +

+

+ {l s='Memory limit'}: {$version.memory_limit|escape:'htmlall':'UTF-8'} +

+

+ {l s='Max execution time'}: {$version.max_execution_time|escape:'htmlall':'UTF-8'} +

+ {if $apache_instaweb} +

{l s='PageSpeed module for Apache installed (mod_instaweb)'}

+ {/if} +

-
-

- - {l s='List of changed files'} -

-
{l s='Checking files...'}
-
+
+

+ + {l s='Database information'} +

+

+ {l s='MySQL version'}: {$database.version|escape:'htmlall':'UTF-8'} +

+

+ {l s='MySQL engine'}: {$database.engine|escape:'htmlall':'UTF-8'} +

+

+ {l s='Tables prefix'}: {$database.prefix|escape:'htmlall':'UTF-8'} +

+
+
+ +
+
+

+ + {l s='Store information'} +

+

+ {l s='PrestaShop version'}: {$shop.ps|escape:'htmlall':'UTF-8'} +

+

+ {l s='Shop URL'}: {$shop.url|escape:'htmlall':'UTF-8'} +

+

+ {l s='Current theme in use'}: {$shop.theme|escape:'htmlall':'UTF-8'} +

+
+ +
+

+ + {l s='Mail configuration'} +

+

+ {l s='Mail method'}: + + {if $mail} + {l s='You are using the PHP mail function.'}

+ {else} + {l s='You are using your own SMTP parameters.'}

+

+ {l s='SMTP server'}: {$smtp.server|escape:'htmlall':'UTF-8'} +

+

+ {l s='SMTP user'}: + {if $smtp.user neq ''} + {l s='Defined'} + {else} + {l s='Not defined'} + {/if} +

+

+ {l s='SMTP password'}: + {if $smtp.password neq ''} + {l s='Defined'} + {else} + {l s='Not defined'} + {/if} +

+

+ {l s='Encryption'}: {$smtp.encryption|escape:'htmlall':'UTF-8'} +

+

+ {l s='Port'}: {$smtp.port|escape:'htmlall':'UTF-8'} +

+ {/if} +
+ +
+

+ + {l s='Your information'} +

+

+ {l s='Your web browser'}: {$user_agent|escape:'htmlall':'UTF-8'} +

+
+ +
+

+ + {l s='Check your configuration'} +

+

+ {l s='Required parameters'}: + {if !$failRequired} + OK +

+ {else} + {l s='Please fix the following error(s)'} +

+
    + {foreach from=$testsRequired item='value' key='key'} + {if $value eq 'fail'} +
  • {$testsErrors[$key]}
    • + {/if} + {/foreach} +
+ {/if} + +

+ {l s='Optional parameters'}: + {if !$failOptional} + OK +

+ {else} + {l s='Please fix the following error(s)'} +

+
    + {foreach from=$testsOptional item='value' key='key'} + {if $value eq 'fail'} +
  • {$key}
    • + {/if} + {/foreach} +
+ {/if} +
+
+
+ +
+

+ + {l s='List of changed files'} +

+
{l s='Checking files...'}
+
{/block} diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl index 7983a7974..656f93f0f 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl @@ -27,7 +27,7 @@ {block name="override_header"} -
+

{l s='Severity levels'} @@ -39,6 +39,6 @@
  • {l s='Error'}
  • {l s='Major issue (crash)!'}
    • -


    +
    {/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl index 5e1522cf6..491d8dd58 100755 --- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -11,96 +11,94 @@ {l s='Favorites view'} - + -
     
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - {foreach from=$modules key=km item=module} - - - - - - - - - - - - {/foreach} - -
    {l s='Logo'}{l s='Module Name'}{l s='Description'}{l s='Status'}{l s='Tab'}{l s='Categories'}{l s='Interest'}{l s='Favorite'} 
    - - -
    {$module->displayName}
    -     		- {$module->description|truncate:80:'...'} - - {if isset($module->id) && $module->id gt 0} - {l s='Installed'} - {else} - {l s='Not Installed'} - {/if} - - {assign var="module_name" value=$module->name} - - - {$module->categoryName} - - - - - -   -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + {foreach from=$modules key=km item=module} + + + + + + + + + + + + {/foreach} + +
    {l s='Logo'}{l s='Module Name'}{l s='Description'}{l s='Status'}{l s='Tab'}{l s='Categories'}{l s='Interest'}{l s='Favorite'} 
    + + +
    {$module->displayName}
    +     		+ {$module->description|truncate:80:'...'} + + {if isset($module->id) && $module->id gt 0} + {l s='Installed'} + {else} + {l s='Not Installed'} + {/if} + + {assign var="module_name" value=$module->name} + + + {$module->categoryName} + + + + + +   +
    diff --git a/admin-dev/themes/default/template/controllers/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl index b7fa07a9a..fe8684ac1 100644 --- a/admin-dev/themes/default/template/controllers/modules/header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/header.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -
    +

    {l s='List of modules'}

    @@ -46,28 +46,26 @@ {if $add_permission eq '1'}
    -
    -
    - {l s='Add a new module'} -

    {l s='The module must either be a zip file or a tarball.'}

    - -
    -

    - -

    -

    - -

    -
    -
    -
    +
    + {l s='Add a new module'} +

    {l s='The module must either be a zip file or a tarball.'}

    + +
    +

    + +

    +

    + +

    +
    +
    {/if} diff --git a/admin-dev/themes/default/template/controllers/modules/login_addons.tpl b/admin-dev/themes/default/template/controllers/modules/login_addons.tpl index 21c957618..5fb3382fe 100644 --- a/admin-dev/themes/default/template/controllers/modules/login_addons.tpl +++ b/admin-dev/themes/default/template/controllers/modules/login_addons.tpl @@ -68,7 +68,7 @@
    -
    +
    diff --git a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl index 64d21b662..1dfb62aba 100644 --- a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl @@ -82,14 +82,14 @@
    {if count($tab_modules_list.installed)} - +
    {foreach from=$tab_modules_list.installed item=module} {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} {/foreach}
    {/if} {if count($tab_modules_list.not_installed)} - +
    {foreach from=$tab_modules_list.not_installed item=module} {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} {/foreach} diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 042c2c3c1..ae385b9f4 100755 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -110,7 +110,7 @@
    -
    +
    {l s='Orders'} : {if $previousOrder} @@ -130,10 +130,10 @@
    - +

    {l s='Order status'} - +

    @@ -197,10 +197,10 @@
    - +

    {l s='Customer information'} - +

    {$customer->firstname} {$customer->lastname} @@ -228,10 +228,10 @@ {if (sizeof($sources))}
    - +

    {l s='Sources'} - +

    @@ -469,10 +465,10 @@
    - +

    {l s='Documents'} - +

    {* Include document template *} {include file='controllers/orders/_documents.tpl'}
    @@ -481,10 +477,10 @@
    - +

    {l s='Payment'} - +

    {if (!$order->valid && sizeof($currencies) > 1)} @@ -518,6 +514,7 @@ {/foreach}

    {/if} +
    @@ -660,10 +657,10 @@
    - +

    {l s='Shipping'} - +

    {if $order->recyclable}

    @@ -716,10 +713,10 @@

    - +

    {l s='Merchandise returns'} - +

    {if $order->getReturn()|count > 0}
    @@ -790,10 +787,10 @@
    - +

    {l s='Products:'} - +

    {if $can_edit} {if !$order->hasBeenDelivered()} @@ -992,15 +989,17 @@
    {/if} + {if (sizeof($discounts) || $can_edit)}
    - +
    +

    {l s='Discounts'} - +

    {* TO DO - Je voudrais placer le bouton ici mais l'apparition du formulaire ne fonctionne plus....     @@ -1068,8 +1067,4 @@
    - - - {l s='Back to list'} - {/block} diff --git a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl index e059d0c7a..d8c562549 100644 --- a/admin-dev/themes/default/template/controllers/payment/restrictions.tpl +++ b/admin-dev/themes/default/template/controllers/payment/restrictions.tpl @@ -30,7 +30,7 @@ {$list['title']}

    {$list['desc']}

    -
    +
    {foreach $payment_modules as $module} diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl index 820be6759..284acc386 100644 --- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl @@ -232,13 +232,11 @@ - - {if !$product->active && $product->isAssociatedToShop()}

    @@ -253,11 +251,11 @@ {* all input are here *}

    {foreach $product_tabs key=numStep item=tab} -
    - {if $tab.selected} - {$custom_form} - {/if} -
    +
    + {if $tab.selected} + {$custom_form} + {/if} +
    {/foreach}
    diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl index efc1f87ad..4a668495b 100644 --- a/admin-dev/themes/default/template/controllers/products/quantities.tpl +++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl @@ -108,7 +108,7 @@
    {/if} -
    {$list['title']}
    +
    diff --git a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl index d32af71c9..41a4a1c65 100644 --- a/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/request_sql/helpers/form/form.tpl @@ -27,7 +27,7 @@ {block name="after"} -
    +

    {l s='List of MySQL Tables:'} diff --git a/admin-dev/themes/default/template/controllers/shipping/content.tpl b/admin-dev/themes/default/template/controllers/shipping/content.tpl index 27a1b0dca..4ff8e7bda 100644 --- a/admin-dev/themes/default/template/controllers/shipping/content.tpl +++ b/admin-dev/themes/default/template/controllers/shipping/content.tpl @@ -26,7 +26,7 @@ {$content} -
    +

    {l s='Fees by carrier, geographical zone and ranges'} diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl index 4124c471b..9f42cc4b2 100755 --- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/view/view.tpl @@ -25,8 +25,10 @@ {extends file="helpers/view/view.tpl"} {block name="override_tpl"} -
    -
    + +
    +
    +

    {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='General information'} @@ -63,32 +65,17 @@

    - -
    -
    -

    - - {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'} -

    - {$supply_order_detail_content} -
    -
    - -
    -
    +
    +

    {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Summary'}

    - +
    - - - - @@ -101,10 +88,6 @@ - - - - @@ -113,10 +96,6 @@ - - - - @@ -124,5 +103,13 @@
    {l s='Designation'} {l s='Value'}
    {l s='Total (tax excl.)'} {$supply_order_total_te}{l s='Total with discount (tax excl.)'} {$supply_order_total_with_discount_te}
    {l s='Total Tax'} {$supply_order_total_tax}{l s='Total (tax incl.)'} {$supply_order_total_ti}
    {l s='Total to pay.'} {$supply_order_total_ti}
    +
    +
    +

    + + {if isset($is_template) && $is_template == 1} {l s='Template'} {/if}{l s='Products:'} +

    + {$supply_order_detail_content} +
    {/block} diff --git a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl index c4476d721..51f356413 100644 --- a/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl @@ -33,7 +33,8 @@ {/if} -
    +
    + @@ -47,7 +48,7 @@ {/if} - +
    {if $has_bulk_actions} diff --git a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl index b0d0ff1ae..18840f005 100644 --- a/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/themes/helpers/options/options.tpl @@ -41,7 +41,7 @@ {/block} {block name="after"} -
    +
    +