Merge branch 'master' into openid

[rails.git] / public / stylesheets / small.css

diff --git a/public/stylesheets/small.css b/public/stylesheets/small.css
index cfcf0fd22095726b4e4557ad5766ebcf446ce8e2..2c6f669df021b4d60ea988a58ae1e34f831547c1 100644 (file)
--- a/public/stylesheets/small.css
+++ b/public/stylesheets/small.css
@@ -43,10 +43,14 @@ h1 {
 #small-title {
   font-size: 12px;
   line-height: 14px;
+  height: 16px;
   display: block;
   position: absolute;
   top: 0;
-  margin: 2px;
+  padding: 2px;
+  width: 110px; /* TODO: find better fix for overlap */
+  background-color: #fff;
+  z-index: 100;
 }
 
 #small-title img {
@@ -132,6 +136,10 @@ h1 {
   max-width: 18em;
 }
 
+#login_openid_buttons_wide {
+  display: none;
+}
+
 /* Rules for the profile page */
 
 .user_map {
@@ -139,6 +147,20 @@ h1 {
   height: 300px !important;
 }
 
+/* Rules for the user settings page */
+
+#user_new_email {
+  width: 60% !important;
+}
+
+#user_description, #user_preferred_editor {
+  width: 90% !important;
+}
+
+.minorNote {
+  display: block;
+}
+
 /* Rules for the browse pages */
 
 #browse_navigation {
@@ -149,6 +171,7 @@ h1 {
 #small_map, #browse_map {
   width: 100% !important;
 }
+
 #changeset_list tr {
   display: block;
   clear: left;