diff --git a/app/javascript/images/.keep b/app/javascript/images/.keep new file mode 100644 index 0000000..e69de29 diff --git a/app/javascript/images/application/cdao-bg.png b/app/javascript/images/application/cdao-bg.png new file mode 100644 index 0000000..2ba60b5 Binary files /dev/null and b/app/javascript/images/application/cdao-bg.png differ diff --git a/app/javascript/images/application/cdasiaonline_logo.png b/app/javascript/images/application/cdasiaonline_logo.png new file mode 100644 index 0000000..710b9bd Binary files /dev/null and b/app/javascript/images/application/cdasiaonline_logo.png differ diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 66f2702..4989aab 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -27,6 +27,9 @@ Rails.start() Turbolinks.start() ActiveStorage.start() +const images = require.context('../images', true) +const imagePath = (name) => images(name, true) + $(document).on("ready turbolinks:load", function () { $('#toggleSideNav').on('click', function () { $('#sidenav').toggleClass('active'); diff --git a/app/javascript/src/application.scss b/app/javascript/src/application.scss index 59eb892..f08250b 100644 --- a/app/javascript/src/application.scss +++ b/app/javascript/src/application.scss @@ -102,4 +102,12 @@ margin-bottom: 10px; padding-left: 5px; background: #efefef; +} + +.sessions-body-bg { + background-image: url('../../javascript/images/application/cdao-bg.png'); + background-repeat: no-repeat; + background-size: cover; + overflow-x: hidden; + box-shadow: inset 0 0 0 2000px rgb(154 107 107 / 30%); } \ No newline at end of file diff --git a/app/javascript/src/application/sessions.scss b/app/javascript/src/application/sessions.scss index fffd9d9..2ddb27e 100644 --- a/app/javascript/src/application/sessions.scss +++ b/app/javascript/src/application/sessions.scss @@ -1,6 +1,19 @@ .login-body-box .content-body { padding: 26px; - background: #949494ba; - box-shadow: 10px 5px 5px #e8e8e8; + background: #9494946b; + box-shadow: 10px 5px 5px #7a6346; border-radius: 4px; -} \ No newline at end of file + width: 350px; + margin-top: -100px; +} + +.login-logo { + height: 100%; +} + +.login-logo { + .app-logo { + width: 370px; + margin-top: 30px; + } +} diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index dbc83e3..d83a898 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,4 +1,4 @@ -

Forgot your password?

+

Forgot your password?

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %> @@ -9,7 +9,7 @@
- <%= f.submit "Send me reset password instructions", class: "btn btn-primary" %> + <%= f.submit "Send me reset password instructions", class: "btn btn-danger" %>
<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 5fddcb2..46f9555 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,4 +1,4 @@ -

Log in

+

Log in

<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> @@ -22,7 +22,7 @@ <% end %>
- <%= f.submit "Log in", class: "btn btn-primary" %> + <%= f.submit "Log in", class: "btn btn-danger" %>
<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3012ab6..183eaa1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,16 +11,20 @@ <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - - -
+ + +
+ <% if current_user.present? %>
<%= render(SidenavComponent.new(current_user: current_user))%>
<% end %> -