Skip to content

FixTopPage #23

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

FixTopPage #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a5676d
wip
Nov 12, 2017
b1b7daf
fix
Nov 12, 2017
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
Binary file removed app/assets/images/iphone.jpg
View file
Open in desktop
Binary file not shown.
Binary file added app/assets/images/iphone.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions app/assets/stylesheets/home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

.main-content .photo{
text-align: center;
background-image: url("./iphone.jpg");
background-image: url("./iphone.png");
background-size: cover;
background-repeat: no-repeat;
width: 100%;
Expand Down Expand Up @@ -41,14 +41,20 @@
font-size: 2vw;
}

.main-content .photo .white{
background:rbga(255,255,255,0.5);
width: 100%;
height: 60vw;
}

.main-content .photo .buttons .login{
border: 2px solid white;
color: white;
background-color: #00B8F8;
background-color: #F87178;
}

.main-content .photo .buttons .no-login{
border: 2px solid #00B8F8;
color: #00B8F8;
border: 2px solid #F87178;
color: #F87178;
background-color: white;
}
15 changes: 12 additions & 3 deletions app/assets/stylesheets/top-company.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ body {

.main-content .photo{
text-align: center;
background-image: url("./iphone.jpg");
background-image: url("./iphone.png");
background-size: cover;
background-repeat: no-repeat;
width: 100%;
Expand All @@ -15,12 +15,21 @@ body {
.main-content .photo .logo{
padding: 20px 0px;
margin: 0 auto;
background-color: rgba(255, 255, 255, 0.71);
}

.main-content .photo .logo img{
width: 40vw;
}



.main-content .photo .white{
background:rbga(255,255,255,0.5);
width: 100%;
height: 60vw;
}

.main-content .photo .buttons:before{
clear: both;
display: block;
Expand All @@ -33,10 +42,10 @@ body {
}

.main-content .photo .buttons .login{
background-color: #00B8F8;
background-color: #F87178;

margin-top: 20px;

border-radius: 4px 4px 4px 4px;
padding: 2vw 0px;
color: #FFFFFF;
Expand Down
16 changes: 12 additions & 4 deletions app/assets/stylesheets/top.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ body {

.main-content .photo{
text-align: center;
background-image: url("./iphone.jpg");
background-image: url("./iphone.png");
background-size: cover;
background-repeat: no-repeat;
width: 100%;
Expand All @@ -15,12 +15,20 @@ body {
.main-content .photo .logo{
padding: 20px 0px;
margin: 0 auto;
background-color: rgba(255, 255, 255, 0.71);
}

.main-content .photo .logo img{
width: 40vw;
}


.main-content .photo .white{
background:rbga(255,255,255,0.5);
width: 100%;
height: 60vw;
}

.main-content .photo .buttons:before{
clear: both;
display: block;
Expand All @@ -29,10 +37,10 @@ body {

.main-content .photo .buttons .login,.no-login{
float: left;
background-color: #00B8F8;
background-color: #F87178;

margin-top: 20px;

border-radius: 4px 4px 4px 4px;
padding: 2vw 0px;
color: #FFFFFF;
Expand All @@ -42,7 +50,7 @@ body {
}

.company-login {
background-color: #00B8F8;
background-color: #F87178;
width: 30%;
height: 7%;
margin: 0 auto;
Expand Down
56 changes: 29 additions & 27 deletions app/views/home/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<body>



<header class="px-2 py-3">
<div class="container">
<div class="row">
Expand All @@ -33,33 +33,35 @@
</header>
<div class="main-content">
<div class="photo">
<div class="logo">
<%= image_tag("Proposta.001.png") %>
</div>
<div class="contents">
これはサンプルです。
</div>
<div class="buttons">
<div class="container">
<div class="row">
<div class="col">
</div>
<div class="col">
<a href="#">
<div class="login">
ログイン
</div>
</a>
</div>
<div class="col">
<a href="#">
<div class="no-login">
提案一覧をみる
</div>
</a>
</div>
<div class="col">
<div class="white">
<div class="logo">
<%= image_tag("Proposta.001.png") %>
</div>
<div class="contents">
これはサンプルです。
</div>
<div class="buttons">
<div class="container">
<div class="row">
<div class="col">
</div>
<div class="col">
<a href="#">
<div class="login">
ログイン
</div>
</a>
</div>
<div class="col">
<a href="#">
<div class="no-login">
提案一覧をみる
</div>
</a>
</div>
<div class="col">

</div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions client/top.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ body {

.main-content .photo{
text-align: center;
background-image: url("./iphone.jpg");
background-image: url("./iphone.png");
background-size: cover;
background-repeat: no-repeat;
width: 100%;
Expand All @@ -29,7 +29,7 @@ body {

.main-content .photo .buttons .login,.no-login{
float: left;
background-color: #00B8F8;
background-color: #F87178;
width: 30%;
height: 7%;
margin-top: 20px;
Expand Down
2 changes: 1 addition & 1 deletion public/assets/.sprockets-manifest-6906f375eb33e83c9009692f4cd9b6b2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"Proposta.001-7025fbd59205b7e852f2ffaf11a71c6a1d4c6e5f1106573b8fe7c8f8fdb6774b.png":{"logical_path":"Proposta.001.png","mtime":"2017-11-12T13:10:54+09:00","size":96350,"digest":"7025fbd59205b7e852f2ffaf11a71c6a1d4c6e5f1106573b8fe7c8f8fdb6774b","integrity":"sha256-cCX71ZIFt+hS8v+vEaccah1Mbl8RBlc7j+fI+P22d0s="},"iine-b85c4d557bd06e6ddf09043cfd9fe19140c948d0e90c3637afc2c13038b99e61.png":{"logical_path":"iine.png","mtime":"2017-11-12T13:10:54+09:00","size":6054,"digest":"b85c4d557bd06e6ddf09043cfd9fe19140c948d0e90c3637afc2c13038b99e61","integrity":"sha256-uFxNVXvQbm3fCQQ8/Z/hkUDJSNDpDDY3r8LBMDi5nmE="},"iphone-5c75914ffe5dda092cb8692ae23b0a384bf01d87ecf9374039bc32ea66da79fc.jpg":{"logical_path":"iphone.jpg","mtime":"2017-11-12T13:10:54+09:00","size":590707,"digest":"5c75914ffe5dda092cb8692ae23b0a384bf01d87ecf9374039bc32ea66da79fc","integrity":"sha256-XHWRT/5d2gksuGkq4jsKOEvwHYfs+TdAObwy6mbaefw="},"line-ed8c51d83aae2ebc670a6fdc20afa7dc93ab3205464e89d999349f49f53659c0.png":{"logical_path":"line.png","mtime":"2017-11-12T13:10:54+09:00","size":9477,"digest":"ed8c51d83aae2ebc670a6fdc20afa7dc93ab3205464e89d999349f49f53659c0","integrity":"sha256-7YxR2DquLrxnCm/cIK+n3JOrMgVGTonZmTSfSfU2WcA="},"application-136677de12a7337535a2d656cdbc328f86164cef6412f3bf0c98da56f65e0c50.js":{"logical_path":"application.js","mtime":"2017-11-12T14:00:08+09:00","size":82882,"digest":"136677de12a7337535a2d656cdbc328f86164cef6412f3bf0c98da56f65e0c50","integrity":"sha256-E2Z33hKnM3U1otZWzbwyj4YWTO9kEvO/DJjaVvZeDFA="},"application-bbab6f397afaac7d9830e103eb673cd51eda38e6501dace8c1d33cf10d490c73.css":{"logical_path":"application.css","mtime":"2017-11-12T13:25:21+09:00","size":7019,"digest":"bbab6f397afaac7d9830e103eb673cd51eda38e6501dace8c1d33cf10d490c73","integrity":"sha256-u6tvOXr6rH2YMOED62c81R7aOOZQHazowdM88Q1JDHM="},"application-35d6b8109d6ff7007abf7a1e99098f63f914f70120ec3023fae8e005ab7eae12.css":{"logical_path":"application.css","mtime":"2017-11-12T13:46:22+09:00","size":7355,"digest":"35d6b8109d6ff7007abf7a1e99098f63f914f70120ec3023fae8e005ab7eae12","integrity":"sha256-Nda4EJ1v9wB6v3oemQmPY/kU9wEg7DAj+ujgBat+rhI="},"twitter-944a487f4746a5ce6557d56ae65421e8b71eaa7fda7a0f74a1bed6b86d345567.png":{"logical_path":"twitter.png","mtime":"2017-11-12T10:02:03+09:00","size":9173,"digest":"944a487f4746a5ce6557d56ae65421e8b71eaa7fda7a0f74a1bed6b86d345567","integrity":"sha256-lEpIf0dGpc5lV9Vq5lQh6Lceqn/aeg90ob7WuG00VWc="},"application-e80efb152fe57607c0a8a7c02264ce06b4dc79a595b26e455fefcf4839137264.css":{"logical_path":"application.css","mtime":"2017-11-12T14:12:55+09:00","size":7277,"digest":"e80efb152fe57607c0a8a7c02264ce06b4dc79a595b26e455fefcf4839137264","integrity":"sha256-6A77FS/ldgfAqKfAImTOBrTceaWVsm5FX+/PSDkTcmQ="}},"assets":{"Proposta.001.png":"Proposta.001-7025fbd59205b7e852f2ffaf11a71c6a1d4c6e5f1106573b8fe7c8f8fdb6774b.png","iine.png":"iine-b85c4d557bd06e6ddf09043cfd9fe19140c948d0e90c3637afc2c13038b99e61.png","iphone.jpg":"iphone-5c75914ffe5dda092cb8692ae23b0a384bf01d87ecf9374039bc32ea66da79fc.jpg","line.png":"line-ed8c51d83aae2ebc670a6fdc20afa7dc93ab3205464e89d999349f49f53659c0.png","application.js":"application-136677de12a7337535a2d656cdbc328f86164cef6412f3bf0c98da56f65e0c50.js","application.css":"application-e80efb152fe57607c0a8a7c02264ce06b4dc79a595b26e455fefcf4839137264.css","twitter.png":"twitter-944a487f4746a5ce6557d56ae65421e8b71eaa7fda7a0f74a1bed6b86d345567.png"}}
{"files":{"Proposta.001-7025fbd59205b7e852f2ffaf11a71c6a1d4c6e5f1106573b8fe7c8f8fdb6774b.png":{"logical_path":"Proposta.001.png","mtime":"2017-11-12T15:08:24+09:00","size":96350,"digest":"7025fbd59205b7e852f2ffaf11a71c6a1d4c6e5f1106573b8fe7c8f8fdb6774b","integrity":"sha256-cCX71ZIFt+hS8v+vEaccah1Mbl8RBlc7j+fI+P22d0s="},"iine-b85c4d557bd06e6ddf09043cfd9fe19140c948d0e90c3637afc2c13038b99e61.png":{"logical_path":"iine.png","mtime":"2017-11-12T15:08:24+09:00","size":6054,"digest":"b85c4d557bd06e6ddf09043cfd9fe19140c948d0e90c3637afc2c13038b99e61","integrity":"sha256-uFxNVXvQbm3fCQQ8/Z/hkUDJSNDpDDY3r8LBMDi5nmE="},"iphone-5c75914ffe5dda092cb8692ae23b0a384bf01d87ecf9374039bc32ea66da79fc.jpg":{"logical_path":"iphone.jpg","mtime":"2017-11-12T13:10:54+09:00","size":590707,"digest":"5c75914ffe5dda092cb8692ae23b0a384bf01d87ecf9374039bc32ea66da79fc","integrity":"sha256-XHWRT/5d2gksuGkq4jsKOEvwHYfs+TdAObwy6mbaefw="},"line-ed8c51d83aae2ebc670a6fdc20afa7dc93ab3205464e89d999349f49f53659c0.png":{"logical_path":"line.png","mtime":"2017-11-12T15:08:24+09:00","size":9477,"digest":"ed8c51d83aae2ebc670a6fdc20afa7dc93ab3205464e89d999349f49f53659c0","integrity":"sha256-7YxR2DquLrxnCm/cIK+n3JOrMgVGTonZmTSfSfU2WcA="},"application-136677de12a7337535a2d656cdbc328f86164cef6412f3bf0c98da56f65e0c50.js":{"logical_path":"application.js","mtime":"2017-11-12T15:25:56+09:00","size":82882,"digest":"136677de12a7337535a2d656cdbc328f86164cef6412f3bf0c98da56f65e0c50","integrity":"sha256-E2Z33hKnM3U1otZWzbwyj4YWTO9kEvO/DJjaVvZeDFA="},"application-bbab6f397afaac7d9830e103eb673cd51eda38e6501dace8c1d33cf10d490c73.css":{"logical_path":"application.css","mtime":"2017-11-12T13:25:21+09:00","size":7019,"digest":"bbab6f397afaac7d9830e103eb673cd51eda38e6501dace8c1d33cf10d490c73","integrity":"sha256-u6tvOXr6rH2YMOED62c81R7aOOZQHazowdM88Q1JDHM="},"application-35d6b8109d6ff7007abf7a1e99098f63f914f70120ec3023fae8e005ab7eae12.css":{"logical_path":"application.css","mtime":"2017-11-12T13:46:22+09:00","size":7355,"digest":"35d6b8109d6ff7007abf7a1e99098f63f914f70120ec3023fae8e005ab7eae12","integrity":"sha256-Nda4EJ1v9wB6v3oemQmPY/kU9wEg7DAj+ujgBat+rhI="},"twitter-944a487f4746a5ce6557d56ae65421e8b71eaa7fda7a0f74a1bed6b86d345567.png":{"logical_path":"twitter.png","mtime":"2017-11-12T15:08:24+09:00","size":9173,"digest":"944a487f4746a5ce6557d56ae65421e8b71eaa7fda7a0f74a1bed6b86d345567","integrity":"sha256-lEpIf0dGpc5lV9Vq5lQh6Lceqn/aeg90ob7WuG00VWc="},"application-e80efb152fe57607c0a8a7c02264ce06b4dc79a595b26e455fefcf4839137264.css":{"logical_path":"application.css","mtime":"2017-11-12T14:12:55+09:00","size":7277,"digest":"e80efb152fe57607c0a8a7c02264ce06b4dc79a595b26e455fefcf4839137264","integrity":"sha256-6A77FS/ldgfAqKfAImTOBrTceaWVsm5FX+/PSDkTcmQ="},"iphone-ed2637ea37b4f54145e30f9d6b5e4ac5cdcbcbfc2157069e84be674935a950ea.png":{"logical_path":"iphone.png","mtime":"2017-11-12T15:22:47+09:00","size":172466,"digest":"ed2637ea37b4f54145e30f9d6b5e4ac5cdcbcbfc2157069e84be674935a950ea","integrity":"sha256-7SY36je09UFF4w+da15Kxc3Ly/whVwaehL5nSTWpUOo="},"application-68f6cf8567b72d96f247137cb34dbb942725c502c61448968cceacede243b195.css":{"logical_path":"application.css","mtime":"2017-11-12T15:24:31+09:00","size":8726,"digest":"68f6cf8567b72d96f247137cb34dbb942725c502c61448968cceacede243b195","integrity":"sha256-aPbPhWe3LZbyRxN8s027lCclxQLGFEiWjM6s7eJDsZU="},"application-23b66b97e93e8fede268a71ee8b3ebe8f5f6524c775c0d454f0e7e50e07293ba.css":{"logical_path":"application.css","mtime":"2017-11-12T15:34:50+09:00","size":9118,"digest":"23b66b97e93e8fede268a71ee8b3ebe8f5f6524c775c0d454f0e7e50e07293ba","integrity":"sha256-I7Zrl+k+j+3iaKce6LPr6PX2Ukx3XA1FTw5+UOByk7o="},"application-8d8c5d3981e28056556ccc353f98dc286a853164dbeecab67f218ba4e014a74b.css":{"logical_path":"application.css","mtime":"2017-11-12T15:36:13+09:00","size":9118,"digest":"8d8c5d3981e28056556ccc353f98dc286a853164dbeecab67f218ba4e014a74b","integrity":"sha256-jYxdOYHigFZVbMw1P5jcKGqFMWTb7sq2fyGLpOAUp0s="},"application-510fc52d047f1e2db50dd9c61052feb5c4fac4b255a224f23d1a82cabd4cfe2b.css":{"logical_path":"application.css","mtime":"2017-11-12T15:37:10+09:00","size":9118,"digest":"510fc52d047f1e2db50dd9c61052feb5c4fac4b255a224f23d1a82cabd4cfe2b","integrity":"sha256-UQ/FLQR/Hi21DdnGEFL+tcT6xLJVoiTyPRqCyr1M/is="},"application-38418725d62adde1ed69a3f80fedf0dec17b2803f4ba45cee71cfe9c2c67135b.css":{"logical_path":"application.css","mtime":"2017-11-12T15:37:46+09:00","size":9119,"digest":"38418725d62adde1ed69a3f80fedf0dec17b2803f4ba45cee71cfe9c2c67135b","integrity":"sha256-OEGHJdYq3eHtaaP4D+3w3sF7KAP0ukXO5xz+nCxnE1s="},"application-7cb18e47af6fe72b37d2eb0bea249c28c43699cd1073c4d4b03bd21f14326366.css":{"logical_path":"application.css","mtime":"2017-11-12T15:47:07+09:00","size":9213,"digest":"7cb18e47af6fe72b37d2eb0bea249c28c43699cd1073c4d4b03bd21f14326366","integrity":"sha256-fLGOR69v5ys30usL6iScKMQ2mc0Qc8TUsDvSHxQyY2Y="}},"assets":{"Proposta.001.png":"Proposta.001-7025fbd59205b7e852f2ffaf11a71c6a1d4c6e5f1106573b8fe7c8f8fdb6774b.png","iine.png":"iine-b85c4d557bd06e6ddf09043cfd9fe19140c948d0e90c3637afc2c13038b99e61.png","iphone.jpg":"iphone-5c75914ffe5dda092cb8692ae23b0a384bf01d87ecf9374039bc32ea66da79fc.jpg","line.png":"line-ed8c51d83aae2ebc670a6fdc20afa7dc93ab3205464e89d999349f49f53659c0.png","application.js":"application-136677de12a7337535a2d656cdbc328f86164cef6412f3bf0c98da56f65e0c50.js","application.css":"application-7cb18e47af6fe72b37d2eb0bea249c28c43699cd1073c4d4b03bd21f14326366.css","twitter.png":"twitter-944a487f4746a5ce6557d56ae65421e8b71eaa7fda7a0f74a1bed6b86d345567.png","iphone.png":"iphone-ed2637ea37b4f54145e30f9d6b5e4ac5cdcbcbfc2157069e84be674935a950ea.png"}}
Loading