bambis13 · katsunori-takahashi · Jun 8, 2018 · Jun 8, 2018 · Jun 9, 2018 · Jun 9, 2018
diff --git a/.bashrc b/.bashrc
@@ -0,0 +1,22 @@
+# スクリプト読み込み
+source $HOME/.git-completion.bash
+source $HOME/.git-prompt.sh
+
+# プロンプトに各種情報を表示
+GIT_PS1_SHOWDIRTYSTATE=1
+GIT_PS1_SHOWUPSTREAM=1
+GIT_PS1_SHOWUNTRACKEDFILES=
+GIT_PS1_SHOWSTASHSTATE=1
+
+############### ターミナルのコマンド受付状態の表示変更
+# \u ユーザ名
+# \h ホスト名
+# \W カレントディレクトリ
+# \w カレントディレクトリのパス
+# \n 改行
+# \d 日付
+# \[ 表示させない文字列の開始
+# \] 表示させない文字列の終了
+# \$ $
+export PS1='\[\033[1;32m\]\u\[\033[00m\]:\[\033[1;34m\]\w\[\033[1;31m\]$(__git_ps1)\[\033[00m\] \$ '
+##############
diff --git a/app/assets/stylesheets/_devise_users.scss b/app/assets/stylesheets/_devise_users.scss
@@ -0,0 +1,275 @@
+@import './variable';
+
+.position{
+  // 編集の際のpositionの調節
+  height: 100px;
+}
+
+// login
+
+.login_contents{
+  height: 350px;
+  width: 530px;
+  padding: 32px;
+  margin: 0 auto;
+  background-color: $white;
+  // わかりやすくするために追加
+  border: 1px solid #848484;
+  font-family: Helvetica Neue;
+  .top_content{
+    height: 15px;
+    width: 100%;
+    margin-bottom: 24px;
+    background-color: $white;
+  }
+  .correction_position_top{
+    height: 15px;
+  }
+  .body_content{
+    height: 280px;
+    width: 100%;
+    background-color: $white;
+    .title_content{
+      height: 34px;
+      width: 100%;
+      line-height: 30px;
+      letter-spacing: normal;
+      padding-top: 2px;
+      padding-bottom: 2px;
+      color: #1C1C1C;
+      margin: 0;
+      .bold{
+        float: left;
+      }
+    }
+    .correction_position_center_top{
+      height: 20px;
+    }
+    .facebook_login_ber{
+      height: 50px;
+      width: 100%;
+      margin: 0 auto;
+      background-color: #1152A8;
+      .facebook_login_btn{
+        height: 100%;
+        width: 100%;
+        float: right;
+        .redirect_btn{
+          height: 100%;
+          width: 100%;
+          h3{
+            margin: 0 auto;
+            color: #F1F3F6;
+          }
+        }
+      }
+    }
+    .correction_position_center_bottom{
+      height: 10px;
+    }
+    .border_line{
+      background: none;
+      height: 40px;
+      position: relative;
+      text-align: center;
+      &__content{
+        background-color: $white;
+        padding: 8px;
+        display: inline-block;
+      }
+      hr{
+        margin: -16px auto 10px;
+        width: 100%;
+        border-top: 1px solid #E6E6E6;
+      }
+    }
+    .split_button{
+      height: 110px;
+      width: 100%;
+      .left_login_btn{
+        height: 50px;
+        width: 250px;
+        float: left;
+        border: 1px solid #848484;
+        .redirect_btn{
+          height: 100%;
+          width: 50%;
+          h3{
+            height: 30px;
+            width: 200px;
+          }
+        }
+      }
+      .right_login_btn{
+        height: 50px;
+        width: 250px;
+        float: right;
+        border: 1px solid #848484;
+        .redirect_btn{
+          height: 100%;
+          width: 50%;
+          h3{
+            height: 30px;
+            width: 200px;
+          }
+        }
+      }
+    }
+  }
+  .bottom_content{
+    height: 23px;
+    width: 100%;
+    font-size: 16px;
+    line-height: 22px;
+    &__text_elia{
+      padding-left: 120px;
+      float: left;
+      color: #848484;
+    }
+    .redirect_btn{
+      padding-left: 10px;
+      color: rgb(0, 132, 137);
+    }
+  }
+}
+
+// login_session
+
+.login_session_contents{
+  height: 520px;
+  width: 510px;
+  margin: 0 auto;
+  padding: 32px;
+  font-family: Helvetica Neue;
+  background-color: $white;
+  // わかりやすくするために追加
+  border: 1px solid #848484;
+  &__top_content{
+    height: 15px;
+    width: 100%;
+    margin-bottom: 30px;
+    background-color: $white;
+  }
+  &__title_content{
+    height: 40px;
+    h1{
+      margin-bottom: 24px;
+    }
+  }
+  .correction_position_top{
+    height: 15px;
+  }
+  &__form_content{
+    height: 245px;
+    width: 100%;
+    background-color: $white;
+    .field_input_elia{
+      height: 42px;
+      font-size: 16px;
+      line-height: 22px;
+      margin-bottom: 20px;
+      position: relative;
+      z-index: 0;
+      display: block;
+      width: 100%;
+      border-width: 1px;
+      border-style: solid;
+      border-color: #E6E6E6;
+      border-radius: 2px;
+      .login_form{
+        // height: 100%;
+        width: 90%;
+        border-color: $white;
+        padding: 10px 35px 10px 10px;
+      }
+    }
+    .field_checkbox_elia{
+      font-size: 14px;
+      line-height: 1.5;
+      margin-bottom: 16px;
+    }
+    .field_submit_elia{
+      margin-bottom: 16px;
+      .login_btn{
+        font-size: 16px;
+        line-height: 21px;
+        padding-top: 12px;
+        padding-bottom: 12px;
+        font-weight: 800;
+        padding-left: 24px;
+        padding-right: 24px;
+        min-width: 77.6656px;
+        box-shadow: none;
+        height: 50px;
+        width: 100%;
+        color: $white;
+        border-radius: 4px;
+        border-width: 2px;
+        border-style: solid;
+        background: #F7819F;
+        border-color: transparent;
+      }
+    }
+    .redirect_btn{
+      padding-left: 33%;
+      color: rgb(0, 132, 137);
+    }
+    .section_message{
+      padding: 16px;
+      background: none;
+      position: relative;
+      text-align: center;
+      margin-bottom: 16px;
+    }
+  }
+  .correction_position_center{
+    height: 55px;
+  }
+  &__split_button{
+    height: 60px;
+    width: 100%;
+    margin-bottom: 16px;
+    .left_login_btn{
+      height: 50px;
+      width: 250px;
+      float: left;
+      border: 1px solid #848484;
+      .redirect_btn{
+        height: 100%;
+        width: 50%;
+        h3{
+          height: 30px;
+          width: 200px;
+        }
+      }
+    }
+    .right_login_btn{
+      height: 50px;
+      width: 250px;
+      float: right;
+      border: 1px solid #848484;
+      .redirect_btn{
+        height: 100%;
+        width: 50%;
+        h3{
+          height: 30px;
+          width: 200px;
+        }
+      }
+    }
+  }
+  &__border_line{
+    margin-bottom: 16px;
+  }
+  &__bottom_content{
+    .text_elia{
+      padding-left: 100px;
+      float: left;
+      color: #848484;
+    }
+    .redirect_btn{
+      padding-left: 10px;
+      color: rgb(0, 132, 137);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/_variable.scss b/app/assets/stylesheets/_variable.scss
@@ -2,3 +2,4 @@ $white: #FFFFFF;
 $fontBlack: #383838;
 $viridian: #107275;
 $fontDarkRed: #6B1F0D;
+$facebook_blue: #1152A8;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -3,6 +3,7 @@
 @import './header';
 @import './homes';
 @import './footer';
+@import './devise_users';
 
 .clearfix:after {
   content: "";

diff --git a/app/assets/stylesheets/devise_users.scss b/app/assets/stylesheets/devise_users.scss
diff --git a/app/controllers/devise_users_controller.rb b/app/controllers/devise_users_controller.rb
@@ -1,2 +1,11 @@
 class DeviseUsersController < ApplicationController
+  def index
+    # render template: "devise_users/index", layout: false
+  end
+  def new
+  end
+  def craete
+  end
+  def show
+  end
 end
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb