Merge pull request #234 from weih/master

fix some mobile css bugs
IceskYsl · Mar 11, 2012 · 0b4eee9 · 0b4eee9
2 parents e5efe65 + 5a52677
commit 0b4eee9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
@@ -17,8 +17,26 @@ body {
     a { padding: 10px 6px 11px; }
   }
 }
-.tabs::before, .pills::before, .tabs::after, .pills::after{
-  display:inline;
+.userinfo {
+  .role {
+    float: right;
+    margin-right: 10px;
+  }
+  ul li {
+    span {      
+      width: auto;
+      text-indent: 5px;
+    }
+  }
+  .with_nbsp {
+    text-indent: 3px;
+    span {
+      display:none;
+    }
+  } 
+}
+table.node_topics .replies {
+  width: 40px;
 }
 .breadcrumb { 
   padding: 7px;
@@ -48,7 +66,9 @@ textarea.long {  width: 98%; height: 80px; }
 }
 form {
   margin-bottom: 0px;
-
+  input[type="text"] {
+    width: 80%;
+  }  
   fieldset {
     margin-bottom: 18px;
     padding-top: 18px;
@@ -76,6 +96,9 @@ form {
   .clearfix { margin-bottom:8px; }
   .actions { 
     padding:0; padding-top:10px; background:#FFF; margin-bottom:0;
+  }	
+  #user_github {
+    width: 130px;
   }
 }
 .input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge {

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
@@ -72,11 +72,11 @@ def render_user_personal_website(user)
 
   def render_user_level_tag(user)
     if admin?(user)
-      content_tag(:span, t("common.admin_user"), :class => "label warning")
+      content_tag(:span, t("common.admin_user"), :class => "label warning role")
     elsif wiki_editor?(user)
-      content_tag(:span, t("common.wiki_admin"), :class => "label success")
+      content_tag(:span, t("common.wiki_admin"), :class => "label success role")
     else
-      content_tag(:span,  t("common.limit_user"), :class => "label")
+      content_tag(:span,  t("common.limit_user"), :class => "label role")
     end
   end
 

diff --git a/app/views/users/_info.html.erb b/app/views/users/_info.html.erb
@@ -5,7 +5,7 @@
     </div>
     <%= render_user_level_tag(@user) %>
     <ul>
-        <li><span>&nbsp;</span>第 <%= @user.id %> 位<%= t("menu.users")%></li>
+        <li class="with_nbsp"><span>&nbsp;</span>第 <%= @user.id %> 位<%= t("menu.users")%></li>
         <li><span>ID:</span><strong><%= @user.login %></strong></li>
         <% if !@user.name.blank? %>
         <li><span>Name:</span><strong><%= @user.name %></strong></li>