Changeset 1162 for trunk/LATMOS-Accounts-Web/root/static/struct.css

Timestamp:

09/28/12 08:08:47 (12 years ago)

Author:

nanardon

Message:

fix conflict

File:

• trunk/LATMOS-Accounts-Web/root/static/struct.css (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/root/static/struct.css

@@ -9 +9 @@
     width: 20%;
     padding: 0.2em;
+    float: left;
 }
 
@@ -14 +15 @@
     width: 78%;
     padding: 0.2em;
+    float: left;
+}
+
+#oinfo {
+}
+
+#oaction {
+    clear: both;
+}
+#oaction form {
+    display: inline-block;
+}
+
+#omenu {
+    clear: both;
+}
+
+#objectform {
+    clear: both;
+}
+
+#objectform div {
+    display: inline-block;
+    vertical-align: text-top;
+}
+#objectform form {
+    display: inline-block;
+    vertical-align: text-top;
+}
+#objectform table {
+    display: inline-block;
+    vertical-align: text-top;
 }
 
@@ -21 +54 @@
 }
 
-#login_name {
-    font-size: 0.8em;
-
+#navigate {
+    float: right;
 }
-
-#objectform {
-}
-
-.objectformleft #oform {
-        float: left;
-}
-
-#oform {
-    margin-left:auto;
-    margin-right:auto;
-}