From 19f474bc1ec5679276ed4d7fd1d6410e2b002f01 Mon Sep 17 00:00:00 2001 From: Ken Ohata Date: Sat, 22 Nov 2014 19:05:18 +0900 Subject: [PATCH] update style clear --- app/assets/stylesheets/application.css.sass | 7 +++ app/assets/stylesheets/registrations.css.sass | 46 ++++++++++++++++++- app/views/registrations/new.html.haml | 43 ++++++++++------- 3 files changed, 79 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index a4c2759..eded01a 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -15,3 +15,10 @@ */ @import bootstrap + +html, body + width: 100% + height: 100% + +.clear + clear: both diff --git a/app/assets/stylesheets/registrations.css.sass b/app/assets/stylesheets/registrations.css.sass index fb1c6cc..a1ef422 100644 --- a/app/assets/stylesheets/registrations.css.sass +++ b/app/assets/stylesheets/registrations.css.sass @@ -1,3 +1,47 @@ // Place all the styles related to the registrations controller here. // They will automatically be included in application.css. -// You can use Sass here: http://sass-lang.com/ +// You can use Sass (SCSS) here: http://sass-lang.com/ + +#registrations + background-image: asset-url("back.jpg") + background-position: center + background-size: cover + background-color: transparent + background-repeat: no-repeat + background-color: #050911 + #registrations-new + width: 100% + height: 100% + .left-content + margin-top: 45px + padding: 0px 45px + color: #fff + h1 + font-size: 50px + margin: 0px + margin-top: 10px + .ex + font-size: 18px + margin: 45px 0px + .right-content + padding: 0px 45px + form + margin: 45px 0px + padding: 30px 35px + border: 1px solid #fff + border-radius: 6px + background-color: rgba(0, 0, 0, 0.3) + color: #fff + h2 + margin: 0px 0px 20px 0px + border-bottom: 1px solid rgba(255, 255, 255, 0.5) + padding-bottom: 10px + font-size: 20px + .control-label + font-weight: 400 + .btn + width: 100% + padding: 12px + margin-top: 10px + margin-bottom: 10px + font-size: 16px diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml index 2a71dcd..bb5d888 100644 --- a/app/views/registrations/new.html.haml +++ b/app/views/registrations/new.html.haml @@ -1,16 +1,27 @@ -%h1 Registrations#new -%p Find me in app/views/registrations/new.html.haml - -- @user.errors.each do |attr, message| - .alert.alert-danger= message - -= form_for @user, url: registrations_path, method: :post do |f| - = f.label :name - = f.text_field :name - = f.label :email - = f.text_field :email - = f.label :password - = f.password_field :password - = f.label :password_confirmation - = f.password_field :password_confirmation - = f.submit +#registrations-new + .col-xs-6.left-content + %h1 #Tsubuyaki + %p.ex + このサイトは、シラバスのRails学習コースの完成形サンプルアプリです。Microsoft Azure上で運用されています。 + %p.by + 開発者: @ohataken デザイン: @keito0904 企画: @saiwaki14 + .col-xs-6.right-content + = form_for @user, url: registrations_path, method: :post do |f| + %h2 + 会員登録する + - @user.errors.each do |attr, message| + .alert.alert-danger= message + .form-group + = f.label :name, "ユーザーID: @cyllabus_jp", class: "control-label" + = f.text_field :name, class: "form-control" + .form-group + = f.label :email,"メールアドレス: hello@cyllabus.jp", class: "control-label" + = f.text_field :email, class: "form-control" + .form-group + = f.label :password, "パスワード: 6文字以上", class: "control-label" + = f.password_field :password, class: "form-control" + .form-group + = f.label :password_confirmation, "確認用パスワード: 6文字以上", class: "control-label" + = f.password_field :password_confirmation, class: "form-control" + = f.submit "登録する", class: "btn btn-primary" + .clear