[Mapbender-commits] r2846 - branches/nimix_dev/http/css

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Mon Aug 18 10:16:40 EDT 2008


Author: nimix
Date: 2008-08-18 10:16:40 -0400 (Mon, 18 Aug 2008)
New Revision: 2846

Modified:
   branches/nimix_dev/http/css/admin.screen.css
   branches/nimix_dev/http/css/popup.css
Log:
merge

Modified: branches/nimix_dev/http/css/admin.screen.css
===================================================================
--- branches/nimix_dev/http/css/admin.screen.css	2008-08-18 14:15:21 UTC (rev 2845)
+++ branches/nimix_dev/http/css/admin.screen.css	2008-08-18 14:16:40 UTC (rev 2846)
@@ -3,285 +3,100 @@
 /* ################################################## */
 
 * {
-	margin: 0;
-	padding: 0;
 	font-weight: normal;
 	font-style: normal;
 }
 
 body {
-	width: 350px;
-}
-
-body {
-	width: auto;
-	min-width: 350px;
-}
-
-body {
 	padding: 1em;
 	font-family: "Lucida Sans Unicode","Lucida Sans","Lucida Grande","Trebuchet MS",Verdana,Arial,Helvetica,sans-serif;
 	font-size: 12px;
-	line-height: 1em;
+	line-height: 1.2em;
 	color: #000;
-	background-color: #F3F3F3;
+	background-color: #FFF;
 }
 
 /* ################################################## */
 
 h1 {
 	margin-bottom: 1em;
-	padding: .5em;
-	font-size: 1.5em;
+	font-size: 2em;
 	color: #600;
-	background-color: #E3E3E3;
-	border: 1px solid #CCC;
-	-moz-border-radius: 5px;
 }
 
