Skip to content
Snippets Groups Projects
Commit 6cdad505 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

parents 4222e3aa 5a0410fb
3 merge requests!2102#57574 : correction orthographe des jours de la semaine,!2080Sandbox detach zf from storm,!2061Master
Pipeline #589 failed with stage
in 11 minutes and 21 seconds
- ticket #56492 : Administration : correction du formulaire de configuration de la boite article.
\ No newline at end of file
- ticket #56640 : Responsive : amélioration du comportement du menu vertical avec interrupteur à bascule.
\ No newline at end of file
......@@ -29,7 +29,7 @@ class ZendAfi_Form_Configuration_ArticleWidget extends ZendAfi_Form {
. 'formSelectToggleVisibilityForElement("input[name=\'display_order\']", "#fieldset-datas tr:nth-child(3)", "Random");'
. 'checkBoxToggleVisibilityForElement("#allow_link_on_title", "#fieldset-affichage tr:nth-child(3)", true);');
. 'checkBoxToggleVisibilityForElement("#allow_link_on_title", "#fieldset-affichage tr:nth-child(4)", true);');
parent::init();
......
@media screen and (min-device-width: 1024px) {
.boite.toggle_menu .menu_wrapper {
background: white;
border-bottom: 3px solid white;
left: 0;
max-height: 0;
overflow: hidden;
position: absolute;
text-align: center;
transition-duration: .5s;
transition-property: all;
width: 100%;
z-index: 101;
}
.boite.toggle_menu .menu_wrapper {
background: white;
border-bottom: 3px solid white;
left: 0;
max-height: 0;
overflow: hidden;
position: absolute;
text-align: center;
transition-duration: .5s;
transition-property: all;
width: 100%;
z-index: 101;
}
.boite.toggle_menu.show_menu .menu_wrapper {
max-height: 600px;
}
.boite.toggle_menu.show_menu .menu_wrapper {
max-height: 600px;
}
.boite.toggle_menu .menu_wrapper > ul {
display: inline-block;
}
.boite.toggle_menu .menu_wrapper > ul {
display: inline-block;
}
.boite.toggle_menu .menu_wrapper > ul > li {
color: black;
display: inline;
float: left;
font-size: 1.2em;
height: auto;
margin: 0.5em;
padding: 0.5em;
}
.boite.toggle_menu .menu_wrapper > ul > li {
color: black;
display: inline;
float: left;
font-size: 1.2em;
height: auto;
margin: 0.5em;
padding: 0.5em;
}
.boite.toggle_menu .titre h1:before {
background: url(../images/buttons/menu.png) no-repeat center 100%/100%;
content: ' ';
display: inline-block;
height: 1.5em;
margin-right: 0.2em;
width: 1.5em;
}
.boite.toggle_menu .titre h1:before {
background: url(../images/buttons/menu.png) no-repeat center 100%/100%;
content: ' ';
display: inline-block;
height: 1.5em;
margin-right: 0.2em;
width: 1.5em;
}
.boite.toggle_menu.show_menu .titre h1:before {
background-image: url(../images/buttons/close_menu.png);
}
.boite.toggle_menu.show_menu .titre h1:before {
background-image: url(../images/buttons/close_menu.png);
}
div#header {
height: auto;
overflow: visible;
}
div#header {
height: auto;
overflow: visible;
}
div#header > .boite {
display: inline-block;
}
}
\ No newline at end of file
div#header > .boite {
display: inline-block;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment