Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix footer position #139

Merged
merged 1 commit into from
Sep 16, 2024
Merged

fix footer position #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/bookmark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.bookmarks-wrapper {
width: 100%;
margin: auto;
max-width: 1200px;
min-height: 1000px;//fotterが上に上がるのを防ぐため
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/event.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

.events-main {
max-width: 1200px;
min-height: 1000px;
min-height: 1000px;//fotterが上に上がるのを防ぐため
margin: auto;
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/facility.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
min-height: 1000px;
padding-top: 150px;
overflow: hidden;
padding-top: 150px;
background-image: url("facility.jpg");
background-position:center center;
background-size: cover;
Expand All @@ -20,6 +19,7 @@
.facilities-main {
margin: auto;
max-width: 1200px;
min-height: 1000px;//fotterが上に上がるのを防ぐため
}

// show
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/playground_equipment.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
.playground_equipments-wrapper {
max-width: 1200px;
margin: auto;
height: auto;
min-height: 1000px;//fotterが上に上がるのを防ぐため
}

.playground_equipment-container{
Expand Down
2 changes: 2 additions & 0 deletions app/assets/stylesheets/review.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

.user-reviews-wrapper {
max-width: 1200px;
min-height: 1000px;//fotterが上に上がるのを防ぐため
margin: auto;
}

Expand All @@ -21,6 +22,7 @@

.reviews-wrapper {
max-width: 1200px;
min-height: 1000px;//fotterが上に上がるのを防ぐため
margin: auto;
}

Expand Down
13 changes: 11 additions & 2 deletions app/assets/stylesheets/user_sessions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
.container-md {
.sessions-container {
width: 100%;
min-height: 1000px;
padding-top: 200px;
overflow: hidden;
}

.sessions-wrapper {
margin: auto;
max-width: 800px;
min-height: 1000px;
}

@media screen and (max-width: 600px){
.container-md {
.sessions-container {
padding-top: 150px;
}
}
15 changes: 12 additions & 3 deletions app/assets/stylesheets/users.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
.container {
padding-top: 100px;
.user-container {
width: 100%;
min-height: 1000px;
padding-top: 200px;
overflow: hidden;
}

.user-wrapper {
margin: auto;
max-width: 800px;
min-height: 1000px;
}

@media screen and (max-width: 600px){
.container {
.user-container {
padding-top: 150px;
}
}
28 changes: 15 additions & 13 deletions app/views/admin/sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<%= content_for(:title, t('.title')) %>
<div class="container">
<h1>管理者専用ログイン</h1>
<div class="sessions-container">
<div class="sessions-wrapper">
<h1>管理者専用ログイン</h1>

<%= form_with(url: admin_login_path, local: true) do |f| %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, class: 'form-control' %>
</div>
<%= form_with(url: admin_login_path, local: true) do |f| %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, class: 'form-control mt-2' %>
</div>

<div class="form-group">
<%= f.label :password %>
<%= f.password_field :password, class: 'form-control' %>
</div>
<div class="form-group">
<%= f.label :password %>
<%= f.password_field :password, class: 'form-control mt-2' %>
</div>

<%= f.submit 'Log in', class: 'btn btn-primary' %>
<% end %>
<%= f.submit 'Log in', class: 'btn btn-primary mt-2' %>
<% end %>
</div>
</div>
58 changes: 30 additions & 28 deletions app/views/user_sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,34 @@
<% content_for(:title, t('.title')) %>
<div class="container">
<div class="row">
<div class=" col-md-10 offset-md-1 col-lg-8 offset-lg-2">
<h1><%= t('.title') %></h1>
<%= form_with model: @user, class: 'pt-5', local: true do |f| %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, class: 'form-control', placeholder: "email@example.com" %>
</div>
<div class="form-group mt-3">
<%= f.label :password %>
<%= f.password_field :password, class: 'form-control', placeholder: "password" %>
</div>
<div>
<%= f.label :remember_me, t('.auto_login') %>
<%= f.check_box :remember_me %>
</div>
<%= link_to 'Login with Google', auth_at_provider_path(provider: :google) %>
<div class="actions mt-3">
<%= f.submit t('.login'), class: 'btn btn-primary' %>
</div>
<% end %>
<div class='text-center mt-5'>
<div>
<%= link_to t('.to_register_page'), new_user_path %>
</div>
<div class='mt-1'>
<%= link_to t('.password_forget'), new_password_reset_path %>
<div class="sessions-container">
<div class="sessions-wrapper">
<div class="row">
<div class=" col-md-10 offset-md-1 col-lg-8 offset-lg-2">
<h1><%= t('.title') %></h1>
<%= form_with model: @user, class: 'pt-5', local: true do |f| %>
<div class="form-group">
<%= f.label :email %>
<%= f.email_field :email, class: 'form-control', placeholder: "email@example.com" %>
</div>
<div class="form-group mt-3">
<%= f.label :password %>
<%= f.password_field :password, class: 'form-control', placeholder: "password" %>
</div>
<div>
<%= f.label :remember_me, t('.auto_login') %>
<%= f.check_box :remember_me %>
</div>
<%= link_to 'Login with Google', auth_at_provider_path(provider: :google) %>
<div class="actions mt-3">
<%= f.submit t('.login'), class: 'btn btn-primary' %>
</div>
<% end %>
<div class='text-center mt-5'>
<div>
<%= link_to t('.to_register_page'), new_user_path %>
</div>
<div class='mt-1'>
<%= link_to t('.password_forget'), new_password_reset_path %>
</div>
</div>
</div>
</div>
Expand Down
52 changes: 27 additions & 25 deletions app/views/users/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
<% content_for(:title, t('.title')) %>
<div class='container-md'>
<div class='row'>
<div class='col-md-10 col-lg-8 mx-auto'>
<h1><%= t('.title') %></h1>
<%= form_with model: @user, local: true do |f| %>
<%= render 'shared/error_messages', object: f.object %>
<div class='form-group'>
<%= f.label :name %>
<%= f.text_field :name, class: 'form-control' %>
<div class='user-container'>
<div class="user-wrapper">
<div class='row'>
<div class='col-md-10 col-lg-8 mx-auto'>
<h1><%= t('.title') %></h1>
<%= form_with model: @user, local: true do |f| %>
<%= render 'shared/error_messages', object: f.object %>
<div class='form-group'>
<%= f.label :name %>
<%= f.text_field :name, class: 'form-control' %>
</div>
<div class='form-group mt-3'>
<%= f.label :email %>
<%= f.email_field :email, class: 'form-control' %>
</div>
<div class='form-group mt-3'>
<%= f.label :password %>
<%= f.password_field :password, class: 'form-control' %>
</div>
<div class='form-group mt-3'>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, class: 'form-control' %>
</div>
<%= f.submit class: 'btn btn-primary mt-3' %>
<% end %>
<div class='text-center'>
<%= link_to t('.to_login_page'), login_path %>
</div>
<div class='form-group mt-3'>
<%= f.label :email %>
<%= f.email_field :email, class: 'form-control' %>
</div>
<div class='form-group mt-3'>
<%= f.label :password %>
<%= f.password_field :password, class: 'form-control' %>
</div>
<div class='form-group mt-3'>
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, class: 'form-control' %>
</div>
<%= f.submit class: 'btn btn-primary mt-3' %>
<% end %>
<div class='text-center'>
<%= link_to t('.to_login_page'), login_path %>
</div>
</div>
</div>
Expand Down
Loading