From 1b10333979733977c88f64f3c9391cce479edcec Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 8 May 2007 16:52:04 +0000 Subject: [PATCH] fix for bug #275: tree of projects is only one line high in IE, plus removing the margin arround the mainDiv and saving some space around the navbar --- phpgwapi/templates/default/footer.tpl | 2 +- phpgwapi/templates/idots/css/idots.css | 30 ++-- phpgwapi/templates/idots/print.css | 4 +- .../templates/jerryr/css/brushed-metal.css | 170 ++++++++---------- phpgwapi/templates/jerryr/css/jerryr.css | 120 +++++++------ 5 files changed, 159 insertions(+), 167 deletions(-) diff --git a/phpgwapi/templates/default/footer.tpl b/phpgwapi/templates/default/footer.tpl index 45d53c7292..512f810486 100644 --- a/phpgwapi/templates/default/footer.tpl +++ b/phpgwapi/templates/default/footer.tpl @@ -7,7 +7,7 @@ {page_generation_time} -

{powered_by}
+
{powered_by}
{activate_tooltips} diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css index bd0351be5f..a494d7dca2 100755 --- a/phpgwapi/templates/idots/css/idots.css +++ b/phpgwapi/templates/idots/css/idots.css @@ -94,7 +94,6 @@ input,button,select input[type=submit],input[type=button],input[type=reset],button,.egwbutton { -/* color:white;*/ background-color:#c5c5c5; border: outset 1px #dcdad5; background-color:#b9d5e3; @@ -103,7 +102,6 @@ input[type=submit],input[type=button],input[type=reset],button,.egwbutton padding: 1px; cursor: pointer; color: #004e7d; -/* cursor: hand; */ } input[type=submit]:hover,input[type=button]:hover,input[type=reset]:hover,button:hover,.egwbutton:hover @@ -130,7 +128,6 @@ input.egwbutton padding: 1px; cursor: pointer; color: #004e7d; -/* cursor: hand; */ } input.egwbutton:hover @@ -149,7 +146,6 @@ input.egwbutton:active input[type=image] { cursor: pointer; -/* cursor: hand; */ border: 0; } @@ -194,7 +190,6 @@ input[type=image] a.divSideboxEntry, .divSideboxEntry { text-align:left; - height:16px; background-color:#FDFDFD; } @@ -212,9 +207,8 @@ a.textSidebox .textSidebox { - height:18px; - padding-top:2px; - padding-bottom:2px; + padding-top:3px; + padding-bottom:3px; border-top: solid #aaaaaa 1px; } /* @@ -253,19 +247,27 @@ body { margin: 0px; } -#divMain,#loginMainDiv +#divMain,#loginMainDiv,#popupMainDiv { background-color: white; padding: 8px; + border-bottom: solid 1px #7e7e7e; +} +/* + ** Popups + */ +#popupMainDiv +{ margin: 8px; border: solid 1px #7e7e7e; -} + padding-bottom: 0px; +} #divLogo { position:absolute; left:30px; - top:15px; + top:6px; z-index:999; } @@ -274,7 +276,7 @@ body { background-color: #0081c1; background-image: url(../images/bgtopmenu2.png); color:#006699; - border-top: solid 2px #7e7e7e; + /*border-top: solid 1px #7e7e7e;*/ border-bottom: solid #5793ff 1px; height:20px; padding-top:4px ; @@ -337,7 +339,6 @@ body { background-color:white; height:18px; padding-left:3px; - margin-top: 10px; } #tdSidebox @@ -358,7 +359,8 @@ body { { background-image:url(../images/appbox-header-background.png); background-repeat: repeat-x; - height:36px; + height: 25px; + border-bottom:solid 1px #c0c0c0; text-align:center; padding-bottom:0px; border-top:solid 1px #9c9c9c; diff --git a/phpgwapi/templates/idots/print.css b/phpgwapi/templates/idots/print.css index 16d0422a36..16b1dad929 100644 --- a/phpgwapi/templates/idots/print.css +++ b/phpgwapi/templates/idots/print.css @@ -34,7 +34,9 @@ table { /* nextmatch/list rows */ tr.row_on,tr.row_off{ - border-bottom: thin black dashed; + border-bottom: thin gray dotted; + padding-top: 0px; margin-top:0px; + padding-bottom: 0px; margin-bottom: 0px; } /* nextmatch/list headers */ diff --git a/phpgwapi/templates/jerryr/css/brushed-metal.css b/phpgwapi/templates/jerryr/css/brushed-metal.css index 892db7b355..73ccc868d3 100644 --- a/phpgwapi/templates/jerryr/css/brushed-metal.css +++ b/phpgwapi/templates/jerryr/css/brushed-metal.css @@ -156,24 +156,23 @@ input[type=image] #thesideboxcolumn { - width: 203px; - position:relative; + width: 203px; + position:relative; } #sideresize { - background-image:url(../images/resize-bm.png); - width:16px; - height:100px; - right:-18px; - top:0px; - position:absolute; - z-index:9999; + background-image:url(../images/resize-bm.png); + width:16px; + height:100px; + right:-18px; + top:0px; + position:absolute; + z-index:9999; } #tdSidebox { - /*width:204px;*/ overflow:visible; } @@ -186,25 +185,20 @@ input[type=image] .divSidebox { - /*width: 188px;*/ position: relative; border: 0px solid #9f9f9f; - /*background-image: url(../images/bmback2.jpg);*/ background-color: white; } .divLoginboxHeader,.divSideboxHeader,a.appTitles,.appTitles,a.textSidebox,.textSidebox,#fmStatusBar { font-size:90%; - white-space: nowrap; } .textSideboxStar { width: 20px; font-size:90%; - /*background-image: url(../images/rowoff-bm.png);*/ - /*background-color: white:*/ border-top:1px solid #e1e1e1; border-right: 1px solid #e1e1e1; border-left: 0px solid #9f9f9f; @@ -213,14 +207,13 @@ input[type=image] .divSideboxHeader,.divLoginboxHeader { text-align:center; - /*background-image:url(../images/menuTitle-bm.png);*/ color: #666666; height: 23px; font-weight:bold; font-size:12px; position: relative; - left: 0px; - top: 0px; + left: 0px; + top: 0px; padding:0px; border-top: 0px solid #9f9f9f; border-left: 0px solid #9f9f9f; @@ -229,46 +222,46 @@ input[type=image] .menuHeadLt { - background-image:url(../images/menuTitleLt-bm.png); - padding:0px; - width: 24px; - height:23px; + background-image:url(../images/menuTitleLt-bm.png); + padding:0px; + width: 24px; + height:23px; } .menuHeadMid { - background-image:url(../images/menuTitleMid-bm.png); - width: 100%; + background-image:url(../images/menuTitleMid-bm.png); + width: 100%; line-height:23px; } .menuHeadRt { - background-image:url(../images/menuTitleRt-bm.png); - width:24px; - padding:0px; - height: 23px; + background-image:url(../images/menuTitleRt-bm.png); + width:24px; + padding:0px; + height: 23px; } .menuBotLt { - background-image:url(../images/menuBotLt-bm.png); - padding:0px; - width: 20px; - height:18px; + background-image:url(../images/menuBotLt-bm.png); + padding:0px; + width: 20px; + height:18px; } .menuBotMid { - background-image:url(../images/menuBotMid-bm.png); - width: 100%; - line-height:18px; + background-image:url(../images/menuBotMid-bm.png); + width: 100%; + line-height:18px; } .menuBotRt { - background-image:url(../images/menuBotRt-bm.png); - width:20px; - padding:0px; - height: 18px; + background-image:url(../images/menuBotRt-bm.png); + width:20px; + padding:0px; + height: 18px; } @@ -276,8 +269,6 @@ a.divSideboxEntry, .divSideboxEntry { text-align:left; height:18px; - /*background-image:url(../images/bmback2.jpg);*/ - /*background-color:#ffffff;*/ border-left: 0px solid #9f9f9f; } @@ -301,9 +292,6 @@ a.textSidebox .textSideboxHover { - /*background-image: url(../images/arrow-rt-grey.png);*/ - /*background-repeat: no-repeat;*/ - /*background-position: top right;*/ background-color: white; height: 18px; border-top: 1px solid #e1e1e1; @@ -336,9 +324,9 @@ a.textSidebox .sideboxDrop { -position: relative; - left: 0px; - top: 0px; + position: relative; + left: 0px; + top: 0px; border-bottom: 0px solid white; border-left: 1px solid #9f9f9f; border-right: 1px solid #9f9f9f; @@ -352,7 +340,6 @@ position: relative; .sideboxSpace { height:29px; - /*background-image: url(../images/botspacer.png);*/ } /* @@ -380,9 +367,9 @@ position: relative; .menuOneBoxTwo { - position: relative; - left: 0; - text-align: left; + position: relative; + left: 0; + text-align: left; } @@ -406,11 +393,11 @@ position: relative; .extraIconsHeader { - text-align:center; - background-image:url(../images/menuTitle-bm.png); + text-align:center; + background-image:url(../images/menuTitle-bm.png); color:#e1e1e1; - font-weight:normal; - font-size:10px; + font-weight:normal; + font-size:10px; height: 23px; } @@ -424,23 +411,21 @@ position: relative; .extraIconsRow { - border-top: 1px solid #e1e1e1; + border-top: 1px solid #e1e1e1; height: 19px; - padding:1px; + padding:1px; padding-left: 3px; - font-size: 10px; + font-size: 10px; background-color: white; - /*background-image:url(../images/bmback2.jpg);*/ } .extraIconsRow:hover { - border-top: 1px solid #e1e1e1; - padding:1px; + border-top: 1px solid #e1e1e1; + padding:1px; padding-left: 3px; - font-size: 10px; + font-size: 10px; background-color: #e1e1e1; - /*background-image:url(../images/bmback.jpg);*/ } /* @@ -451,13 +436,17 @@ body { padding: 0px; } -#divMain +#divMain,#popupMainDiv { background-image:url(../images/bmback.jpg); background-color: #646464; padding:9px; margin: 0px; - border-bottom: 2px solid white; +} + +#popupMainDiv +{ + margin: 9px; } #divLogo @@ -470,27 +459,27 @@ body { #topmenu { - background-color: #0081c1; - background-image: url(../images/hilitetest-bm.png); - color:#006699; - border-top: 1px solid #9f9f9f; - border-bottom: 1px solid #9f9f9f; + background-color: #0081c1; + background-image: url(../images/hilitetest-bm.png); + color:#006699; + border-top: 1px solid #9f9f9f; + border-bottom: 1px solid #9f9f9f; height:24px; line-height:20px; padding-top: 4px; } #topmenu a { - color:#006699; + color:#006699; } #topmenu_items { - float:left; + float:left; } #topmenu_info { - float:right; + float:right; } #divUpperTabs @@ -543,8 +532,8 @@ body { .iconBackFirstCell { - background-image: url(../images/firstcell-bm.png); - background-repeat: no-repeat; + background-image: url(../images/firstcell-bm.png); + background-repeat: no-repeat; height:60px; } @@ -560,7 +549,6 @@ body { .iconBack { - /*background-image: url(../images/iconbar-bm.png);*/ border-right: 0px solid #bfbfbf; border-top: 1px solid #9f9f9f; height: 38px; @@ -584,7 +572,6 @@ body { #divAppTextBar { - /*background-color:white;*/ white-space: nowrap; } @@ -631,23 +618,20 @@ body { .appBoxHeadLt { - background-image:url(../images/abhlt.png); - /*background-image:url(../images/menuTitleLt-bm.png);*/ + background-image:url(../images/abhlt.png); padding:0px; width: 24px; height:24px; } .appBoxHeadMid { - background-image:url(../images/abhmid.png); - /*background-image:url(../images/menuTitleMid-bm.png);*/ + background-image:url(../images/abhmid.png); padding:0px; line-height:24px; } .appBoxHeadRt { - background-image:url(../images/abhrt.png); - /*background-image:url(../images/menuTitleRt-bm.png);*/ + background-image:url(../images/abhrt.png); width:24px; padding:0px; height: 24px; @@ -690,13 +674,13 @@ body { background-image: url(../images/hilitetest-bm.png); } .row_on { - color: black; - background-color: #F1F1F1; + color: black; + background-color: #F1F1F1; background-image: url(../images/rowon-bm.png); } .row_off { - color: black; - background-color: #ffffff; + color: black; + background-color: #ffffff; background-image: url(../images/rowoff-bm.png); } .narrow_column { width: 1%; white-space: nowrap; } @@ -711,16 +695,16 @@ body { Portal_box as used in home */ .portal_box { - border: #9c9c9c 1px solid; + border: #9c9c9c 1px solid; } .portal_box table { - border: 1px solid black; + border: 1px solid black; } .portal_box_header { - height: 15px; - padding-top: 0px; + height: 15px; + padding-top: 0px; } /* @@ -728,8 +712,8 @@ body { */ .tablink { - white-space: nowrap; + white-space: nowrap; padding-left: 15px; - padding-right: 15px; + padding-right: 15px; } diff --git a/phpgwapi/templates/jerryr/css/jerryr.css b/phpgwapi/templates/jerryr/css/jerryr.css index 0e4a8e044e..05bcf2652a 100644 --- a/phpgwapi/templates/jerryr/css/jerryr.css +++ b/phpgwapi/templates/jerryr/css/jerryr.css @@ -60,8 +60,8 @@ a:hover,a:active body { background-color:#9f9f9f; - padding:9px; - margin:9px; + padding: 0px; + margin: 0px; } form @@ -155,19 +155,19 @@ input[type=image] #thesideboxcolumn { - width: 177px; - position:relative; + width: 177px; + position:relative; } #sideresize { - background-image:url(../images/resize.png); - width:10px; - height:100px; - right:-12px; - top:0px; - position:absolute; - z-index:9999; + background-image:url(../images/resize.png); + width:10px; + height:100px; + right:-12px; + top:0px; + position:absolute; + z-index:9999; } .divLoginbox @@ -202,28 +202,28 @@ input[type=image] text-align:center; background-image:url(../images/menuTitle.png); color:#17202b; - height: 18px; + /*height: 18px;*/ font-weight:bold; font-size:12px; } .menuHeadLt { - padding:0px; - width: 24px; - height:18px; + padding:0px; + width: 24px; + height:18px; } .menuHeadMid { - padding:0px; - margin-left: auto; + padding:0px; + margin-left: auto; margin-right: auto; } .menuHeadRt { - width:24px; - padding:0px; - height: 18px; + width:24px; + padding:0px; + height: 18px; } @@ -247,7 +247,6 @@ a.textSidebox .textSidebox { - height:18px; padding-left: 2px; border-top: solid #9f9f9f 1px; } @@ -278,17 +277,17 @@ a.textSidebox { background-image: url(../images/divmain-background.jpg); background-repeat: no-repeat; - background-color:white; - border: #17202b 1px solid; - padding:10px; + background-color:white; + border: #17202b 1px solid; + padding:10px; width: 203px; } .sideboxDrop { -position: relative; - left: 0px; - top: 0px; + position: relative; + left: 0px; + top: 0px; } .textSidebox:first-letter @@ -343,11 +342,11 @@ position: relative; .extraIconsHeader { - text-align:center; - background-image:url(../images/menuTitle.png); - color:#17202b; - font-weight:normal; - font-size:10px; + text-align:center; + background-image:url(../images/menuTitle.png); + color:#17202b; + font-weight:normal; + font-size:10px; height: 18px; } @@ -370,10 +369,10 @@ position: relative; .extraIconsRow:hover { - border-top:solid 1px #9f9f9f; - padding:1px; + border-top:solid 1px #9f9f9f; + padding:1px; padding-left: 3px; - font-size: 10px; + font-size: 10px; background-color: #ede6d8; } @@ -385,12 +384,13 @@ body { padding: 0px; } -#divMain +#divMain,#popupMainDiv { background-image:url(../images/divmain-background.jpg); background-repeat:no-repeat; background-color:white; padding:9px; + padding-top: 0px; /* CHANGED RALF */ border:solid 1px #17202b; } @@ -398,36 +398,42 @@ body { { position:absolute; left:27px; - top:28px; + top:20px; z-index:999; } +#popupMainDiv +{ + padding:9px; + margin: 9px; +} + #topmenu { - background-color: #0081c1; - background-image: url(../images/hilitetest.png); - color:#006699; - border-top: solid 1px #17202b; + background-color: #0081c1; + background-image: url(../images/hilitetest.png); + color:#006699; + border-top: solid 1px #17202b; border-right: 1px solid #17202b; border-left: 1px solid #17202b; - border-bottom: solid #5793ff 0px; - height:24px; - padding-top:4px ; + border-bottom: solid #5793ff 0px; + height:24px; + padding-top:4px ; } #topmenu a { - color:#006699; + color:#006699; } #topmenu_items { - float:left; + float:left; } #topmenu_info { - float:right; + float:right; } @@ -468,7 +474,7 @@ body { .iconBackFirstCell { - background-image: url(../images/firstcell.png); + background-image: url(../images/firstcell.png); background-repeat: no-repeat; height: 58px; } @@ -500,7 +506,6 @@ body { #divAppTextBar { - /*background-color:white;*/ } /* @@ -512,7 +517,6 @@ body { position: relative; top:0px; left:0px; - height:30px; vertical-align:bottom; border: 0px solid black; padding-top:10px; @@ -520,22 +524,22 @@ body { .userinfolt { - background-image: url(../images/userbacklt.png); - width: 20px; - height: 25px; + background-image: url(../images/userbacklt.png); + width: 20px; + height: 25px; } .userinfomid { - background-image: url(../images/userback.png); - background-repeat: repeat-x; - color: #000000; + background-image: url(../images/userback.png); + background-repeat: repeat-x; + color: #000000; } .userinfort { - background-image: url(../images/userbackrt.png); - width: 20px; + background-image: url(../images/userbackrt.png); + width: 20px; }