diff --git a/app/assets/stylesheets/active_admin.scss b/app/assets/stylesheets/active_admin.scss index 81dc0c8..133ea0f 100644 --- a/app/assets/stylesheets/active_admin.scss +++ b/app/assets/stylesheets/active_admin.scss @@ -8,7 +8,7 @@ // $sidebar-width: 242px; // Active Admin's got SASS! -@import "active_admin/mixins"; +// @import "active_admin/mixins"; @import "arctic_admin/base"; // Overriding any non-variable SASS must be done after the fact. diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 617ba44..bf71f8c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,7 +15,7 @@ $primary-gradient: linear-gradient(141deg, #009e6c 0%, #00d1b2 71%, #00e7eb 100%); @import "bulma"; // https://bulma.io/documentation/ -@import "./devise"; +@import "./shared/all"; html { background-image: radial-gradient(circle at 13% 47%, rgba(140, 140, 140,0.03) 0%, rgba(140, 140, 140,0.03) 25%,transparent 25%, transparent 100%),radial-gradient(circle at 28% 63%, rgba(143, 143, 143,0.03) 0%, rgba(143, 143, 143,0.03) 16%,transparent 16%, transparent 100%),radial-gradient(circle at 81% 56%, rgba(65, 65, 65,0.03) 0%, rgba(65, 65, 65,0.03) 12%,transparent 12%, transparent 100%),radial-gradient(circle at 26% 48%, rgba(60, 60, 60,0.03) 0%, rgba(60, 60, 60,0.03) 6%,transparent 6%, transparent 100%),radial-gradient(circle at 97% 17%, rgba(150, 150, 150,0.03) 0%, rgba(150, 150, 150,0.03) 56%,transparent 56%, transparent 100%),radial-gradient(circle at 50% 100%, rgba(25, 25, 25,0.03) 0%, rgba(25, 25, 25,0.03) 36%,transparent 36%, transparent 100%),radial-gradient(circle at 55% 52%, rgba(69, 69, 69,0.03) 0%, rgba(69, 69, 69,0.03) 6%,transparent 6%, transparent 100%),linear-gradient(90deg, rgb(255,255,255),rgb(255,255,255)); diff --git a/app/assets/stylesheets/devise.scss b/app/assets/stylesheets/devise.scss deleted file mode 100644 index 81eaaa9..0000000 --- a/app/assets/stylesheets/devise.scss +++ /dev/null @@ -1,15 +0,0 @@ -#registrations, #passwords { - padding-top: $size-1; -} - -#registrations-column { - background-color: $white; - padding: $size-6; -} - -#registrations-column-form, #registrations-column-form-submit-button, -#registration-edit-account-deletion-container, #registrations-edit-passwords, -#registrations-edit-update-password, #passwords-column-form, #unlocks-column-form, -#confirmations-column-form { - padding: $size-3; -} diff --git a/app/assets/stylesheets/shared/_all.scss b/app/assets/stylesheets/shared/_all.scss new file mode 100644 index 0000000..2d9528d --- /dev/null +++ b/app/assets/stylesheets/shared/_all.scss @@ -0,0 +1 @@ +@import "./spacing"; diff --git a/app/assets/stylesheets/shared/_spacing.scss b/app/assets/stylesheets/shared/_spacing.scss new file mode 100644 index 0000000..d6acfbd --- /dev/null +++ b/app/assets/stylesheets/shared/_spacing.scss @@ -0,0 +1,12 @@ +.top-p__1 { + padding-top: $size-1; +} + +.with-background-p__6 { + background-color: $white; + padding: $size-6; +} + +.p__3 { + padding: $size-3; +} diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 6990656..16d2587 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= f.label :email, class: "label" %> @@ -33,7 +33,7 @@
-

+

<%= f.button :submit, "Resend confirmation", class: "button is-primary is-fullwidth is-rounded" %>

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index b8346ca..1ca5c20 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> <%= f.input :reset_password_token, as: :hidden %> <%= f.full_error :reset_password_token %> @@ -53,7 +53,7 @@
-

+

<%= f.button :submit, "Update password", class: "button is-primary is-fullwidth is-rounded" %>

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index c91fbc2..9ab447e 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= f.label :email, class: "label" %> @@ -32,7 +32,7 @@
-

+

<%= f.button :submit, "Reset password", class: "button is-primary is-fullwidth is-rounded" %>

diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index c953711..a77f3c7 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
@@ -35,8 +35,8 @@ <%= f.full_error :email, class: "help is-danger" %>
-
- <%= link_to "Change password", "#", id: "registration-edit-password-button", class: "button is-fullwidth is-rounded" %> +
+ <%= link_to "Change password", "#", id: "registration-edit-password-button", class: "p__3 button is-fullwidth is-rounded" %>
@@ -88,7 +88,7 @@
-

+

<%= f.button :submit, "Update Account", class: "button is-primary is-fullwidth is-rounded" %>

@@ -111,7 +111,7 @@
Warning! Account deletion is permanant and can not be recovered. -
+
<%= link_to "Delete My Account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "button is-danger is-two-thirds is-rounded" %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 5a35240..b0a5d88 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= f.label :email, class: "label" %> @@ -58,7 +58,7 @@
-

+

<%= f.button :submit, "Sign up", class: "button is-primary is-fullwidth is-rounded" %>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index f051e86..f50f863 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<%= f.label :email, class: "label" %> @@ -45,7 +45,7 @@ <%= f.label :remember_me, class: "checkbox" %>
-

+

<%= f.button :submit, "Sign in", class: "button is-primary is-fullwidth is-rounded" %>

diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index d1dcb9e..59bed1a 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,6 +1,6 @@ -
+
-
+
@@ -11,7 +11,7 @@
-
+
<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
<%= f.label :email, class: "label" %> @@ -32,7 +32,7 @@
-

+

<%= f.button :submit, "Send unlock instructions", class: "button is-primary is-fullwidth is-rounded" %>

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 4a79282..2a2eb7d 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,4 +1,4 @@ -
+