xlawrence 2005/10/07 14:54:28 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/css menu.css styles.css
Log:
some fixes regarding css display.
tested on FireFox and IE: working fine
Revision Changes Path
1.4 +54 -95 jahia/core/src/webapp/jsp/jahia/engines/css/menu.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/css/menu.css.diff?r1=1.3&r2=1.4&f=h
1.6 +10 -16 jahia/core/src/webapp/jsp/jahia/engines/css/styles.css
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css.diff?r1=1.5&r2=1.6&f=h
Index: menu.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/css/menu.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu.css 7 Oct 2005 10:01:30 -0000 1.3
+++ menu.css 7 Oct 2005 12:54:27 -0000 1.4
@@ -13,15 +13,11 @@
float: left;
width: 65%;
margin: auto;
- /*margin-left: 250px; */
}
#editor {
- /*margin-right: 240px;*/
- background-color: #FFFFFF;
- text-align:left;
- margin-left:10px;
- /*padding: 5px;*/
+ background-color: #fff;
+ margin-left: 10px;
}
/* onglets */
@@ -30,9 +26,8 @@
clear: both;
display: block;
width: 100%;
- /* modif joe */
- margin-top:70px;
- /* end */
+ margin-top: 10px !important;
+ margin-top: 35px;
margin-bottom: 10px;
border-bottom: 1px solid #336699;
}
@@ -40,129 +35,93 @@
/* modif joe 4 tabs cross-browser */
#tabs {
- height: 20px;
+ height: 20px;
margin: 0;
- padding-left: 10px;
- /*background: url(../images/tab_bottom.gif) repeat-x bottom;*/
+ padding-left: 0px;
+}
+
+#tabs li {
+ display: inline;
+ list-style-type: none;
}
-#tabs li{
- margin: 0;
- padding: 0;
- display: inline;
- list-style-type: none;
- /*border-right: #FFFFFF 2px solid;*/
+#tabs span,
+#tabs a {
+ display: block;
+ margin-right: 2px;
}
/* 4 links onglets */
-#tabs a:link, #tabs a:visited
- {
+#tabs a:link,
+#tabs a:visited {
float: left;
background: #398EC3;
font-weight: bold;
- padding: 2px 4px 5px 4px;
- margin-right: 4px;
+ padding: 2px 4px 2px 4px;
text-decoration: none;
color: #FFFFFF;
- }
-
-
-/* end modif */
-
-/* useless & confusing
-#menubar ul {
- padding: 3px 0px 3px 0px;
- margin: 0;
- display: block;
-}
-
-#menubar ul li{
- display: inline;
- float: left;
- border-right: #FFFFFF 2px solid;
+ margin-top: 4px;
}
-
-#menubar a {
- font-weight: normal;
- padding: 2px 4px 2px 4px;
- background-color: #398EC3;
- height: 100%;
- margin-top: 4px;
-}
-
-#menubar a,
-#menubar .current{
- display: block;
- color: #FFFFFF;
-}
-*/
-
+/* end modif */
/* on fly hover */
-#tabs a:hover
- {
+#tabs a:hover {
text-decoration: none;
background-color: #336699;
font-weight: bold;
- /* padding: 4px 4px 4px 4px; mod joe*/
- padding: 4px 4px 3px 4px;
+ padding: 4px 4px 4px 4px;
margin-top: 0px;
- }
+}
/* current tab */
-#tabs .current
- {
+#tabs .current {
float: left;
text-decoration: none;
background-color: #336699;
font-weight: bold;
- /* padding: 4px 4px 4px 4px; mod joe*/
- padding: 4px 4px 3px 4px;
+ padding: 4px 4px 4px 4px;
margin-top: 0px;
color: #FFFFFF;
- }
-
+}
.clearing {
clear: both;
height: 0px;
}
-
/* left menu */
div.leftMenu {
background-color: #FFFFFF;
- border-right: #808080 1px solid;
- border-left: #808080 1px solid;
- border-bottom: #808080 1px solid;
- float: left;
- /* mod joe */
- clear: both;
- /* end */
- /* margin-bottom: 24px;*/
- width: 220px;
+ border-right: #808080 1px solid;
+ border-left: #808080 1px solid;
+ border-bottom: #808080 1px solid;
+ float: left;
+ /* mod joe */
+ clear: both;
+ /* end */
+ width: 220px;
}
div.leftMenu ul a {
- color: #000000;
- text-decoration: none;
+ color: #000000;
+ text-decoration: none;
display: block;
*width: 100%;
*height: 100%;
}
div.leftMenu ul li {
- display: inline;
- margin: 0px;
- padding: 0px;
+ display: inline;
+ margin: 0px;
+ padding: 0px;
}
div.leftMenu ul li a,
div.leftMenu ul li span.current {
- background: url(mainitembg.gif) #CCCCCC repeat-x;
- display: block;
- font-size: 13px;
- padding: 3px 10px 3px 10px;
+ background: url(mainitembg.gif) #CCCCCC repeat-x;
+ display: block;
+ font-size: 13px;
+ padding: 3px 10px 3px 10px;
}
div.leftMenu ul li a:hover {
@@ -174,35 +133,35 @@
div.leftMenu ul li ul li a {
background: none;
background-color: #FFFFFF;
- border-bottom: none;
- font-weight: normal;
+ border-bottom: none;
+ font-weight: normal;
padding: 3px 15px 3px 15px;
}
div.leftMenu ul li ul li a:hover,
span.selectedfield {
- text-decoration: underline;
+ text-decoration: underline;
background-position: 0% 0px;
color: #398EC3;
}
span.selectedfield {
- border-bottom: none;
- display: block;
- font-size: 11px;
- font-weight: bold;
+ border-bottom: none;
+ display: block;
+ font-size: 11px;
+ font-weight: bold;
padding: 4px 11px 5px 16px;
}
div.leftMenu ul,
div.leftMenu ul li ul {
- list-style: none;
- margin: 0px;
- padding: 0px;
+ list-style: none;
+ margin: 0px;
+ padding: 0px;
}
div.leftMenu ul li ul {
- display: block;
+ display: block;
}
div.leftMenu ul li span.current {
Index: styles.css
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/css/styles.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- styles.css 7 Oct 2005 10:01:30 -0000 1.5
+++ styles.css 7 Oct 2005 12:54:27 -0000 1.6
@@ -3,36 +3,32 @@
/* ------------------------------------------------ */
body {
- margin: 20px;
+ margin: 0;
+ padding: 0;
text-align: center;
}
#wrapper {
width: 100%;
+ text-align: left;
}
#header {
- text-align: left;
- padding:20px;
- /* mod joe */
- width: 100%;
- /* */
+ padding-top: 15px;
+ padding-bottom: 0px;
+ margin-top: 4px !important;
+ margin-top: 2px;
}
#pagebody {
- padding: 20px;
- /* mod joe */
- width: 100%;
- /* */
+ padding-top: 20px;
}
#footer {
- width: 100%;
- padding:20px;
+ padding-top: 12px;
+ padding-bottom: 15px;
}
-/* mod joe
-useless
#header, #pagebody, #footer {
float: left;
padding-left: 20px;
@@ -41,7 +37,6 @@
margin-left: 1px;
margin-right: 4px;
}
-*/
.textHeader, .version {
float: right;
@@ -376,4 +371,3 @@
text-align: center;
}
-