-p, ul {
+p {
 	margin-bottom: 1em;
-	line-height: 1.25em;
+}
+
+a {
+	color: #09C;
+}
+
+a:hover {
+	text-decoration: none;
 }
 
-a {
-	color: #09C;
-}
-
-a:hover {
-	text-decoration: none;
-}
-
-em {
-	font-size: .75em;
-	line-height: 1.25em;
-	text-transform: uppercase;
-	letter-spacing: 1px;
-	color: #999;
-}
-
 /* ################################################## */
 
 form {
 	clear: both;
 	margin-top: 1em;
-	padding-top: 1em;
-	padding-right: 1em;
-	padding-left: 1em;
-	background-color: #E3E3E3;
-	border: 1px solid #CCC;
-	-moz-border-radius: 5px;
 }
 
-fieldset {
-	border: 0;
+fieldset {
+	padding: 0;
+	border: 0;
 }
 
 legend {
-	display: block;
-	padding-bottom: .5em;
+	display: block;
+	margin: 0;
+	padding: 0;
 	font-weight: bold;
 	text-transform: uppercase;
-	color: #600;
+	color: #600;
 }
 
-label {
-	color: #666;
+label {
+	margin-bottom: .5em;
 	white-space: nowrap;
 }
 
-input, textarea, select {
-	padding-top: .25em;
-	padding-right: .5em;
-	padding-bottom: .25em;
-	padding-left: .5em;
+input, textarea, select {
 	font: inherit;
-	line-height: 1.2em;
-	background-color: #EEE;
-	border-width: 1px;
-	border-color: #FFF;
+	background-color: #EEE;
+	border: 1px solid #CCC;
 }
-
-select option:hover {
-	background-color: #CCC;
-}
-
-input[type=submit], 
-input[type=reset],
-input[type=button] {
-	padding-right: .25em;
-	padding-left: .25em;
-	color: #FFF;
-	background-color: #CCC;
-}
-
+
 hr {
-	clear: both;
+	clear: both;
+	height: 1px;
+	color: #FFF;
 	background-color: transparent;
 	border: 0;
 }
 
 /* ################################################## */
-
-.center {
-	text-align: center;
-}
-
-/* ################################################## */
-
-.topbar {
-	height: 1.75em;
-	line-height: 1.75em;
-	text-align: right;
-	list-style: none;
-	border: 1px solid #999;
-	white-space: nowrap;
-}
-
-.topbar li {
-	display: inline;
-	padding-top: .25em;
-	padding-right: 1.75em;
-	padding-bottom: .25em;
-	padding-left: 1.75em;
-	cursor: pointer;
-	border-left: 1px solid #999;
-}
-
-.topbar a {
-	font-size: .8em;
-	text-decoration: none;
-	text-transform: uppercase;
-	letter-spacing: 1px;
-	color: #999;
-}
-
-.topbar li:hover {
-	background-color: #999;
-}
-
-.topbar li:hover a,
-.topbar a:hover {
-	color: #E3E3E3;
-}
-
-/* ################################################## */
-
-.guiElements {
-	line-height: 1.75em;
-	list-style: none;
-}
-
-.guiElements li {
-	clear: both;
-	margin-bottom: .5em;
-	padding: .5em;
-	color: #CCC;
-	border: 1px solid #3C3C3C;
-}
-
-.guiElements img {
-	float: right
-}
-
-.guiElements li.active {
-	margin-top: 1.5em;
-	margin-left: 1.5em;
-	margin-bottom: 1.5em;
-	background-color: #363636;
-	border-left-width: 1.5em;
-}
-
-.guiElements li.active strong {
-	font-weight: bold;
-}
-
-.guiElements li:hover {
-	background-color: #363636;
-}
-
-.guiElements a {
-	margin-right: 1em;
-	font-weight: normal;
-	font-size: .8em;
-	text-decoration: none;
-	text-transform: uppercase;
-	letter-spacing: 1px;
-}
-
-.guiElements a:after {
-	content: " ""\00BB";
-	font-size: 1.5em;
-	color: #999;
-}
-
-.guiElements a:hover {
-	color: #E3E3E3;
-	background-color: #09C;
-}
-
-.guiElements a:hover:after {
-	color: #E3E3E3;
-}
-
-.guiElements em {
-	clear: both;
-	display: block;
-	padding-right: 3em;
-	font-weight: normal;
-	font-size: 1em;
-	text-transform: none;
-	letter-spacing: 0;
-	color: #999;
-}
-
-.guiElements small {
-	float: right;
-	width: 2em;
-	height: 2em;
-	margin-left: 1em;
-	font-size: .75em;
-	line-height: 2em;
-	text-align: center;
-	text-transform: uppercase;
-	letter-spacing: -1px;
-	color: #E3E3E3;
-	border-width: 1px;
-}
-
-.guiElements small.on {
-	background-color: #9C0;
-	border-style: inset;
-	border-color: #9C0;
-}
-
-.guiElements small.off {
-	background-color: #C00;
-	border-style: outset;
-	border-color: #C00;
-}
-
-.guiElements br {
-	visibility: hidden;
-	display: none;
-}
-
-/* ################################################## */
-
- 
+
+input.wide {
+	width: 100%;
+}
+
 .rightContainer {
 	float: right;
-	width: 40%;
+	width: 40%;
+	margin-left: -1%;
 }
 
 
 .leftContainer {
 	float: left;
-	width: 40%;
+	width: 40%;
+	margin-right: -1%;
 }
 
 .centerContainer {
-	float: left;
+	float: left;
 	width: 20%;
 	text-align: center;
 }
@@ -290,68 +105,19 @@
 	visibility: hidden;
 }
 
-.rightContainer select, input[type=text],
+.rightContainer select,
 .leftContainer select {
-	width: 100%
+	width: 100%;
 }
 
 .centerContainer input#add,
 .centerContainer input#remove {
-	margin-bottom: .5em;
+	margin-top: .5em;
+	margin-bottom: .5em;
 	padding-right: 1em;
-	padding-left: 1em;
-	color: #FFF;
+	padding-left: 1em;
 }
 
-.topContainer,
-.bottomContainer {
-	margin-right: -1em;
-	margin-left: -1em;
-	padding: 1em;
-}
-
-.topContainer {
-	clear: both;
-	border-bottom: 1px dotted #CCC;
-}
-
-.bottomContainer {
-	clear: both;
-	border-top: 1px dotted #CCC;
-}
-
-.topContainer p, 
-.bottomContainer p {
-	margin: 0;
-	line-height: 1.5em;
-}
-
-/* ################################################## */
-
-.labeledFields p {
-	line-height: 2.5em;
-	color: #CCC;
-}
-
-.labeledFields label {
-	float: left;
-	width: 7.5em;
-	padding-right: 1em;
-	text-align: right;
-}
-
-.labeledFields label.inline {
-	float: none;
-	width: auto;
-	padding-right: 0;
-}
-
-/* ################################################## */
-
-#indicator {
-	float: right;
-	position: relative;
-	top: -.25em;
-	margin-left: -20px;
-	margin-bottom: -20px;
+#indicator img {
+	vertical-align: middle;
 }
\ No newline at end of file

Modified: branches/nimix_dev/http/css/popup.css
===================================================================
--- branches/nimix_dev/http/css/popup.css	2008-08-18 14:15:21 UTC (rev 2845)
+++ branches/nimix_dev/http/css/popup.css	2008-08-18 14:16:40 UTC (rev 2846)
@@ -1,8 +1,22 @@
 @CHARSET "UTF-8";
 /*fixes*/
 div.mbPopup iframe {width:100%;height:100%;border:none;}
-div.mbPopup div.scrollDiv {overflow:auto;width:100%;height:100%;border:none;}
+div.mbPopup div.scrollDiv {position:relative;top:0px;left:0px;right:0px;bottom:0px;width:100%;height:100%;}
 
+div.scrollDiv {
+ overflow: auto;
+}
+
+/* exploder V6 only */
+* html div.scrollDiv {
+ overflow-y: scroll;
+}
+
+/* exploder V7 only */
+*+html div.scrollDiv {
+ overflow-y: scroll;
+}
+
 div.mbPopup {
     display: none;
     overflow:hidden;
@@ -78,4 +92,3 @@
 	width:100px;
 	height:80px;
 }
-



More information about the Mapbender_commits mailing list