Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

This commit is contained in:
Christophe Latour 2017-11-22 12:18:15 +01:00
commit 2654289343
2 changed files with 17 additions and 356 deletions

View File

@ -1758,6 +1758,9 @@ body#page-404 .footer_links {
-o-box-shadow: 0px 4px 4px #bfbcb4;
box-shadow: 0px 4px 4px #bfbcb4;
}
#header > .content > .top {
clear: both;
}
#header > .content > .top .block ul li {
margin: 5px 0 0 0;
}
@ -1779,6 +1782,12 @@ body#page-404 .footer_links {
height: 84px;
position: relative;
}
#header > .content > .top-upper > .content-upper {
width: 980px;
margin: 0px auto;
padding-top: 6px;
position: relative;
}
#header > .content > .top > .content .logo_block {
float: left;
height: 70px;
@ -1853,7 +1862,7 @@ body#page-404 .footer_links {
/** SUBMENU **/
.container_submenu {
border-top: 4px solid #70bc2c;
height: 400px;
height: 380px;
left: 0;
position: absolute;
overflow: hidden;
@ -1901,23 +1910,6 @@ li.active .container_submenu .content_submenu {
animation-name: slideInDown;
padding: 0 15px;
}
.container_submenu .content_footer {
display: block;
width: 100%;
margin: 0 auto;
position: absolute;
bottom: 0;
background-color: #fff;
padding:15px 0;
color: #666666;
font-size: 14px;
font-weight: bold;
}
.container_submenu .content_footer a,
.container_submenu .content_footer a:hover,
.container_submenu .content_footer a:visited {
color: #ec15ac;
}
.submenu {
width: 965px;
margin: 0 auto;
@ -2096,11 +2088,8 @@ li.active .container_submenu .content_submenu {
background: url("../img/subheader.png") repeat top;
}
.breadcrumb {
top: 131px;
position: absolute;
z-index: 4;
width: 980px;
padding-top: 11px;
height: 27px;
color: #1e1633;
}
@ -5544,9 +5533,10 @@ body .top #header_user {
body.logged #header_user {
clear: none;
display: block;
float: left;
margin-left: 165px;
margin-top: 35px;
float: right;
margin-right: 10px;
/*margin-left: 165px;*/
/*margin-top: 35px;*/
min-width: 270px;
}
.help_contact {
@ -5612,7 +5602,7 @@ body.logged #header_user {
color: #4f4f4f;
float: left;
margin-left: 10px;
padding-top: 15px;
/*padding-top: 15px;*/
}
#header_nav .inner > ul { margin: 0; padding: 0; }
#header_nav .inner > ul li {
@ -5681,7 +5671,7 @@ body.nav_active #header_nav .inner a.submenu_top_btn { z-index: 2;}
padding-left: 45px;
padding-right: 10px;
position: relative;
z-index: 100001;
z-index: 99998;
}
body.nav_active .top #cart_block_summary { z-index: 6;}
.top #cart_block_summary.active { border-color:#ccc;}
@ -7570,121 +7560,9 @@ div.addresses ul.address.item {
#discount .discount .alternate_item{
background: #F3F3F3;
}
.ant_support{
.ant_support {
padding:0px!important;
}
.block-guide {
margin-bottom: 20px;
background: #f6f6f6;
background: #fff;
padding: 10px 20px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #CCC;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #ccc;
color: #1e1633;
}
.block-guide ul {
margin: 0px;
list-style: none outside;
margin-left: 5px;
}
.block-guide h5 {
margin-top: 10px;
}
.block-guide h5 a {
font-style: normal;
font-weight: bold;
font-size: 14px;
line-height: 1.5em;
color: #000;
}
.block-guide h5 a.selected {
color: #796dc7;
}
.block-guide ul li a {
margin: 0 0 0 10px;
color: #000;
}
.block-guide ul li.selected a {
color: #796dc7;
}
.guide-intro {}
.guide-intro-left {
width: 430px;
float: left;
color: #1e1633;
background: #fff;
font-size: 26px;
text-transform: none;
line-height: 1.5em;
font-weight: normal;
text-align: left;
margin: 0px 5px 20px 0px;
min-height: 180px;
padding: 10px 0px 0px 20px;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #cccccc;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #cccccc;
}
.guide-intro-right {}
.guide-content {
clear: both;
}
.guide-content-menu {
width: 160px;
float: left;
background: #fff;
font-size: 26px;
text-transform: none;
line-height: 1.5em;
font-weight: normal;
text-align: left;
margin: 0px 5px 0px 0px;
padding: 10px 0px 10px 0px;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #cccccc;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #cccccc;
}
.guide-content-category {
width:50%;
float:left;
text-align:center;
}
.guide-content-category-title {
clear:both;
}
.guide-content-category-title h4 {
text-transform: uppercase;
font-style: normal;
font-weight: bold;
}
.guide-content ul {
margin: 0px;
list-style: none outside;
}
.guide-content ul li a {
color: #000;
}
.guide-content ul li.selected a {
font-weight: bold;
color: #796dc7;
}
.guide-content-txt {
width:580px;
float: right;
padding: 0 5px;
}
#sensefuel {
display: inline-block;

View File

@ -4685,39 +4685,6 @@ body#index .jqibuttons span.gradient{
background: #504d8b;
}
#cookiescontent { padding: 10px; font-size: 12px; }
#product #more_info_tabs {
background: #FFF;
}
#product .idTabs {
margin: 0px;
list-style: none outside;
overflow: auto;
}
.block_hidden_only_for_screen {
display: none;
}
#product #more_info_block .idTabs li {
position: relative;
margin-left: 1px;
line-height: 12px;
}
#product #more_info_block .idTabs li a {
background: #fb66a9;
color: #fff;
display: block;
text-decoration: none;
padding: 20px 15px;
font-size: 17px;
text-align: center;
}
#product #more_info_block .idTabs li a.selected {
font-weight: bold;
background: #F3F3F3;
color: #fb66a9;
}
body#order #form {
overflow-y: initial;
}
@ -4842,20 +4809,6 @@ body#addresses #center_column p.footer_links a.button.back_account {
padding: 0px 1px;
}
body#product #primary_block #more_info_block .sheets ul li,
body#product #primary_block #more_info_block .sheets p {
margin-bottom: 5px;
text-align: justify;
line-height: 16px;
}
body#product .flex-control-nav.flex-control-paging{
display: none;
}
body#product #best-sellers_block_product{
display: none;
}
#cookiescontent { padding: 10px; font-size: 12px; }
h4.subtitle {
@ -5107,26 +5060,6 @@ body#product #best-sellers_block_product{
text-align: center;
font-size: 13px;
}
/******* ticket-9890 *******/
#product_list li div.productQuantityAlert{
text-align: center;
width: 250px;
margin: 0 !important;
padding: 5px 0 !important;
/* background-color: #f49cc3;
box-shadow: 0px 5px 8px -3px #b5b1b1; */
background-color: #fff;
position: absolute;
bottom: 0px;
left: 0;
}
.productQuantityAlert p{
color: #e36ea2;
font-size: 12px;
font-weight: 600;
}
.box_info_size .content .innerbox_info .show_info_size {
padding-top : 25px;
}
@ -5336,156 +5269,6 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
font-family: Georgia;
}
.block-guide {
margin-bottom: 20px;
background: #f6f6f6;
background: #fff;
padding: 10px 20px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #CCC;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #ccc;
color: #1e1633;
}
.block-guide ul {
margin: 0px;
list-style: none outside;
margin-left: 5px;
}
.block-guide h5 {
margin-top: 10px;
}
.block-guide h5 a {
font-style: normal;
font-weight: bold;
font-size: 14px;
line-height: 1.5em;
color: #000;
}
.block-guide h5 a.selected {
color: #796dc7;
}
.block-guide ul li a {
margin: 0 0 0 10px;
color: #000;
}
.block-guide ul li.selected a {
color: #796dc7;
}
.guide-intro {}
.guide-intro-left {
color: #1e1633;
background: #fff;
text-transform: none;
line-height: 1.5em;
font-weight: normal;
margin: 0 0 5px 0;
/*adding: 10px 0px 0px 20px;*/
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #cccccc;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #cccccc;
}
.guide-intro-left div {
margin: 5px;
font-size: 13px;
}
.guide-intro-left h2 {
text-align: left;
}
.guide-content h3 {
font-size: 13px;
}
.guide-content-menu {
background: #fff;
font-size: 13px;
text-transform: none;
line-height: 1.5em;
font-weight: normal;
text-align: left;
padding: 10px 0px 10px 0px;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #cccccc;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #cccccc;
}
.guide-content-category {
text-align:center;
}
.guide-content ul {
display: block;
list-style: none outside;
margin: 5px;
}
.guide-content ul li a {
color: #000;
}
.guide-content ul li.selected a {
font-weight: bold;
color: #796dc7;
}
.guide-content-txt {
margin: 5px 0;
padding: 0 5px;
}
.guide-content-txt div{
font-size: 13px;
}
.container_submenu .content_footer {
display: block;
width: 100%;
margin: 0 auto;
position: absolute;
bottom: 0;
background-color: #fff;
padding:15px 0;
color: #666666;
font-size: 14px;
font-weight: bold;
}
.container_submenu .content_footer a,
.container_submenu .content_footer a:hover,
.container_submenu .content_footer a:visited {
color: #ec15ac;
}
#sensefuel {
display: block;
margin-bottom: 5px;
font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
}
#sensefuel .search .search_form .search_input {
display: block;
float: left;
background: #fff;
color: #000;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
/*font-size: 15px;*/
line-height: 16px;
width: 84%;
}
#sensefuel .search .search_form a.search_submit {
display: block;
float: left;
background: #70bc2c;
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
height: 30px;
width: 15%;
margin-bottom: 5px;
}
#sensefuel {
display: block;
margin-bottom: 5px;