Changeset 46:36f4421937ed for admin/style

Timestamp:

04/29/11 10:08:59 (14 years ago)

Author:

kozlika

Branch:

userprefs

Children:

48:0891631a2623, 52:9a388f5e4e3a

Parents:

45:282249d3b55d (diff), 43:bd53e32fe98b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

Files:

• admin/style/default.css (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)

admin/style/default.css

@@ -1094 +1094 @@
      font-size: 1.3em;
 }
-/* à supprimer quand tous les formulaires auront été corrigés */
-label.required:before {
-     content: '* ';
-     color: #c00;
-}
-
+label.inline {
+     display: inline;
+}
 p.field {
      position: relative;

admin/style/default.css

@@ -1152 +1152 @@
      width: 100%;
 }
+
+#login-screen #safe_mode_help {
+     display : none;
+     margin : 0 0 1em 0;
+     padding: 5px 10px 5px 30px;
+     background: #fbfbfb url(msg-std.png) no-repeat 5px 5px;
+     border: 1px solid #999;
+     -moz-border-radius: 4px;
+     -webkit-border-radius: 4px;
+}
+
 
 /* ------------------  Tous les boutons -------------------- */