Update for Bootstrap 3

rubysherpas · Mar 15, 2014 · e5bb7c9 · e5bb7c9
1 parent ebaaa08
commit e5bb7c9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/app/views/forem/admin/groups/show.html.erb b/app/views/forem/admin/groups/show.html.erb
@@ -6,7 +6,7 @@
     <p>
       <%= text_field_tag "user_id" %>
     </p>
-    <p class="span1">
+    <p class="col-md-1">
       <%= submit_tag t(".add_member"), :class => "btn btn-primary" %>
     </p>
   <% end %>
@@ -28,7 +28,7 @@
 
 <script>
   $("#user_id").select2({
-    containerCssClass: "span5",
+    containerCssClass: "col-md-5",
     ajax: {
       url: "<%= forem.admin_user_autocomplete_url %>",
       data: function(term, page) {

diff --git a/app/views/forem/forums/_head.html.erb b/app/views/forem/forums/_head.html.erb
@@ -11,7 +11,7 @@
       <%= link_to t('forem.topic.links.back_to_topics'), forem.forum_path(forum), :class => "btn" %>
     <% end %>
     <% if can? :moderate, @forum %>
-      <%= link_to t('forem.forum.moderator_tools'), forem.forum_moderator_tools_path(forum), :class => "btn btn-inverse" %>
+      <%= link_to t('forem.forum.moderator_tools'), forem.forum_moderator_tools_path(forum), :class => "btn btn-primary" %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/forem/forums/show.html.erb b/app/views/forem/forums/show.html.erb
@@ -7,9 +7,9 @@
       <tr>
         <th class="icon"></th>
         <th class="byline"><%= t('forem.topic.headings.topic') -%></th>
-        <th class="latest-post"><%= t('forem.topic.headings.latest') -%></th>
-        <th class="posts-count"><%= t('forem.topic.headings.posts') -%></th>
-        <th class="views-count"><%= t('forem.topic.headings.views') -%></th>
+        <th class="latest-post text-center"><%= t('forem.topic.headings.latest') -%></th>
+        <th class="posts-count text-center"><%= t('forem.topic.headings.posts') -%></th>
+        <th class="views-count text-center"><%= t('forem.topic.headings.views') -%></th>
       </tr>
     </thead>
     <tbody>

diff --git a/app/views/forem/moderation/_options.html.erb b/app/views/forem/moderation/_options.html.erb
@@ -4,7 +4,7 @@
 </p>
 <p>
   <%= f.radio_button "moderation_option", "spam" %>
-  <%= f.label "moderation_option_spam", t('spam', :scope => 'forem.posts.moderation'), :class => "label label-important" %>
+  <%= f.label "moderation_option_spam", t('spam', :scope => 'forem.posts.moderation'), :class => "label label-danger" %>
 </p>
 <br>
 <%= f.submit t('moderate', :scope => 'forem.posts.moderation'), :class => "btn btn-primary" %>
diff --git a/app/views/forem/posts/_form.html.erb b/app/views/forem/posts/_form.html.erb
@@ -1,4 +1,4 @@
-<%= f.input :text, :input_html => { :class => "field span12" } %>
+<%= f.input :text, :input_html => { :class => "field col-md-12" } %>
 
 <% if params[:reply_to_id] %>
   <%= f.hidden_field :reply_to_id, :value => params[:reply_to_id] %>

diff --git a/app/views/forem/posts/_post.html.erb b/app/views/forem/posts/_post.html.erb
@@ -1,6 +1,6 @@
 <a name='post-<%= post.id %>'></a>
 <div class="row">
-  <div id='post_<%= post_counter + 1 %>' class='post <%= cycle('odd', 'even') -%> span10'>
+  <div id='post_<%= post_counter + 1 %>' class='post <%= cycle('odd', 'even') -%> col-md-12'>
     <% if post.pending_review? %>
       <div class='moderation alert'>
         <%= t(".pending_review") %>
@@ -17,7 +17,7 @@
     <% end %>
 
     <div class='contents'>
-      <div class='user span2'>
+      <div class='user col-md-2'>
         <div class='username'>
           <% if post.user.is_a?(Forem::NilUser) %>
             <%= t(:deleted) %>
@@ -28,7 +28,7 @@
         <div class='icon'><%= forem_avatar(post.user, :size => 60) %></div>
       </div>
 
-      <div class='contents span7'>
+      <div class='contents col-md-7'>
         <a href='#post-<%= post.id %>'>
           <%= post_time_tag(post) %>
         </a>

diff --git a/app/views/forem/posts/_reply_to_post.html.erb b/app/views/forem/posts/_reply_to_post.html.erb
@@ -1,13 +1,13 @@
 <a name='post-<%= post.id %>'></a>
-<div id='post_<%= post.id %>' class='reply_to_post post <%= cycle('odd', 'even') -%> span10'>
-  <div class='user span2'>
+<div id='post_<%= post.id %>' class='reply_to_post post <%= cycle('odd', 'even') -%> col-md-10'>
+  <div class='user col-md-2'>
     <div class='username'>
       <%= link_to_if Forem.user_profile_links, post.user, [main_app, post.user] %>
     </div>
     <div class='icon'><%= forem_avatar(post.user, :size => 60) %></div>
   </div>
 
-  <div class='contents span7'>
+  <div class='contents col-md-7'>
     <time datetime="<%= post.created_at.to_s(:db) -%>"><%= "#{time_ago_in_words(post.created_at)} #{t("ago")}" %></time>
     <%= forem_format(post.text) %>
 

diff --git a/app/views/forem/topics/show.html.erb b/app/views/forem/topics/show.html.erb
@@ -4,7 +4,7 @@
   <div id='menu'>
     <div class='btn-group'>
       <% if @topic.can_be_replied_to? && can?(:reply, @topic) %>
-        <%= link_to t(".reply"), forem.new_forum_topic_post_path(@forum, @topic), :class => "btn" %>
+        <%= link_to t(".reply"), forem.new_forum_topic_post_path(@forum, @topic), :class => "btn btn-primary " %>
       <% end %>
       <% if @topic.user == forem_user || forem_admin? %>
         <%= link_to t(".delete"), forem.forum_topic_path(@forum, @topic), :method => :delete, data: { :confirm => t("are_you_sure") }, :class => "btn btn-danger" %>