hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #649 from romainneutron/fix-1473

Browse Source 
[3.8] Fix 1473 : Classic display on firefox is broken
This commit is contained in:
Romain Neutron
2013-09-18 02:15:21 -07:00
parent 1181d756e3 5d9a44da27
commit ff1da1d734
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
www/skins/client/clientcolor.css
View File

@@ -7,7 +7,7 @@
*{ *{
margin:0; margin:0;
padding:0; padding:0;
} }
img{ img{
border:none; border:none;
@@ -28,7 +28,7 @@ img{
.ui-tabs .ui-tabs-nav li a .ui-tabs .ui-tabs-nav li a
{ {
padding:3px 5px 0; padding:3px 5px 0;
} }
@@ -90,7 +90,7 @@ img{
} }
.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a
{ {
cursor: pointer; cursor: pointer;
} }
.ui-tabs .ui-tabs-panel .ui-tabs .ui-tabs-panel
{ {
@@ -99,14 +99,14 @@ img{
display: block; display: block;
border-width:0; border-width:0;
padding:0px; padding:0px;
background-color:#404040; background-color:#404040;
} }
.ui-tabs .ui-tabs-panel.tabBox{ .ui-tabs .ui-tabs-panel.tabBox{
height:310px; height:310px;
overflow:auto; overflow:auto;
position:relative; position:relative;
padding:10px; padding:10px;
} }
.ui-tabs .ui-tabs-hide .ui-tabs .ui-tabs-hide
{ {
@@ -114,9 +114,9 @@ img{
} }
.ui-state-default, .ui-widget-content .ui-state-default .ui-state-default, .ui-widget-content .ui-state-default
{ {
background:none; background:none;
} }
.ui-tabs li.ui-state-active a, .ui-state-active a:link, .ui-state-active a .ui-tabs li.ui-state-active a, .ui-state-active a:link, .ui-state-active a
{ {
color:#b2b2b2; color:#b2b2b2;
font-weight:bold; font-weight:bold;
@@ -124,21 +124,21 @@ img{
} }
.ui-state-active, .ui-widget-content .ui-state-active .ui-state-active, .ui-widget-content .ui-state-active
{ {
background:none; background:none;
} }
.ui-widget-content .ui-widget-content
{ {
background-image:none; background-image:none;
background-color:transparent; background-color:transparent;
} }
.ui-dialog.ui-widget-content .ui-dialog.ui-widget-content
{ {
background-color:#111111; background-color:#111111;
} }
.ui-accordion .ui-accordion-content .ui-accordion .ui-accordion-content
{ {
padding:0; padding:0;
} }
.ui-accordion .ui-accordion-header, .ui-accordion .ui-accordion-content .ui-accordion .ui-accordion-header, .ui-accordion .ui-accordion-content
{ {
@@ -148,7 +148,7 @@ img{
{ {
border:none; border:none;
background-image:url(../../icons/bask_back.png); background-image:url(../../icons/bask_back.png);
background-repeat:repeat-x; background-repeat:repeat-x;
margin-bottom:0; margin-bottom:0;
height:20px; height:20px;
} }
@@ -228,7 +228,7 @@ DIV.onglets SPAN
padding:4px 2px; padding:4px 2px;
MARGIN-RIGHT: 2px; MARGIN-RIGHT: 2px;
BACKGROUND-COLOR: #C9C9C9; BACKGROUND-COLOR: #C9C9C9;
FONT-WEIGHT: normal; FONT-WEIGHT: normal;
COLOR: #FFFFFF; COLOR: #FFFFFF;
TEXT-DECORATION: none; TEXT-DECORATION: none;
@@ -240,7 +240,7 @@ DIV.onglets SPAN.hover{
} }
DIV.onglets SPAN.actif DIV.onglets SPAN.actif
{ {
Z-INDEX: 3; Z-INDEX: 3;
BACKGROUND-COLOR: #FFFFFF; BACKGROUND-COLOR: #FFFFFF;
-moz-border-radius-topleft:3px; -moz-border-radius-topleft:3px;
@@ -344,12 +344,12 @@ DIV.onglets SPAN.inactif A
#idongTopic LI A.opened #idongTopic LI A.opened
{ {
display:inline-block; display:inline-block;
background-image: url(../icons/tri_minus.gif); background-image: url(../icons/tri_minus.gif);
} }
#idongTopic LI A.closed #idongTopic LI A.closed
{ {
display:inline-block; display:inline-block;
background-image: url(../icons/tri_plus.gif); background-image: url(../icons/tri_plus.gif);
} }
#idongTopic LI SPAN #idongTopic LI SPAN
{ {
@@ -361,16 +361,16 @@ DIV.onglets SPAN.inactif A
#idongTopic LI SPAN.static #idongTopic LI SPAN.static
{ {
display:inline-block; display:inline-block;
background-image: url(../icons/tri_static.gif); background-image: url(../icons/tri_static.gif);
} }
#idongTopic LI SPAN.none #idongTopic LI SPAN.none
{ {
display:inline-block; display:inline-block;
background-image: none; background-image: none;
} }
#idongTopic div.searchZonePop{ #idongTopic div.searchZonePop{
background-color:#E9E9E9; background-color:#E9E9E9;
} }
#idongTopic div.searchZone #idongTopic div.searchZone
@@ -420,7 +420,7 @@ DIV.onglets SPAN.inactif A
.basTitle{ .basTitle{
font-weight:bold; font-weight:bold;
text-align:center; text-align:center;
cursor:pointer; cursor:pointer;
} }
.basContTitle{ .basContTitle{
background-color:#C9C9C9; background-color:#C9C9C9;
@@ -431,7 +431,7 @@ input.datepicker{
} }
img.ui-datepicker-trigger{ img.ui-datepicker-trigger{
margin:2px 0; margin:2px 0;
vertical-align:bottom; vertical-align:bottom;
cursor:pointer; cursor:pointer;
} }
.base_filter{ .base_filter{
@@ -470,7 +470,7 @@ img.ui-datepicker-trigger{
} }
.basesGrp input{ .basesGrp input{
border:none; border:none;
} }
.basGrp div{ .basGrp div{
padding:2px; padding:2px;
@@ -493,7 +493,7 @@ img.ui-datepicker-trigger{
.bodynochu .bodynochu
{ {
BACKGROUND-COLOR: #E9E9E9; BACKGROUND-COLOR: #E9E9E9;
OVERFLOW : hidden; OVERFLOW : hidden;
} }
.txtPushClient .txtPushClient
{ {
@@ -520,7 +520,7 @@ img.ui-datepicker-trigger{
.diapochu .tools .diapochu .tools
{ {
FONT-SIZE:8px; FONT-SIZE:8px;
TEXT-ALIGN: right; TEXT-ALIGN: right;
height:16px; height:16px;
} }
.flechenochu /*** page ***/ .flechenochu /*** page ***/
@@ -534,7 +534,7 @@ img.ui-datepicker-trigger{
width:19px; width:19px;
height:14px; height:14px;
float:left; float:left;
} }
#flechechu{ #flechechu{
background-image:url(../icons/light_haut.gif); background-image:url(../icons/light_haut.gif);
@@ -607,6 +607,7 @@ img.ui-datepicker-trigger{
#grid,#grid tr, #grid td{ #grid,#grid tr, #grid td{
z-index:50; z-index:50;
text-align:center;
} }
.diapo .diapo
{ {
@@ -932,7 +933,7 @@ span.sel
#PREVIEWBOX A.bounce #PREVIEWBOX A.bounce
{ {
BORDER-BOTTOM:#ffe000 1px dashed; BORDER-BOTTOM:#ffe000 1px dashed;
} }
.PREVIEW_PIC,.PREVIEW_HD{ .PREVIEW_PIC,.PREVIEW_HD{

8
www/skins/client/jquery.p4client.1.0.js
View File

@@ -223,16 +223,16 @@ function pquit(){
function resize(){ function resize(){
var h = bodySize.y = $(window).height() - $('#mainMenu').outerHeight(); var h = bodySize.y = $(document).height() - $('#mainMenu').outerHeight();
var w = bodySize.x = $(window).width(); var w = bodySize.x = $(document).width();
controlPubliSize(); controlPubliSize();
var rightw = w - 265; var rightw = w - 265;
rightw = ((rightw) > 0) ? rightw : 0; rightw = ((rightw) > 0) ? rightw : 0;
$('#container').height($(window).height()); $('#container').height($(document).height());
$('#container').width($(window).width()); $('#container').width($(document).width());
$('#right').width(rightw); $('#right').width(rightw);
$('#answers').height(h - $('#nb_answersEXT').outerHeight() - $('#navigation').outerHeight() - 20); $('#answers').height(h - $('#nb_answersEXT').outerHeight() - $('#navigation').outerHeight() - 20);