Merge pull request #131 from enpitut2017/feature/edit_layout

top
enpitut2017 · Aug 8, 2017 · d1a0778 · d1a0778
2 parents e216303 + 6da2638
commit d1a0778
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 41 deletions.
diff --git a/app/assets/images/top_sotaichan_clear.png b/app/assets/images/top_sotaichan_clear.png
diff --git a/app/assets/images/top_sotaichan_le.png b/app/assets/images/top_sotaichan_le.png
diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss
@@ -35,7 +35,8 @@ header{
   text-align: center;
 }
 .button_settings{
-  background-color: rgba(255,236,210,0.5);
+  background-color: rgba(255,236,210,1);
+  border: 1px solid #999;
 }
 
 .border_test{
@@ -71,7 +72,7 @@ footer p{
 /* users/show */
 #zandaka{
   background-color: rgba(255,255,255,0.5);
-  border-radius: 10px;
+  border-radius: 2px;
   padding-bottom: 15px;
   box-shadow: 0 5px 10px 0vw rgba(0,0,0,0.3);
   margin-top: 10px;
@@ -95,15 +96,15 @@ footer p{
 }
 #recent{
   background-color: rgba(255,255,255,0.5);
-  border-radius: 10px;
+  border-radius: 2px;
   padding-bottom: 15px;
   box-shadow: 0 5px 10px 0vw rgba(0,0,0,0.3);
   margin-top: 10px;
   margin-bottom: 10px;
 }
 #chara{
   background-color: rgba(255,255,255,0.5);
-  border-radius: 10px;
+  border-radius: 2px;
   padding-bottom: 15px;
   box-shadow: 0 5px 10px 0vw rgba(0,0,0,0.3);
   margin-top: 10px;
@@ -153,40 +154,40 @@ footer p{
   border-radius: 8px;
 }
 .jumbo {
-  background-image: url("top_sotaichan_m.png");
   background-position: center;
   background-size: cover;
   background-color: #fff;
-  border: 3px solid #FC0C60;
   box-shadow: 0 0.5vw 1vw 0vw rgba(0,0,0,0.3);
 }
-/*@media only screen and (min-width: 640px) {
-  .jumbo {
-    background-image: url("top_sotaichan_sm.png");
-  }
-}
-@media only screen and (max-width: 640px) {
-  .jumbo {
-    background-image: url("top_sotaichan.png");
-  }
-}*/
-.logo img{
-  width: 320px;
-  margin: 10px;
+.logo_img{
+  width: 380px;
+  margin-top: 120px;
+  padding: 20px;
 }
 .logo_text {
-  margin: 10px;
-  padding: 30px;
+  margin: 40px 10px 10px 10px;
+  font-size: 40px;
+  color: #222;
+  text-align: center;
   font-family: "Rounded Mplus 1c";
-  font-size: 20px;
-  color: #444;
-  border-radius: 10px;
-  background-color: rgba(255,255,255,0.7);
-  box-shadow: 0 0.5vw 1vw 0vw rgba(0,0,0,0.3);
 }
-.btn-default{
-  margin: 10px;
-  box-shadow: 0 0.5vw 1vw 0vw rgba(0,0,0,0.3);
+.btn-signup{
+  text-align: center;
+  margin-top: 30px;
+}
+.logo{
+  text-align: center;
+}
+.top_box{
+  height: 800px;
+}
+#top_girl{
+  display: block;
+  position: fixed;
+  width: 25vw;
+  height: 12vw;
+  right: 10vw;
+  bottom: 18vw;
 }
 
 /*books*/

diff --git a/app/views/static_page/index.html.erb b/app/views/static_page/index.html.erb
@@ -1,14 +1,8 @@
-<div class="col-md-12" id="top_image">
-<div class="jumbotron jumbo">
-	<div class="logo"><img src="assets/logo.png" arc="logo" class="img-responsive"></div>
-  <p class="logo_text"><strong>自分の残高を知りたい！既存の家計簿アプリの"続けられない"、"入力が面倒くさい"という問題を解決したい！ お金の管理が苦手な人のための家計簿アプリ家計学園です。 家計学園は通常の手入力に加えて、音声入力で簡単に買い物の記録をすることができます。また、残高などをゲーム的に管理することで継続的に家計簿を記録する事ができます。</strong></p>
-  <p><%= link_to '新規登録', signup_path, {:class => "btn btn-default btn-lg"} %></p>
+<div class="col-sm-12 top_box">
+	<p class="logo"><img src="assets/logo.png" arc="logo" class="logo_img"></p>
+	<h2 class="logo_text">まいにち続けるカンタン家計簿<h2>
+	<p class="btn-signup"><%= link_to 'アカウントを作成', signup_path, {:class => "btn btn-default btn-lg"} %></p>
 </div>
-	<div class="row">
-		<div class="col-sm-6">
-		</div>
-		<div class="col-sm-6">
-			<p></p>
-		</div>
-	</div>
+<div id="top_girl">
+	<img src="assets/top_sotaichan_clear.png" class="img-responsive">
 </div>