Merge branch 'master' of github.com:indentlabs/notebook

indentlabs · Oct 18, 2018 · aae2149 · aae2149
2 parents e2009b5 + 8ff57a6
commit aae2149
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 28 deletions.
diff --git a/app/assets/stylesheets/fixes.scss b/app/assets/stylesheets/fixes.scss
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -60,10 +60,10 @@
       %>
 
       <div class="field">
-        <%= f.check_box :email_updates %>
         <%= f.label :email_updates do %>
-          We're always working to improve Notebook.ai. Please leave this box checked if you'd like to receive occasional updates about
-          what's new.
+          <%= f.check_box :email_updates %>
+          <span>We're always working to improve Notebook.ai. Please leave this box checked if you'd like to receive occasional updates about
+            what's new.</span>
         <% end %>
       </div>
 

diff --git a/app/views/devise/registrations/panes/_preferences.html.erb b/app/views/devise/registrations/panes/_preferences.html.erb
@@ -2,9 +2,9 @@
   <div class="card-content">
     <h4>Your Notebook.ai design</h4>
     <div class="field">
-      <%= f.check_box :fluid_preference %>
       <%= f.label :fluid_preference do %>
-        I want to use <strong>full-width</strong> Notebook.ai. Great for small screens, but not so much for very large ones.
+        <%= f.check_box :fluid_preference %>
+        <span>I want to use <strong>full-width</strong> Notebook.ai. Great for small screens, but not so much for very large ones.</span>
       <% end %>
     </div>
   </div>
@@ -14,9 +14,9 @@
   <div class="card-content">
     <h4>Email preferences</h4>
     <div class="field">
-      <%= f.check_box :email_updates %>
       <%= f.label :email_updates do %>
-        I want to receive occasional updates by email about new Notebook.ai features.
+        <%= f.check_box :email_updates %>
+        <span>I want to receive occasional updates by email about new Notebook.ai features.</span>
       <% end %>
     </div>
   </div>

diff --git a/app/views/devise/sessions/_form.html.erb b/app/views/devise/sessions/_form.html.erb
@@ -13,17 +13,21 @@
   </div>
 
   <div class="actions center">
+    <div class="col s6">
     <% if devise_mapping.rememberable? -%>
-      <span class="field" style="margin-right: 30px;">
+      <%= f.label :remember_me do %>
         <%= f.check_box :remember_me %>
-        <%= f.label :remember_me %>
-      </span>
+        <span>Remember me</span>
+      <% end %>
     <% end -%>
-    <%= f.submit "Log in", class: 'btn blue' %>
+    </div>
+    <div class="col s6">
+      <%= f.submit "Log in", class: 'btn blue' %>
+    </div>
 
     <p class="center">
       <br />
       <%= render "devise/shared/links" %>
     </p>
   </div>
-<% end %>
+<% end %>
diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb
@@ -2,14 +2,14 @@
 <%= csrf_meta_tags %>
 
 <%= stylesheet_link_tag 'application' %>
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" integrity="sha256-rByPlHULObEjJ6XQxW/flG2r+22R5dKiAoef+aXWfik=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.2/rails.min.js" integrity="sha256-BbyWhCn0G+F6xbWJ2pcI5LnnpsnpSzyjJNVtl7ABp+M=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.6/lodash.min.js" integrity="sha256-BWnUqM2wJJk2qUy9kUxldWF2drzn2awHUNcmMy87bDQ=" crossorigin="anonymous"></script>
 
 <script type="text/javascript" src="https://js.stripe.com/v2/"></script>

diff --git a/app/views/layouts/forum.html.erb b/app/views/layouts/forum.html.erb
@@ -2,14 +2,14 @@
 <html lang="en">
 <head>
   <%= stylesheet_link_tag 'application' %>
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/css/materialize.min.css">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" integrity="sha256-rByPlHULObEjJ6XQxW/flG2r+22R5dKiAoef+aXWfik=" crossorigin="anonymous" />
   <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
 
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM=" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-ujs/1.2.2/rails.min.js" integrity="sha256-BbyWhCn0G+F6xbWJ2pcI5LnnpsnpSzyjJNVtl7ABp+M=" crossorigin="anonymous"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-beta/js/materialize.min.js"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.16.6/lodash.min.js" integrity="sha256-BWnUqM2wJJk2qUy9kUxldWF2drzn2awHUNcmMy87bDQ=" crossorigin="anonymous"></script>
 
   <%= render 'layouts/favicon' %>

diff --git a/db/schema.rb b/db/schema.rb
@@ -1989,7 +1989,6 @@
     t.datetime "updated_at", null: false
     t.index ["messageboard_id"], name: "index_thredded_posts_on_messageboard_id"
     t.index ["moderation_state", "updated_at"], name: "index_thredded_posts_for_display"
-    t.index ["postable_id"], name: "index_thredded_posts_on_postable_id"
     t.index ["postable_id"], name: "index_thredded_posts_on_postable_id_and_postable_type"
     t.index ["user_id"], name: "index_thredded_posts_on_user_id"
   end