merge from trunk r1512:1513 into branch 1.6 (better fix for bug 490)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1514 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
8a38ed3074
commit
b6bfe70021
2 changed files with 23 additions and 31 deletions
|
@ -8,7 +8,7 @@ H1, #theHeader {
|
|||
width: 100%; /* <- useless but seems to make IE6 happy */
|
||||
}
|
||||
#content {
|
||||
height: 1em; /* for IE6 it's like min-height */
|
||||
height: 1em; /* for IE6 it's like min-height */
|
||||
}
|
||||
|
||||
/* some theme set a border on INPUT which is not pretty for those */
|
||||
|
@ -18,7 +18,7 @@ INPUT.radio, INPUT.checkbox {
|
|||
|
||||
/* fix category thumbnails on main page */
|
||||
#content UL.thumbnailCategories {
|
||||
width: 99%; /* buggy IE box model */
|
||||
width: 99%; /* buggy IE box model */
|
||||
}
|
||||
|
||||
/* fix tag clouds : IE doesn't like anything but inline */
|
||||
|
@ -28,20 +28,6 @@ INPUT.radio, INPUT.checkbox {
|
|||
}
|
||||
|
||||
/* fix quickconnect layout */
|
||||
FORM#quickconnect UL.actions {
|
||||
width: 30px; /* <= get icons not so badly positionned */
|
||||
FORM#quickconnect FIELDSET {
|
||||
width: 99%; /* correct an ugly 1 or 2 px misalignement with IE */
|
||||
}
|
||||
|
||||
FORM#quickconnect INPUT.text,
|
||||
FORM#quickconnect INPUT.password,
|
||||
FORM#quickconnect INPUT.submit {
|
||||
position: relative;
|
||||
left: -0.5em; /* definitively a bug ! */
|
||||
}
|
||||
|
||||
FORM#quickconnect INPUT.text,
|
||||
FORM#quickconnect INPUT.password {
|
||||
width: 10em;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -52,10 +52,6 @@
|
|||
margin: 10px auto;
|
||||
width: 90%;
|
||||
}
|
||||
#menubar FORM P {
|
||||
margin: 5px;
|
||||
font-size: 100%;
|
||||
}
|
||||
#menubar INPUT {
|
||||
text-indent: 2px;
|
||||
}
|
||||
|
@ -69,11 +65,11 @@ FORM#quickconnect {
|
|||
FORM#quickconnect FIELDSET {
|
||||
margin: 0;
|
||||
padding: 0 0 0.5em 0;
|
||||
overflow: hidden; /* Correct float issue with Opera 7.5 */
|
||||
width: 100%; /* // */
|
||||
}
|
||||
|
||||
FORM#quickconnect P {
|
||||
margin-left: 0;
|
||||
font-size: 100%;
|
||||
float: left;
|
||||
clear: left;
|
||||
}
|
||||
|
@ -93,20 +89,30 @@ FORM#quickconnect FIELDSET>UL.actions {
|
|||
}
|
||||
|
||||
FORM#quickconnect UL.actions,
|
||||
FORM#quickconnect P,
|
||||
FORM#quickconnect P,
|
||||
FORM#quickconnect LABEL {
|
||||
margin: 0 0.5em 0 0.5em;
|
||||
padding: 0 0.5em 0 0.5em;
|
||||
}
|
||||
|
||||
FORM#quickconnect LABEL {
|
||||
margin:0;
|
||||
width: 100%;
|
||||
/* -moz-box-sizing: padding-box;*/
|
||||
box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
}
|
||||
|
||||
FORM#quickconnect INPUT[type=text],
|
||||
FORM#quickconnect INPUT[type=password] {
|
||||
width: 16.5em;
|
||||
width: 100%; /* mozilla can handle 100% */
|
||||
}
|
||||
|
||||
FORM#quickconnect INPUT.text,
|
||||
/* same as above for IE with inputfix.htc */
|
||||
/* unfortunately IE doesn't handle that correctly */
|
||||
/* so you should set a width in em in local_layout.css */
|
||||
/*FORM#quickconnect INPUT.text,
|
||||
FORM#quickconnect INPUT.password {
|
||||
width: 16.5em; /* <= same as above for IE with inputfix.htc */
|
||||
}
|
||||
width: 95%;
|
||||
}*/
|
||||
|
||||
#menubar #menuTagCloud {
|
||||
text-align: center;
|
||||
|
|
Loading…
Add table
Reference in a new issue