Modal aesthetics final

TeaWithStrangers · May 5, 2015 · 68f00e4 · 68f00e4
1 parent aa2d2d7
commit 68f00e4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/app/assets/javascripts/modals.js b/app/assets/javascripts/modals.js
@@ -14,6 +14,7 @@ function loadModal(modalTarget) {
       draggable: false,
       resizeable: false,
       width: 500,
+      closeText: "Not now",
       title: null
     });
   }

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -10,8 +10,8 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_self
  *= require jquery-ui/dialog
+ *= require_self
  */
 
 @import "tws-styles/application";

diff --git a/app/assets/stylesheets/static/_modal.scss b/app/assets/stylesheets/static/_modal.scss
@@ -0,0 +1,10 @@
+.ui-dialog-titlebar {
+  padding: 0;
+  border: 0;
+  background: white;
+
+  .ui-dialog-titlebar-close {
+    border: none;
+    background: none;
+  }
+}
diff --git a/app/views/shared/_new_sign_up.html.erb b/app/views/shared/_new_sign_up.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: ['sign-up' ] }) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { class: ['sign-up'] }) do |f| %>
   <%= f.text_field :nickname, placeholder: 'Nickname' %>
   <%= f.email_field :email, placeholder: 'Email Address' %>
   <%= f.password_field :password, placeholder: 'Password' %>

diff --git a/lib/assets/stylesheets/tws-styles b/lib/assets/stylesheets/tws-styles