From 03087f3a3e45c86005b4c9abcf080aab6d1b620f Mon Sep 17 00:00:00 2001 From: yuma Date: Tue, 2 Oct 2018 17:37:06 +0900 Subject: [PATCH 01/22] Create login_for_mobile page --- app/assets/stylesheets/users.scss | 14 ++++++++++++++ app/views/users/_user.html.erb | 2 +- app/views/users/login_smart_phone.html.erb | 19 +++++++++++++++++++ app/views/users/new_smart_phone.html.erb | 8 ++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/views/users/login_smart_phone.html.erb create mode 100644 app/views/users/new_smart_phone.html.erb diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss index 38913b47..11c2b0ff 100644 --- a/app/assets/stylesheets/users.scss +++ b/app/assets/stylesheets/users.scss @@ -26,3 +26,17 @@ background-color: #00BABD; } } + + .mobile{ + input[type="text"] { + width: 500px; + height: 100px; + } + + input[type="password"] { + width: 500px; + height: 100px; + } + font-size: 25px; + white-space: nowrap; + } diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb index d1338ad4..a3f44365 100644 --- a/app/views/users/_user.html.erb +++ b/app/views/users/_user.html.erb @@ -13,7 +13,7 @@ <% if user == current_user %>
  • <%= link_to edit_user_path(id: user) do %> -

    +

    編集

    <% end %>
    • diff --git a/app/views/users/login_smart_phone.html.erb b/app/views/users/login_smart_phone.html.erb new file mode 100644 index 00000000..8158e95a --- /dev/null +++ b/app/views/users/login_smart_phone.html.erb @@ -0,0 +1,19 @@ +
    +
    +

    ログイン(スマホからのアクセス)

    +
    + <%= form_for(@user, url: login_path) do |f| %> + + <%= f.label :name, 'ユーザー名' %>
    + <%= f.text_field :name, class: 'form-control', placeholder: 'ユーザー名を入力' %>
    + <%= f.label :password, 'パスワード' %> + <%= f.password_field :password , class: 'form-control', placeholder: 'パスワードを入力'%>
    + + <%= f.submit 'ログイン', class: 'btn btn-default btn-lg', style: "background-color: #00BABD; color: white;" %> + <% end %> +
    +
    +
    diff --git a/app/views/users/new_smart_phone.html.erb b/app/views/users/new_smart_phone.html.erb new file mode 100644 index 00000000..177b4b5d --- /dev/null +++ b/app/views/users/new_smart_phone.html.erb @@ -0,0 +1,8 @@ +
    +
    +

    アカウント作成（スマホからアクセス）

    +
    + <%= render partial: 'form_field', locals: { user: @user, password: true } %> +
    +
    +
    From 85438f83270d47804e4c630c090b80e8f50e4550 Mon Sep 17 00:00:00 2001 From: yuma Date: Fri, 5 Oct 2018 15:49:09 +0900 Subject: [PATCH 02/22] Modified login_for_mobile_page --- app/assets/stylesheets/users.scss | 28 +++++++++++++--------- app/views/users/_form_field.html.erb | 2 +- app/views/users/login_smart_phone.html.erb | 26 ++++++++++---------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss index 11c2b0ff..f158073c 100644 --- a/app/assets/stylesheets/users.scss +++ b/app/assets/stylesheets/users.scss @@ -26,17 +26,23 @@ background-color: #00BABD; } } - .mobile{ - input[type="text"] { - width: 500px; - height: 100px; - } + input[type="text"] { + width: 500px; + height: 80px; + } - input[type="password"] { - width: 500px; - height: 100px; - } - font-size: 25px; - white-space: nowrap; + input[type="password"] { + width: 500px; + height: 80px; + } + font-size: 25px; + white-space: nowrap; + .btn { + padding: 14px 24px; + border: 0 none; + font-weight: 700; + letter-spacing: 1px; + text-transform: uppercase; } +} diff --git a/app/views/users/_form_field.html.erb b/app/views/users/_form_field.html.erb index 4eec030e..1282f788 100644 --- a/app/views/users/_form_field.html.erb +++ b/app/views/users/_form_field.html.erb @@ -22,7 +22,7 @@ <%= f.label :password_confirmation, 'パスワード（確認用）' %> <%= f.password_field :password_confirmation, class: 'form-control', placeholder: 'パスワードを入力' %>
    <% end %> - <%= f.submit class: 'btn btn-default', style: "background-color: #00BABD; color: white;"%> + <%= f.submit class: 'btn btn-default btn-lg', style: "background-color: #00BABD; color: white; width: 500px; height: 80px; font-size: 40px;"%> <% end %> diff --git a/app/views/users/login_smart_phone.html.erb b/app/views/users/login_smart_phone.html.erb index 8158e95a..7f644370 100644 --- a/app/views/users/login_smart_phone.html.erb +++ b/app/views/users/login_smart_phone.html.erb @@ -1,19 +1,19 @@

    ログイン(スマホからのアクセス)

    -
    - <%= form_for(@user, url: login_path) do |f| %> - - <%= f.label :name, 'ユーザー名' %>
    - <%= f.text_field :name, class: 'form-control', placeholder: 'ユーザー名を入力' %>
    - <%= f.label :password, 'パスワード' %> - <%= f.password_field :password , class: 'form-control', placeholder: 'パスワードを入力'%>
    +
    + <%= form_for(@user, url: login_path) do |f| %> + + <%= f.label :name, 'ユーザー名' %>
    + <%= f.text_field :name, class: 'form-control', placeholder: 'ユーザー名を入力' %>
    + <%= f.label :password, 'パスワード' %> + <%= f.password_field :password , class: 'form-control', placeholder: 'パスワードを入力'%>
    - <%= f.submit 'ログイン', class: 'btn btn-default btn-lg', style: "background-color: #00BABD; color: white;" %> - <% end %> -
    + <%= f.submit 'ログイン', class: 'btn btn-default btn-lg', style: "background-color: #00BABD; color: white; width: 500px; height: 80px; font-size: 40px;" %> + <% end %> +
    From 37c49b61a99516750f1362c72519944a65ac71a5 Mon Sep 17 00:00:00 2001 From: yuma Date: Fri, 5 Oct 2018 16:05:28 +0900 Subject: [PATCH 03/22] Modified login and new_resist page --- app/views/users/login_smart_phone.html.erb | 2 +- app/views/users/new_smart_phone.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/login_smart_phone.html.erb b/app/views/users/login_smart_phone.html.erb index 7f644370..3440d281 100644 --- a/app/views/users/login_smart_phone.html.erb +++ b/app/views/users/login_smart_phone.html.erb @@ -1,6 +1,6 @@
    -

    ログイン(スマホからのアクセス)

    +

    ログイン

    <%= form_for(@user, url: login_path) do |f| %>
    -
    +
    -
    +
    - - <% flash.each do |type, msg| %>
    × From f7d17c90701db0b50fbbda5b11ed38f343eea28a Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Tue, 9 Oct 2018 06:38:34 +0000 Subject: [PATCH 08/22] File --- app/assets/stylesheets/.home.scss.swp | Bin 28672 -> 0 bytes app/views/layouts/._header.html.erb.swp | Bin 12288 -> 12288 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/stylesheets/.home.scss.swp diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp deleted file mode 100644 index 205c1d6bc1eb095717ebbe9fab40214b8b532b7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 kxMJq|ZX&*=x&OtO+HIis1Vr|mXxC7}L delta 1082 zcmZojXh@JsG6?hZRWR2xVE_UF28O!G-O+2D7#P}lH%eVnNJ?X4U`Pex1R%BnVkIDE z0^&2Q3=9W>xEhEZfLINPud^^P%md<5AT|Nw{mcvu4M3a^#3n%ejfsKb84%wA;>$pM z28gdRZCqH*I5}U9z1{{3P*uPph$5t_kP77k)xr^q61Y4}C59|WUp-7ahAcJ#RcwM# zF}N#W44n4DG}r)*!|H#yEkL6P0AN7mr2s5mbz(Kvkh05qc1JBdI_HGLj%N zlb`~S!(bXvGf S6t7d&z Date: Tue, 9 Oct 2018 08:36:21 +0000 Subject: [PATCH 09/22] Remake header --- app/assets/stylesheets/.home.scss.swp | Bin 0 -> 32768 bytes app/assets/stylesheets/home.scss | 434 +++++++++++++++++------- app/views/layouts/._header.html.erb.swp | Bin 12288 -> 12288 bytes app/views/layouts/_header.html.erb | 50 +-- 4 files changed, 338 insertions(+), 146 deletions(-) create mode 100644 app/assets/stylesheets/.home.scss.swp diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp new file mode 100644 index 0000000000000000000000000000000000000000..9260aa4e014e94efff26dcdd589e48f460ac770d GIT binary patch literal 32768 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 TBa5?f!QG8e6C}LPK*jpM8iq_N literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 63bae1fe..83ca0a4f 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -226,7 +226,7 @@ html { } @media(min-width:1200px){ - .hamburger{ + .full_menu{ display:none; } } @@ -239,151 +239,343 @@ html { .header{ height: 125px; - .header-brand a{ - line-height: 125px; - width:350px; - text-align: center; + .header-brand{ + display: none; + } + .header-list{ + height: 125px; + div{ + a{ + height: 125px; + line-height: 125px; + font-size: 35px; + padding-left: 25px; + padding-right: 25px; + } + } } } - - .header-list div{ + + .header-list .inv{ display: none; } - - #nav-drawer { - position: relative; + + .header-list{ + height: 125px; + div{ + a{ + height: 125px; + }} } - /*チェックボックス等は非表示に*/ - .nav-unshown { - display:none; + .full_menu{ + * { + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + a, a:visited,a:hover,a:active { + text-decoration: none; + color: inherit; + } + .cp_fullscreenmenu { + position: fixed; + z-index: 1; + top: 0; + left: 0; + } +/*menuコンテンツ*/ + .cp_fullscreenmenu .menu { + position: fixed; + top: 0; + left: 0; + display: flex; + visibility: hidden; + overflow: hidden; + width: 100%; + height: 100%; + pointer-events: none; + outline: 1px solid transparent; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + align-items: center; + justify-content: center; + } + .cp_fullscreenmenu .menu > div { + display: flex; + overflow: hidden; + width: 200vw; + height: 200vw; + transition: all 0.4s ease; + -webkit-transform: scale(0); + transform: scale(0); + text-align: center; + color: #fefefe; + border-radius: 50%; + background: #006e6f; + flex: none; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + align-items: center; + justify-content: center; + } + .cp_fullscreenmenu .menu > div > ul { + display: block; + max-height: 100vh; + margin: 0; + padding: 0 1em; + list-style: none; + transition: opacity 0.4s ease; + opacity: 0; + } + .cp_fullscreenmenu .menu > div > ul > li { + font-size: 50px; + display: block; + margin: 1em; + padding: 0; + } + .cp_fullscreenmenu .menu > div > ul > li > a { + position: relative; + display: inline; + cursor: pointer; + transition: color 0.4s ease; + } + .cp_fullscreenmenu .menu > div > ul > li > a:hover { + color: #e5e5e5; + } + .cp_fullscreenmenu .menu > div > ul > li > a:hover:after { + width: 100%; + } + .cp_fullscreenmenu .menu > div > ul > li > a:after { + position: absolute; + z-index: 1; + bottom: -0.15em; + left: 0; + width: 0; + height: 2px; + content: ''; + transition: width 0.4s ease; + background: #e5e5e5; + } + /*クリックしたらメニューが開閉の動作*/ + .cp_fullscreenmenu .toggle { + position: absolute; + z-index: 2; + top: 0; + left: 0; + width: 125px; + height: 125px; + cursor: pointer; + opacity: 0; + } + .cp_fullscreenmenu .toggle:checked + .hamburger > span { + -webkit-transform: rotate(135deg); + transform: rotate(135deg); + } + .cp_fullscreenmenu .toggle:checked + .hamburger > span:before, .cp_fullscreenmenu .toggle:checked + .hamburger > span:after { + top: 0; + -webkit-transform: rotate(90deg); + transform: rotate(90deg); + } + .cp_fullscreenmenu .toggle:checked + .hamburger > span:after { + opacity: 0; + } + .cp_fullscreenmenu .toggle:checked ~ .menu { + visibility: visible; + pointer-events: auto; + } + .cp_fullscreenmenu .toggle:checked ~ .menu > div { + transition-duration: 0.75s; + -webkit-transform: scale(1); + transform: scale(1); + } + .cp_fullscreenmenu .toggle:checked ~ .menu > div > ul { + opacity: 1; + } + .cp_fullscreenmenu .toggle:hover + .hamburger { + box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.1); + } + .cp_fullscreenmenu .toggle:checked:hover + .hamburger > span { + -webkit-transform: rotate(225deg); + transform: rotate(225deg); + } + /*ハンバーガー*/ + .cp_fullscreenmenu .hamburger { + position: absolute; + z-index: 1; + top: 0; + left: 0; + display: block; + width: 125px; + height: 125px; + padding: 0.5em 1em; + cursor: pointer; + transition: box-shadow 0.4s ease; + border-radius: 0 0.12em 0.12em 0; + background: #006e6f; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + } + .cp_fullscreenmenu .hamburger > span { + position: relative; + top: 50%; + display: block; + width: 100%; + height: 2px; + transition: all 0.4s ease; + background: #fefefe; + } + .cp_fullscreenmenu .hamburger > span:before, + .cp_fullscreenmenu .hamburger > span:after { + position: absolute; + z-index: 1; + top: -10px; + left: 0; + display: block; + width: 100%; + height: 2px; + content: ''; + transition: all 0.4s ease; + background: inherit; + } + .cp_fullscreenmenu .hamburger > span:after { + top: 10px; + } } - /*アイコンのスペース*/ - #nav-open { - display: inline-block; - width: 50px; - height: 50px; - vertical-align: middle; - float: right; - width: 125px; - margin-top: 45px; - } +#nav-drawer { +position: relative; +} - /*ハンバーガーアイコンをCSSだけで表現*/ - #nav-open span, #nav-open span:before, #nav-open span:after { - position: absolute; - height: 5px;/*線の太さ*/ - width: 50px;/*長さ*/ - border-radius: 3px; - background: #fff; - display: block; - content: ''; - cursor: pointer; - } - #nav-open span:before { - bottom: -16px; - } - #nav-open span:after { - bottom: -32px; - } +/*チェックボックス等は非表示に*/ +.nav-unshown { +display:none; +} - /*閉じる用の薄黒カバー*/ - #nav-close { - display: none;/*はじめは隠しておく*/ - position: fixed; - z-index: 99; - top: 0;/*全体に広がるように*/ - left: 0; - width: 100%; - height: 100%; - background: black; - opacity: 0; - transition: .3s ease-in-out; - } +/*アイコンのスペース*/ +#nav-open { +display: inline-block; +width: 50px; +height: 50px; + vertical-align: middle; +float: right; +width: 125px; + margin-top: 45px; +} - /*中身*/ - #nav-content { - overflow: auto; - position: fixed; - top: 0; - left: 0; - z-index: 9999;/*最前面に*/ - width: 90%;/*右側に隙間を作る（閉じるカバーを表示）*/ - max-width: 380px;/*最大幅（調整してください）*/ - height: 100%; - background: #006E6F;/*背景色*/ - transition: .3s ease-in-out;/*滑らかに表示*/ - -webkit-transform: translateX(400%); - transform: translateX(400%);/*左に隠しておく*/ - } +/*ハンバーガーアイコンをCSSだけで表現*/ +#nav-open span, #nav-open span:before, #nav-open span:after { +position: absolute; +height: 5px;/*線の太さ*/ +width: 50px;/*長さ*/ + border-radius: 3px; +background: #fff; +display: block; +content: ''; +cursor: pointer; +} +#nav-open span:before { +bottom: -16px; +} +#nav-open span:after { +bottom: -32px; +} - /*チェックが入ったらもろもろ表示*/ - #nav-input:checked ~ #nav-close { - display: block;/*カバーを表示*/ - opacity: .5; - } +/*閉じる用の薄黒カバー*/ +#nav-close { +display: none;/*はじめは隠しておく*/ +position: fixed; + z-index: 99; +top: 0;/*全体に広がるように*/ +left: 0; +width: 100%; +height: 100%; +background: black; +opacity: 0; +transition: .3s ease-in-out; +} - #nav-input:checked ~ #nav-content { - -webkit-transform: translateX(100vw); - transform: translateX(65vw);/*中身を表示（右へスライド）*/ - box-shadow: 6px 0 25px rgba(0,0,0,.15); - } +/*中身*/ +#nav-content { +overflow: auto; +position: fixed; +top: 0; +left: 0; + z-index: 9999;/*最前面に*/ +width: 90%;/*右側に隙間を作る（閉じるカバーを表示）*/ + max-width: 380px;/*最大幅（調整してください）*/ +height: 100%; +background: #006E6F;/*背景色*/ +transition: .3s ease-in-out;/*滑らかに表示*/ + -webkit-transform: translateX(400%); +transform: translateX(400%);/*左に隠しておく*/ +} - #nav-content{ - ul{ - padding-left: 0; - margin-left: 0; - } - div{ - list-style: none; - a{ - display:block; - text-decoration: none; - color: white; - height: 80px; - line-height: 80px; - padding-left: 15px; - border-bottom: thin solid #fff; - font-size: 40px; - } - a:hover{ - transition:all 0.5s; - background-color: #5f9ea0; - } - } - } +/*チェックが入ったらもろもろ表示*/ +#nav-input:checked ~ #nav-close { +display: block;/*カバーを表示*/ +opacity: .5; +} + +#nav-input:checked ~ #nav-content { + -webkit-transform: translateX(100vw); +transform: translateX(65vw);/*中身を表示（右へスライド）*/ + box-shadow: 6px 0 25px rgba(0,0,0,.15); +} + +#nav-content{ + ul{ + padding-left: 0; + margin-left: 0; + } + div{ + list-style: none; + a{ +display:block; + text-decoration: none; +color: white; +height: 80px; + line-height: 80px; + padding-left: 15px; + border-bottom: thin solid #fff; + font-size: 40px; + } +a:hover{ +transition:all 0.5s; + background-color: #5f9ea0; + } + } +} } /************* フッター ********************/ .footer { - text-align: right; - border-top: solid 2px #eaeaea; - color: #777; - margin-left: 15px; - a { - color: red; - &:hover { - color: blue; - } - } - ul { - float: right; - list-style: none; - li { - float: left - } - } + text-align: right; + border-top: solid 2px #eaeaea; +color: #777; + margin-left: 15px; + a { +color: red; + &:hover { +color: blue; + } + } + ul { +float: right; + list-style: none; + li { +float: left + } + } } /************* パーシャル ********************/ .detail { - font-size: 28px; - word-wrap: break-word; + font-size: 28px; + word-wrap: break-word; } .list { - font-size: 16px; + font-size: 16px; } diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp index 0b42d119f6a43bd942d1510a9823f9e51a6b10e9..5fd7a9e8ae1a1bc477a1701126775a9732f9aa6a 100644 GIT binary patch delta 933 zcmZ|LO=uHA6bJBEN!q5ZQ4b~<8lWY^tnlvXdBZ9Vw`1rMTv&~}qdK5(;%`6v~H z^iai<2j`>*PYPZ{iq{?lQ9)D`5k0Bk#Sawfp*<=7chjUH>aag%=Djy>XLo6SX+Dxp zo;o(e4kacCV<*w?-0IocgG5h)E0M2b{(*j?4H00m=I0>MGblk4er_ka1ZUv&2+=Z} zhjDl}O!OF5;1*nlSvUYb_%THE3EskWSb#CO7eEbs8zg!KSK%n=gLH%>EJEOi^#P(U z@E+d43wRE9;W+GpA?Sk*e8M_Bg601EeZIqfQ63*?8b*|HCc((OGy~T>O^^tGmR-SU3`37>1rLE|}!4-Ce^riHX~> zn2#BDQM`=lVY`S>&p_^)77|)KG~AUIAJoxyC$}K^zq4XBp4*1@r{#n@U6Ci<>46++ zy_G4`ey^?IiZrs>5w}Cl4JFZZQ|;Hd_x09B`#anP%h*<}mXb=`X-Hl{ceG%Y(v51K zS0&S^RV>Fe^v$W$qv%u`^>&wfIiI(=#OfC+JSAoJ7kK7ey1Xbcee1_`_s>-3at+(A zWvZMz?iIw^zTE*gH0SMhsB7Y+8WBNl(wm>g^I}R1h$(rmD99yoLiNQ>!(xRh&*2*^ uCu`YOwO-SUPL?l9=1eF|90%~9u)F@rU1blUCOFNZadr3YA}&IWCLKh{KnMaU!I|BsyEx7)GdpUh zH9-nG#ZTzmp+g`-tcQZS2N86r2m-rz3B#jN-<{q3+k?-{yg$F+Z{B1?LFag8R z2XQ#KK=cKkz%=}6Bie%x@DL7LuZlPq`!91rbZ}O5^Gq_q zUh-1oJHor@XGIquCKq@vHN>wIDsQJ|Fm?kj@|GCqSBZ9hJP->96*wb$xjLY5CLOKR zM)X>(U@Ca%`QnOF%#W(Jv69L;c3IkG_0$5(Fr}sBEW`8at9;ulIIFgL9A-J5RFwtC ztuH9rB_B!jbP#%+4E6PTwtoekl0=?!fnLe55#D&6$$}(7fur*Ea!UDrNsg+yg3K+M z&YJq4Kh{rd?9{&VuCXfJquF4tvEhQTZ2In^botrfK97k`TuJR3Quywu9wsAAJT9)G O6UEt^c*h#2{qZkPvA)g# diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 3f28abd7..d78bf3fa 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -4,43 +4,43 @@
    Hello Idea
    -
    <%= link_to 'HelloIdeaとは', "/detail" %>
    +
    <%= link_to 'HelloIdeaとは', "/detail" %>
    <% if logged_in? %> -
    <%= link_to current_user.name, user_path(id: current_user) %>
    +
    <%= link_to current_user.name, user_path(id: current_user) %>
    <%= link_to 'ニーズ', topics_path %>
    + <% if current_user.admin? %>
    <%= link_to 'ユーザーリスト', users_path %>
    <% end %>
    <%= show_notice_link %>
    -
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    -
    <%= link_to 'ログアウト', logout_path %>
    +
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    +
    <%= link_to 'ログアウト', logout_path %>
    <% else %>
    <%= link_to 'ログイン', login_path %>
    <%= link_to '新規登録', new_user_path %>
    <% end %>
    -
    -
    From 67cc7ec91b9a3c78277704171e7e896ba7d38cf0 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Tue, 9 Oct 2018 08:41:27 +0000 Subject: [PATCH 10/22] Comment --- app/assets/stylesheets/.home.scss.swp | Bin 32768 -> 32768 bytes app/assets/stylesheets/home.scss | 117 ++------------------------ 2 files changed, 7 insertions(+), 110 deletions(-) diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp index 9260aa4e014e94efff26dcdd589e48f460ac770d..2dd26de6ec92b8a33fe1e0e2042a153220e48d57 100644 GIT binary patch delta 3379 zcma*qZEO@p7{KxA_2sTFSFiFGH711*(q0w#U=&+yEeRTwlAo z%ri63%=VILSC_A=%QvHS!4pdx%I}?bx8Mp1F%%tn`pCyKYC<{N)D@w+oZ>`(XhWS+ zaFY_88; zlnO<(PVt+HYA?(EtY{$!pp$)BAj-{x^985<6CjCMrF@g`VAMc_EQAE(1xV++(d}U4g zifaY^p02Zfx-`Yxtr78dmyk8onbr1q**7!4K2mmsbp~1Xil9EO|4`8K(q@*`wk&y! zuQvyE&adTai_k;OC73;#%(-5Bg*L6x&yj*mNlsE-uB?yf5AJt!HjjcmE$1v|r*v3$ zK-T)rKH5%ed1g|xG#bV15wl|Sg=Pk^jj3p_$6A%{Z>=-SauoeaFDV_K`Sflvdg`xD zA5$@hHb>5k#BA~%W&T>sU`vcqbnEW1X6usm^=G~z*#qlIm_um^-SBV5GfA^S=4#~Y z`TmV|`|9kKF1gAo$ENY<475~u&2I^D_ST=x0CMvBm66tztz~0W%lz6XY_Gn6^fI)q zHiA7ryb{psUAvLLT!Ll(Oqjm5>}(xdX?v8>n#?fnC3EAnW^MlLnP{WZUavpt)me?! zxomk^8`5P0(%&i9^~*SYe`F+Iz{uJfQ7$j7#ruU@)6%-8XLS9Pc`A-Y+5=_8jW2yu zoH0f(EgfyCG8twv7h~*hyj{+3ZiYFG+pPN9{>R-uoHnUBu)RQ=8d>#GVar<1Eu1@& zYGHGgBF|$-u?xmoOvEU!L_OqD>}LGM@#-87U^^mMj72EJpB$s)(Q6!IIDj`0M-&U; z$FH24F5*jkRxH9|h(bR)5yQink4j8&l)8e;NG6iazM{m>&z0q=Cz?tUe?K3{38px^ z&C2D*sdbxL)^VG1iZkaS?89yhVi)9@^))o%0aRlquCuljk~oD!7(^dBu^CU|KFq;% z!Y{4ol!ac~v_ey~fr*RC!7{FF^U^N~>J$$&3&%Xlr1Pd@5Q+Yysi*dY# zm#_&-5Jo8i80V!QMlaSOhWRMCo!hM3{ymq}@@T1gHX2CWwIP(3c<_a}{*qMpo>cdn fsqTHL?vcd0&e|Nc;SRsrSXrbVSEi|_m4*KSv*H6j delta 3209 zcmZ|Re{dA#8Nl&3Awa_q4b@Cj5V}lMV#pFfDu+AVkig+Acz#NZ3slAI%B8I^oMQzM@*GjLUJ>;l(9dD&e-qnUSb&N zF`vtE_wIY|^SsYK_qMeawzUmI}1cUe( zJqX}&)M5@M+#!K<4<@Gzr<_Uk9|lXiU>5U!ZOT&z~80`@oQW_7QNVmZBWsG z0G`4sd<*kYj+xVvLi}T@5U(SMA7C*i;?fi*!x0=t1Zz-%S@=52@b_XNeuH*AiSJ=O zR^TDHF$c3yiUR!iD?)sR4>$7kEA*omFF?bO@FX6C7x$nHrML?-P=Y_Rb%XdL-oZia zK?|B7XD_cyO*F1n-Dy0%;qa8LqIj#2B>wDKGbgD><#0^ZRW0n1Lm|msT^sWX*%Q>7 zm1wIdW@vFh3+t|!x<&Cwi`tFSP+6TPC&Rjr? zS_!a{7?O46`xSMy&4~xRHI-M+o*FrK(oF9edG+{k&$(*@+lM-{X6me&?l&{9ndu%g z({XK}qq0U6yAn!$qpG`ZJ7Kb7f!l3O>8w@_N8-B27gT(WieGw08XtmW$Dl=IpQ>;6 zNY%AoF`7Kd$zDyRnLcS|UNAEQV=H3?_9VBTIh5353KMf>CS|6NnVF24K5eFU4z>51 zsUv3UpqcJ4(`hrk%XxOfWm3|4+kh$-x!w0!85-(4YNk%+_8&4+FPSM`KWC;ot$eTv z(pXN6S7K9~B6afXTk^39{QNyhKtYG0v?lZ?Nv%K*%azIj(E@ zy2)3$y^~I9j@zRDlSeUDO58BxvsWJ?m4>=K?9?5OR*na%VTL!BcI+vkL z?1;9TscrW9ti2r)G7-J!2VlA|7p8u7wX;UCEw7izqa(h)fR*=t`6<@C7g4@}jZdW0EuEdE@z_l@D*M%Vj9Rn4HD5lpRv4Z;wWAd>odNl;=ZF zJYm=KZZmbvx{o^Fc5;|salX&md%wu;@%i;GusWt!P=zwBK5BJ*S}t{|t3Em8l0#}k z*dsNmet(G0J$l>OQI3V2w0|JR8kicke?Ia_{4zYdHKh+*4K=wJDt~{MP@DrzrI5jM`8rQ#5T4pc7AC(h! zy$IRQiGh^9Ai`a$)WUR(wSf`)K_=E#YAG+~lticM*#sqxMA!QI3 z(T6UyB94b~7yiRpWf&jg{i&i-{FE05@Ej6Y4=-v_gwI*(XV!AFgBuH{7^gN(Gk&X1 z$_{OsT2x3MITQbeFZLc^H4Zk+J%bY1z8Oy_1WYlyE#7cxGuq!B#_So@rc6*8LB(tI2-= diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 83ca0a4f..9bc99800 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -263,9 +263,10 @@ html { .header-list{ height: 125px; div{ - a{ - height: 125px; - }} + a{ + height: 125px; + } + } } .full_menu{ @@ -283,7 +284,7 @@ html { top: 0; left: 0; } -/*menuコンテンツ*/ +/*メニューコンテンツ*/ .cp_fullscreenmenu .menu { position: fixed; top: 0; @@ -356,7 +357,7 @@ html { transition: width 0.4s ease; background: #e5e5e5; } - /*クリックしたらメニューが開閉の動作*/ + /*クリックしたらメニューが開閉*/ .cp_fullscreenmenu .toggle { position: absolute; z-index: 2; @@ -398,7 +399,7 @@ html { -webkit-transform: rotate(225deg); transform: rotate(225deg); } - /*ハンバーガー*/ + /*ハンバーガーアイコン*/ .cp_fullscreenmenu .hamburger { position: absolute; z-index: 1; @@ -441,110 +442,6 @@ html { top: 10px; } } - -#nav-drawer { -position: relative; -} - -/*チェックボックス等は非表示に*/ -.nav-unshown { -display:none; -} - -/*アイコンのスペース*/ -#nav-open { -display: inline-block; -width: 50px; -height: 50px; - vertical-align: middle; -float: right; -width: 125px; - margin-top: 45px; -} - -/*ハンバーガーアイコンをCSSだけで表現*/ -#nav-open span, #nav-open span:before, #nav-open span:after { -position: absolute; -height: 5px;/*線の太さ*/ -width: 50px;/*長さ*/ - border-radius: 3px; -background: #fff; -display: block; -content: ''; -cursor: pointer; -} -#nav-open span:before { -bottom: -16px; -} -#nav-open span:after { -bottom: -32px; -} - -/*閉じる用の薄黒カバー*/ -#nav-close { -display: none;/*はじめは隠しておく*/ -position: fixed; - z-index: 99; -top: 0;/*全体に広がるように*/ -left: 0; -width: 100%; -height: 100%; -background: black; -opacity: 0; -transition: .3s ease-in-out; -} - -/*中身*/ -#nav-content { -overflow: auto; -position: fixed; -top: 0; -left: 0; - z-index: 9999;/*最前面に*/ -width: 90%;/*右側に隙間を作る（閉じるカバーを表示）*/ - max-width: 380px;/*最大幅（調整してください）*/ -height: 100%; -background: #006E6F;/*背景色*/ -transition: .3s ease-in-out;/*滑らかに表示*/ - -webkit-transform: translateX(400%); -transform: translateX(400%);/*左に隠しておく*/ -} - -/*チェックが入ったらもろもろ表示*/ -#nav-input:checked ~ #nav-close { -display: block;/*カバーを表示*/ -opacity: .5; -} - -#nav-input:checked ~ #nav-content { - -webkit-transform: translateX(100vw); -transform: translateX(65vw);/*中身を表示（右へスライド）*/ - box-shadow: 6px 0 25px rgba(0,0,0,.15); -} - -#nav-content{ - ul{ - padding-left: 0; - margin-left: 0; - } - div{ - list-style: none; - a{ -display:block; - text-decoration: none; -color: white; -height: 80px; - line-height: 80px; - padding-left: 15px; - border-bottom: thin solid #fff; - font-size: 40px; - } -a:hover{ -transition:all 0.5s; - background-color: #5f9ea0; - } - } -} } /************* フッター ********************/ From 8d041802d24e2589bb0a411a41fcfa3815a2f8c9 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Tue, 9 Oct 2018 11:26:55 +0000 Subject: [PATCH 11/22] Remaeke hamburger --- app/assets/stylesheets/.home.scss.swo | Bin 0 -> 24576 bytes app/assets/stylesheets/.home.scss.swp | Bin 32768 -> 20480 bytes app/assets/stylesheets/home.scss | 309 +++++++++--------------- app/views/layouts/._header.html.erb.swo | Bin 0 -> 12288 bytes app/views/layouts/._header.html.erb.swp | Bin 12288 -> 12288 bytes app/views/layouts/_header.html.erb | 61 ++--- 6 files changed, 152 insertions(+), 218 deletions(-) create mode 100644 app/assets/stylesheets/.home.scss.swo create mode 100644 app/views/layouts/._header.html.erb.swo diff --git a/app/assets/stylesheets/.home.scss.swo b/app/assets/stylesheets/.home.scss.swo new file mode 100644 index 0000000000000000000000000000000000000000..be07b7a87dbbeee6836b234225f70239de40d3f8 GIT binary patch literal 24576 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp index 2dd26de6ec92b8a33fe1e0e2042a153220e48d57..e599f62ff01818eb29110e424f88b98bd518e7fa 100644 GIT binary patch literal 20480 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 literal 32768 zcmeI536LDsd4MOJ5|;r}rbuGDkxEF2o!LWL9lN$b91dV3Q=Box;Mtwtok6oR%gpQn zLNdDx3Lwdx0tDFDLI_2OTLuC;LIns8kTSuA!Gv&(gqCna6$qR-`Tl}nui#Lw!Di&L$JgiUK*=+vYOv+ByC%e1rlf|N4D%KZE7i8^X+LrrtzROM&+l$4~ zyo~H42}BYYiv)T~9r0QF#-=qjHi+|y6Arb$e&Fe2c{6eoNg$FyB!Nf*kpvHM#5%fbRoCYVu zJU9uCgxPQyOn`%6H+Y{#hPUAl@C2-em2f32gbSb#dclTMp%t3pTd)^=vR5qjAMiWa z1P{Y{xEpSSOQ0K4Fb`%y6C_{?90-3JAB%ks!|)nB1^2_HFdt5V6X94m3hLot*c(0? z7mK|E!>|org2!MZY=HaV8W@22a3=f^n&B^D9K6e-%{F)qo`k#MdbkSy7P{apI1T2& z5ikk%fpM@We9pqo7I+%g!!2+fEP@W02gk#)a17MJA#ea}XVK>kcm_7XYWNu}hKr#e zegY@LbT|z5gHKqDdJl%-HFyf{hjnlx{0vI)HxP#d;8V)?yRa2rg_q$aco9~^FX3`H zAM%g`8_s~^z^NZj^|7o(+D@kILcFbz%%!a4f|zBc?M!F7)M7O@G<5g3V$hdKmD0}h zq}G`G!UBpHR^7=|DwFGs7ecRS^Q_(B`;@?RL9BkN`LoJHH_%UoERWpUoFqtceW`Gme|_JwNe=@6)s|bmm&Db~{(H3(7Y$49gEh*P*t2sg&6&~osxrKb1C#;0spX}<+QcAlzEePhR>wLQB+_I2e zC$+^5VS2M_Fs#aV4Y@QX40#3QXw;}$vg!^-DV)Sco$X$I=u1=MbgtEqv}M%_PG_B) zPSu<>DDQOGW;S@iPVDIDP|n(t?ejYe`JP-VURli&>3rY0rM!`8)nkwl4KooBa~ z45vC9YosbsO50tOX=%7>`|2n#ivFTFR6c5d^)=A2HhFn0{sywosKz_gsv2d(C;~%W4c(&6@I=!B9ShY?ZJ@@Ei zRh2OXs9S5(E5E2#ap{j∋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 div { - display: flex; - overflow: hidden; - width: 200vw; - height: 200vw; - transition: all 0.4s ease; - -webkit-transform: scale(0); - transform: scale(0); - text-align: center; - color: #fefefe; - border-radius: 50%; - background: #006e6f; - flex: none; - -webkit-backface-visibility: hidden; - backface-visibility: hidden; - align-items: center; - justify-content: center; - } - .cp_fullscreenmenu .menu > div > ul { - display: block; - max-height: 100vh; - margin: 0; - padding: 0 1em; + #nav-drawer { + //position: relative; + } + +/*チェックボックス等は非表示に*/ + .nav-unshown { + display:none; + } + +/*アイコンのスペース*/ + #nav-open { + display: inline-block; + width: 125px; + height: 125px; + vertical-align: middle; + padding-left: 25px; + padding-top: 40px; + } + +/*ハンバーガーアイコンをCSSだけで表現*/ + #nav-open span, #nav-open span:before, #nav-open span:after { + position: absolute; + height: 5px;/*線の太さ*/ + width: 50px;/*長さ*/ + border-radius: 3px; + background: #fff;/*color*/ + display: block; + content: ''; + cursor: pointer; + + } + #nav-open span:before { + bottom: -16px; + } + #nav-open span:after { + bottom: -32px; + } + +/*閉じる用の薄黒カバー*/ + #nav-close { + display: none;/*はじめは隠しておく*/ + position: fixed; + z-index: 99; + top: 0;/*全体に広がるように*/ + left: 0; + width: 100%; + height: 100%; + background: black; + opacity: 0; + transition: .3s ease-in-out; + } + +/*中身*/ + #nav-content { + overflow: auto; + position: fixed; + top: 0; + left: 0; + z-index: 9999;/*最前面に*/ + width: 90%;/*右側に隙間を作る*/ + max-width: 500px;/*最大幅*/ + height: 100%; + background: #006e6f;/*背景色*/ + transition: .2s ease-in-out;/*滑らかに表示*/ + -webkit-transform: translateX(-105%); + transform: translateX(-105%);/*左に隠しておく*/ + div{ list-style: none; - transition: opacity 0.4s ease; - opacity: 0; - } - .cp_fullscreenmenu .menu > div > ul > li { - font-size: 50px; - display: block; - margin: 1em; - padding: 0; - } - .cp_fullscreenmenu .menu > div > ul > li > a { - position: relative; - display: inline; - cursor: pointer; - transition: color 0.4s ease; - } - .cp_fullscreenmenu .menu > div > ul > li > a:hover { - color: #e5e5e5; - } - .cp_fullscreenmenu .menu > div > ul > li > a:hover:after { - width: 100%; - } - .cp_fullscreenmenu .menu > div > ul > li > a:after { - position: absolute; - z-index: 1; - bottom: -0.15em; - left: 0; - width: 0; - height: 2px; - content: ''; - transition: width 0.4s ease; - background: #e5e5e5; - } - /*クリックしたらメニューが開閉*/ - .cp_fullscreenmenu .toggle { - position: absolute; - z-index: 2; - top: 0; - left: 0; - width: 125px; - height: 125px; - cursor: pointer; - opacity: 0; - } - .cp_fullscreenmenu .toggle:checked + .hamburger > span { - -webkit-transform: rotate(135deg); - transform: rotate(135deg); - } - .cp_fullscreenmenu .toggle:checked + .hamburger > span:before, .cp_fullscreenmenu .toggle:checked + .hamburger > span:after { - top: 0; - -webkit-transform: rotate(90deg); - transform: rotate(90deg); - } - .cp_fullscreenmenu .toggle:checked + .hamburger > span:after { - opacity: 0; - } - .cp_fullscreenmenu .toggle:checked ~ .menu { - visibility: visible; - pointer-events: auto; - } - .cp_fullscreenmenu .toggle:checked ~ .menu > div { - transition-duration: 0.75s; - -webkit-transform: scale(1); - transform: scale(1); - } - .cp_fullscreenmenu .toggle:checked ~ .menu > div > ul { - opacity: 1; - } - .cp_fullscreenmenu .toggle:hover + .hamburger { - box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.1); - } - .cp_fullscreenmenu .toggle:checked:hover + .hamburger > span { - -webkit-transform: rotate(225deg); - transform: rotate(225deg); - } - /*ハンバーガーアイコン*/ - .cp_fullscreenmenu .hamburger { - position: absolute; - z-index: 1; - top: 0; - left: 0; - display: block; - width: 125px; - height: 125px; - padding: 0.5em 1em; - cursor: pointer; - transition: box-shadow 0.4s ease; - border-radius: 0 0.12em 0.12em 0; - background: #006e6f; - -webkit-backface-visibility: hidden; - backface-visibility: hidden; - } - .cp_fullscreenmenu .hamburger > span { - position: relative; - top: 50%; - display: block; - width: 100%; - height: 2px; - transition: all 0.4s ease; - background: #fefefe; - } - .cp_fullscreenmenu .hamburger > span:before, - .cp_fullscreenmenu .hamburger > span:after { - position: absolute; - z-index: 1; - top: -10px; - left: 0; - display: block; - width: 100%; - height: 2px; - content: ''; - transition: all 0.4s ease; - background: inherit; - } - .cp_fullscreenmenu .hamburger > span:after { - top: 10px; + text-align: right; + a{ + display: block; + color: white; + text-decoration: none; + line-height: 125px; + padding-left: 25px; + padding-right: 25px; + height: 125px; + font-size: 35px; + } + a:hover{ + transition:all 0.5s; + background-color: #5f9ea0; + } } } + +/*チェックが入ったらもろもろ表示*/ + #nav-input:checked ~ #nav-close { + display: block;/*カバーを表示*/ + opacity: .5; + } + + #nav-input:checked ~ #nav-content { + -webkit-transform: translateX(0%); + transform: translateX(0%);/*中身を表示*/ + box-shadow: 6px 0 25px rgba(0,0,0,.15); + } + } /************* フッター ********************/ diff --git a/app/views/layouts/._header.html.erb.swo b/app/views/layouts/._header.html.erb.swo new file mode 100644 index 0000000000000000000000000000000000000000..d714feec16fb63ef3810de07356e5d3e6dbf07cb GIT binary patch literal 12288 zcmeHNONbmr7_JCvVvG?V7X_*9bzQ~u^voJ(&Ft(bAqMx51rH{K2t!SG%}ldB-A#AT zJ|L(&or7RNPsSkR5F|)MObiMpxdp_NS0UFHA0T-1kdt5aW41FpGrOCEs8qAx^sDNx z|NrXy|C(W|Q9QnIjLsGg5*&{b^6W=9Pn~^^ko8@JbQ@he=!zHP57#mAr<0dLgpl*V+rTrx)qRAV0rmnvJWR+pz%p!@l2MM7AONR z0t)an@Dy+d@tp&jzzJXx5HTMGA zeC@dd^#*5FpAFwv@O`)y~%RyMjNIt5RO8Pj&VFjB={MRXlvEE~^pIm~S8=ex{C z@AS0UNNm49dNNw9b)-z2>q`x1RT<{+h9`GLZFp>jd%2*YPqQhs)Z#|nv|kk}&j=aN z)MhCU)7UQ`U-|9Qhrgb`@%!1YG0QeziDzu2PDe}qGiVhS;G1dhp!<%LCStODQ8@Zh z=YkS*U$>pW)OlTG;wVwoP{-OHZ;Gm88_Z%JHm#br!B>@96rPE*?F&)E1{lo^l}q#w zMEl-#gdRAqsrv)5?-@H~xeDobn49jLh4=o3)MG`YbvM^Y)V~Q;je6fj;e{ytGzve7 z!Y~ToQ&m*HL=*!7{0k*9enxXN@35W@(dj=^P5T3HOO0_l=PO}>8J#4r`-XBPU@d{x zzKs=nIi7j3w1~PoAiL2sJzDz5vSiq{^wU%sCH<^04au9kLcWL9VO&xT8E$$9RVJTq z$wqc{WICqr8y={`s*-W5DYbY&Dpt?|HaDA(%X|JYzVnFW7PTS$cGO_{QpD#Dj{UZNYy&YQz=?e!NLC^XARVEKDv;cBlK# zojffLsRM-3PBeD&<@oX`qFcVD?jK>#P`RW1TR3=ZGtmieeZ>%Wh}}hBnCNqe=pI~z z2rLDO79jv{w-P;rSr`Bbx}Xz&1&BVtb9e+g$ndj`=p#IaEbN7Cun9i-iQd5?jQDAs zzWRvX!!;O$S6hhYAqVH-1Ps9-s1St+?15EWgTKhj5fZhLOz7rps_{XHWKpVT4* z_p1>;8~5_lcpo2DyLcs@MeO8q48J9Ud=TH=R!4bK@fL-t4@;Idt7L3z+OVdjW?Cf9 zYiT1dGI`B)>#JrgH)qdTQgd70b`42n?LvKlX*n}Ul1$XLZjfy4JliplrnqjS>u46X zH^TZXwFCYfUq4Pv&pXDjl*t*HOKJOxv{A*)Qj%!iT7ou3FKBZ{0oUg1v7TVPzqom| z!~Eue#3?nz=KfyJsoODcM`QcYxBx$i^`V&|z8c@jStZ7+ic|FCpD?o`Z%<7b`h;nX zi0B5#x|cO)B4=p2QJBb^ZnNdJ!Wzx~YY}Qo_9{x{#*0enVWsq-Qo36yl`5qLMM+WP j5&W;-qm8<&4?@8_TwaM6J(vXX3et$7#>)usnZ(j>;8pr- delta 1065 zcmaKqOK1~O6oyYEedN`&U@eUmuLF~W*vX{D=)!4yfY>PAxF~|qHc2OGaFWKn&{evK zLZP_1D{<>qBy=To<3e4i0TEFV+_+IHf)C)OIeqUS?3Ps42qZ;lNAa=QlliT(gl5#}T8a3$;}`Z7fH5@bLK z{B#lB23NrwCs7sL0ABFkLG%pNzyojxEP!cX1>fyNpTRqD50t@C@W_T5usulh8r%i5 zgLIixEF^FU^nu0z(O2*Zyajde3Oodtz&Nl23lLjrfTy6^ziF|a>*M!j8~-4CTr$(M z%S;m?GyX&#^~=pCA()~ra$SMEdGRUl7=IzV4x&s{b_JYj@&upt{%|leG<7*$=9a)X z&-rW@Y(g`o2$^f~R5BuD*6#e^J)${zSAuCqnokGRF(bWqt{9k{+9M|nje@?PQX6 z)UaR)BUUKPNEtm_l6I*pu}r*_Pw9Cnq7`znY(!IAw~j|Tn=2LDF2&VU%FrcNyp_{u zq(o&!Ph5|$-jtZSGtln0CUT3(l3^4Qd0o%8T4)|rcaV_mv>pxbwKox0LPP
    Hello Idea
    - -
    <%= link_to 'HelloIdeaとは', "/detail" %>
    +
    <%= link_to 'HelloIdeaとは', "/detail" %>
    <% if logged_in? %> -
    <%= link_to current_user.name, user_path(id: current_user) %>
    -
    <%= link_to 'ニーズ', topics_path %>
    +
    <%= link_to current_user.name, user_path(id: current_user) %>
    +
    <%= link_to 'ツール', topics_path %>
    <% if current_user.admin? %>
    <%= link_to 'ユーザーリスト', users_path %>
    <% end %>
    <%= show_notice_link %>
    -
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    -
    <%= link_to 'ログアウト', logout_path %>
    +
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    +
    <%= link_to 'ログアウト', logout_path %>
    <% else %> -
    <%= link_to 'ログイン', login_path %>
    -
    <%= link_to '新規登録', new_user_path %>
    +
    <%= link_to 'ログイン', login_path %>
    +
    <%= link_to '新規登録', new_user_path %>
    <% end %> -
    -
    -
    - -
    -
    -
    -
      -
    • <%= link_to 'HelloIdeaとは', "/detail" %>
      • - <% if logged_in? %> -
    • <%= link_to current_user.name, user_path(id: current_user) %>
      • - <% if current_user.admin? %>
    • <%= link_to 'ユーザーリスト', users_path %>
      • <% end %> -
    • <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
      • -
    • <%= link_to 'ログアウト', logout_path %>
      • - <% else %> -
    • <%= link_to 'ログイン', login_path %>
      • -
    • <%= link_to '新規登録', new_user_path %>
      • - <% end %> -
    -
    + + +
    +
    + <% if logged_in? %> +
    <%= link_to 'ニーズ', topics_path %>
    + +
    <%= show_notice_link %>
    + <% else %> +
    <%= link_to 'HelloIdeaとは', "/detail" %>
    +
    <%= link_to 'ログイン', login_path %>
    +
    <%= link_to '新規登録', new_user_path %>
    + <% end %> +
    + <% if logged_in? %> + + <% end %>
    +
    From a1175c087ed7424ce5ac0cb5f7daf27765bc99e8 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Tue, 9 Oct 2018 11:35:18 +0000 Subject: [PATCH 12/22] Fix mandalarts url --- app/assets/stylesheets/.home.scss.swo | Bin 24576 -> 0 bytes app/views/layouts/._header.html.erb.swo | Bin 12288 -> 0 bytes app/views/layouts/_header.html.erb | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 app/assets/stylesheets/.home.scss.swo delete mode 100644 app/views/layouts/._header.html.erb.swo diff --git a/app/assets/stylesheets/.home.scss.swo b/app/assets/stylesheets/.home.scss.swo deleted file mode 100644 index be07b7a87dbbeee6836b234225f70239de40d3f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 diff --git a/app/views/layouts/._header.html.erb.swo b/app/views/layouts/._header.html.erb.swo deleted file mode 100644 index d714feec16fb63ef3810de07356e5d3e6dbf07cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeHNONbmr7_JCvVvG?V7X_*9bzQ~u^voJ(&Ft(bAqMx51rH{K2t!SG%}ldB-A#AT zJ|L(&or7RNPsSkR5F|)MObiMpxdp_NS0UFHA0T-1kdt5aW41FpGrOCEs8qAx^sDNx z|NrXy|C(W|Q9QnIjLsGg5*&{b^6W=9Pn~^^ko8@JbQ@he=!zHP57#mAr<0dLgpl*V+rTrx)qRAV0rmnvJWR+pz%p!@l2MM7AONR z0t)an@Dy+d@tp&jzzJXx5HTMGA zeC@dd^#*5FpAFwv@O`)y~%RyMjNIt5RO8Pj&VFjB={MRXlvEE~^pIm~S8=ex{C z@AS0UNNm49dNNw9b)-z2>q`x1RT<{+h9`GLZFp>jd%2*YPqQhs)Z#|nv|kk}&j=aN z)MhCU)7UQ`U-|9Qhrgb`@%!1YG0QeziDzu2PDe}qGiVhS;G1dhp!<%LCStODQ8@Zh z=YkS*U$>pW)OlTG;wVwoP{-OHZ;Gm88_Z%JHm#br!B>@96rPE*?F&)E1{lo^l}q#w zMEl-#gdRAqsrv)5?-@H~xeDobn49jLh4=o3)MG`YbvM^Y)V~Q;je6fj;e{ytGzve7 z!Y~ToQ&m*HL=*!7{0k*9enxXN@35W@(dj=^P5T3HOO0_l=PO}>8J#4r`-XBPU@d{x zzKs=nIi7j3w1~PoAiL2sJzDz5vSiq{^wU%sCH<^04au9kLcWL9VO&xT8E$$9RVJTq z$wqc{WICqr8y={`s*-W5DYbY&Dpt?|HaDA(%X|JYzVnFW7PTS$cGO_{Qp<%= link_to 'HelloIdeaとは', "/detail" %> <% if logged_in? %>
    <%= link_to current_user.name, user_path(id: current_user) %>
    -
    <%= link_to 'ツール', topics_path %>
    - +
    <%= link_to 'ニーズ', topics_path %>
    + <% if current_user.admin? %>
    <%= link_to 'ユーザーリスト', users_path %>
    <% end %>
    <%= show_notice_link %>
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    From a8c86667371099ba7574d7e55ee5165a8ff5488c Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Tue, 9 Oct 2018 12:33:37 +0000 Subject: [PATCH 13/22] Add header brand --- app/assets/stylesheets/.home.scss.swp | Bin 20480 -> 24576 bytes app/assets/stylesheets/home.scss | 11 ++++++++++- app/views/layouts/._header.html.erb.swp | Bin 12288 -> 12288 bytes app/views/layouts/_header.html.erb | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp index e599f62ff01818eb29110e424f88b98bd518e7fa..99539ebe2259a8be8d618a012de6ccc7ad5f1b2b 100644 GIT binary patch delta 2268 zcmd_reN3B09Ki8wDRaEE6aqn*E`?d7M4*&G2~4(-@lrs@Tu=v2)~zkAL#S;Xn2FsY zMu(9to^c5%^CelBx)9em7{iF$TpYRyx;P^y&P1K4n=Zx?A|`$xpz0F;@gM!eOFqwC z@1B>t=lR{QyIxf78ds%mHQ!~s!(h!>Ehu^+<`0ZD6=e#sUh_ukw{a?sjL;jSB9%c( zxy;ii=V=yy2=7uIsak9-RU%@kKVzx(g*NG*h&y7?=z}Y@LVN_}N#WshaYDR|0la{I z^udi5Y=#Xc+ypgdbwYfP&u|u}a2!K;2~Xk?c+rCUaIa3}iY6KvFk%IwaFq%Dh%5L8 z=b=n;N*l844O*F2WR-iZv2wIPX?7qMmyoz4< z(121HaWizd%EQm$G{!N8V;I38deMVDXoL+`POw-~O$6wcxU9711AkncldBg&ABXv{?maS4+c#{u-C z4}0+_?neV`Sc4Q?juK)5BX|Z)$iubeLi~X9IF2LeL-!^QPS}tQJ?3r@;vzo98N7}? z*o~d&zz(d30oV9+U*k($#3QKe+v#a>2Z{}Omg~B`c89~$){^a89R2&jR;P%r6TDL|1a$BSXy;b-dhPU8{Au zTqU_#+uB>(eObBkQuQsIEVVVMssfo=b2uwJu|T`G*s$6hUP`!oaY_sQaPLX2E(7?A+oayFrs#&^W>G!Efe zJcfHvgJNVN9x5nt{yC;GiMR0@oJ|X4l6Q{jx_wLX6HjG%9hCPaBki131kO+_BOw(-6w}C zb^q60x{y@<$u3G>hT9c)3wHk-vR!d$V>nL delta 3197 zcmbu>Ye*bd6u|MjuFu58RjIa`HX9!?Myjrlm}(XY0gDaILo}=pqQ>V^aZPuF*4C{0 zrD^GhgfSq5&_YT>pn~brC&s3flwcaFmh?jdO=Z}SSCh_6Ti>%rTfApB2~ob86paNd?k5THFK%ECSMe_1fEQh8 z!U5P(j66Jr6hz}!+Ps6WF^A9aDQ58+PT}Nc;T3%x)T0iEQHu)5PT5d^3@p>pySR>v zn7|nN;Xo}akc*A@Hc^O6xPVjWK|S`O0GWtO^a}CKMj_@gg>m$t8tD-Dd4muOxPptA z#OoNsQB)!ooA6tL5T9cd!>BZ`r*=<869>fXpBYc>`IXF-U8{+X- ztPq1Zjzh@9Qj8EkU>+aiZJfp!+-OHzjL#H3XjT^ODa9iqq1)B(dD`t9?y9tgp4oJ# zy9S1;lm&ZQkwIJ(_Bq4DYJ?kABR?;^ph{ln_E=vQg5;o9Kc1wkeZ=ecJ+8Z+zH5!! z?BPkRBN0-viwqWBsX!L8w?!z|s`o_dOc~9T#cH+tIDM3X%A-EVyM8aiGog{tGou-2 zhIB>pJqV12`r;_x*%Q{eR8FqZhKc+{vs_TjFG;mvks1|DV|F-=d)M61sMnB4j zJZJbMs<)DR-=h77DY?BXR9vrsUq=nsGKlD#C?@YTNSSz>&$N>}^i<>Y7_E(>kYy z0{hkSbt@^+a@s-Yvj)Rft5-eL_QCd7E96ly>Yv3mgH_lu(As^XFEC&0RcVbIwB!wr zyV{gm8nGdLGE(bnrdv1L!5gi43xXlFGW4wSA$JinU)Z5m>3gU>qCtAA9L>;p$eD7! zxWICrzw`&7G?UmBxR;yM^tyWvfN;cDlPSGIbx1d4m#46U5+PAyOqO^ z?aC{TXQRu@%d3=mN6wQa<$M5(b}pa&@b1{zokc?4qqoc1)9b0UmMY1OQ_4zXPHIVs c{7lN+ptIA{OR8Ae-ZZ7$YRdC{-(ofY2fEZIoB#j- diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 8fcc4f5f..5b8b997b 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -252,6 +252,15 @@ html { float: right; height: 125px; display: inline; + span{ + float: left; + a{ + line-height: 125px; + color: #fff; + font-size: 60px; + padding-left: 0; + } + } div{ list-style: none; float: left; @@ -288,7 +297,7 @@ html { width: 125px; height: 125px; vertical-align: middle; - padding-left: 25px; + padding-left: 40px; padding-top: 40px; } diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp index 890b853b78c835c49901ac86ff9611521dca0b34..d5b59a6ef200ceef2e35590f4104f15b1bb893b0 100644 GIT binary patch delta 373 zcmX}izb^v;0LAgw=8j(JFHB7<=LQj%{sD8rWc{(`-E)2|GRM(|3;L%%&euq36 zHxh1#0&M~4iho7MiOA|diyp)Wtspi^3- zD7{I*Gdk&GF zn;pFtVzNAE?P!L)QPM1HUfC>adeKZ2OwG_IoRieB@cTON<0YwSA2sc2)4p+X$wlW< jRh$oXz^$peH}dU0P__^;hu^49YMiyc`p delta 501 zcmaLSy-UMT6b0~;8f$8;{Xmz3ArzlWG&mHbL2yv4A9Tnfs7oVJEJ#5SK@i%Zj!q93 z!NEZsr39UdlY@?~{sFox2wDVB6){NZg&(|o@8R)YwOB2t*T$FT3&w<%1uFqKhmFddLBo`yE_#jt_f(@PdeMLfI-s0}McniN`?N{RlqZ{VWRW19hUk+|KcNz> zkVCES%#srJ74=xHO#Uko?1d5R+MI>4-e&qc>bz~G#8}4*z9WHz-xL?BY>etsGiM?N hx9quF?#`}stT}mVWxRl`pt=Whwvw diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index f605108c..6da1fc50 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -26,6 +26,7 @@
    <%= show_notice_link %>
    <% else %> + Hello Idea
    <%= link_to 'HelloIdeaとは', "/detail" %>
    <%= link_to 'ログイン', login_path %>
    <%= link_to '新規登録', new_user_path %>
    From 1bc30ed647c0fce236c91d8bf03257826f013276 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 05:42:28 +0000 Subject: [PATCH 14/22] Indent --- app/assets/stylesheets/.home.scss.swp | Bin 24576 -> 0 bytes app/assets/stylesheets/home.scss | 34 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 app/assets/stylesheets/.home.scss.swp diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp deleted file mode 100644 index 99539ebe2259a8be8d618a012de6ccc7ad5f1b2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 Date: Wed, 10 Oct 2018 06:38:54 +0000 Subject: [PATCH 15/22] Complete in smap.ver --- app/assets/stylesheets/#home.scss# | 418 ++++++++++++++++++ app/assets/stylesheets/.#home.scss | 1 + app/assets/stylesheets/.home.scss.swp | Bin 0 -> 24576 bytes app/assets/stylesheets/home.scss | 8 + .../topics/.index_smart_phone.html.erb.swp | Bin 0 -> 12288 bytes app/views/topics/index_smart_phone.html.erb | 2 +- 6 files changed, 428 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/#home.scss# create mode 120000 app/assets/stylesheets/.#home.scss create mode 100644 app/assets/stylesheets/.home.scss.swp create mode 100644 app/views/topics/.index_smart_phone.html.erb.swp diff --git a/app/assets/stylesheets/#home.scss# b/app/assets/stylesheets/#home.scss# new file mode 100644 index 00000000..69aedd49 --- /dev/null +++ b/app/assets/stylesheets/#home.scss# @@ -0,0 +1,418 @@ +@import "bootstrap"; +@import "bootstrap-sprockets"; + +/************* 全体 ********************/ + +* { + box-sizing: border-box; +} + +html { + font: 100%/1.5 'Avenir Next', 'Hiragino Sans', sans-serif; + line-height: 1.7; + letter-spacing: 1px; +} + +.main { + min-height: 82vh; + h1 { + color: #007B96; + padding: 20px; + } +} + +.top { + // background-image: url('top.png'); + // background-position: 30%; + /* 画像をタイル状に繰り返し表示しない */ + // background-repeat: no-repeat; + /* 表示するコンテナの大きさに基づいて、背景画像を調整 */ + // background-size: contain; + /* 背景画像が読み込まれる前に表示される背景のカラー */ + background-color: white; + .message{ + padding-top: 50px; + text-align: right; + color: red; + h1 { + font-size: 64px; + } + font-size: 32px; + } + .top-image { + padding-left: 10%; + } + .aroundbrank { + padding: 30px; + } +} + +.smart-phone{ + h1{ + padding: 20px; + } + .nav-item { + width: 15%; + font-size: 30px; + } + .nav-item-lg { + font-size: 30px; + background-color: #00BABD; + } + .nav-item-lg a { + color: white; + } +} + +.detail-message{ + color: #006E6F; + //line-height: 100px; + h1{ + line-height: 10vw; + font-size: 5vw; + color: #006E6F; + .small{ + font-size: 3vw; + color: #:kill-session + +006E6F; + } + } + h2{ + line-height: 3vw; + font-size: 3vw; + color: #006E6F; + .small{ + font-size: 2vw; + color: #006E6F; + } + } + h3{ + line-height: 5vw; + font-size: 2vw; + } + .message-item { + p { + line-height: 5vw; + font-size: 2vw; + @media screen and (min-width: 769px) { + line-height: 4vw; + font-size: 25px; + } + } + } + .is_helloidea{ + text-align: center; + .theme{ + font-weight: bold; + } + } + + .is_object{ + text-align: center; + } + + .how_to{ + background-color: #006E6F; + color: #fff; + padding-top: 4vw; + margin-left: 0; + h2{ + text-align: center; + font-weight: bold; + color: white; + padding-bottom: 1vw; + } + p{ + text-align: center; + line-height: 2vw; + font-size: 1.5vw; + } + img{ + margin-bottom:45px; + width: 40vw; + } + .example-img img{ + width: 30vw; + } + padding-bottom: 4vw; + } + + .question{ + padding-top: 4vw; + padding-bottom: 4vw; + font-weight: bold; + text-align: center; + h2{ + font-size: 3vw; + line-height: 5vw; + font-weight:bold; + } + } + + .detail-smart-phone{ + padding: 30px; + h1{ + line-height: 10vw; + font-size: 7vw; + color: #006E6F; + .small{ + font-size: 4vw; + color: #006E6F; + } + } + h2{ + line-height: 7vw; + font-size: 5vw; + color: #006E6F; + .small{ + font-size: 3vw; + color: #006E6F; + } + } + h3{ + line-height: 6vw; + font-size: 4vw; + } + .message-item { + p { + line-height: 5vw; + font-size: 2vw; + @media screen and (min-width: 769px) { + line-height: 7vw; + font-size: 4vw; + } + } + } + } +} + +/************* ヘッダー ********************/ +.pad{ + padding-left: 100px; + padding-right: 100px; +} + +.header{ + width: 100%; + height: 100px; + .header-brand a{ + float: left; + font-size: 60px; + color: white; + text-decoration: none; + line-height: 100px; + } + .header-list{ + float: right; + height: 50px; + display: inline; + div{ + list-style: none; + float: left; + a{ + display: block; + color: white; + text-decoration: none; + line-height: 100px; + padding-left: 12px; + padding-right: 12px; + height: 100px; + } + a:hover{ + transition:all 0.5s; + background-color: #5f9ea0; + } + } + } +} + +@media(min-width:1200px){ + .smap_header{ + display:none; + } +} + +/*width:1200px 以下*/ +@media(max-width:1200px){ + .pad{ + padding: 0; + } + + .header{ + height: 125px; + } + + .header-brand{ + display: none; + } + .header-list div{ + display: none; + } + + .smap_header_list{ + float: right; + height: 125px; + display: inline; + span{ + float: left; + a{ + line-height: 125px; + color: #fff; + font-size: 60px; + padding-left: 0; + } + } + div{ + list-style: none; + float: left; + a{ + display: block; + color: white; + text-decoration: none; + line-height: 125px; + padding-left: 25px; + padding-right: 25px; + height: 125px; + font-size: 35px; + } + a:hover{ + transition:all 0.5s; + background-color: #5f9ea0; + } + } + } + + + #nav-drawer { + //position: relative; + } + +/*チェックボックス等は非表示に*/ + .nav-unshown { + display:none; + } + +/*アイコンのスペース*/ + #nav-open { + display: inline-block; + width: 125px; + height: 125px; + vertical-align: middle; + padding-left: 40px; + padding-top: 40px; + } + +/*ハンバーガーアイコンをCSSだけで表現*/ + #nav-open span, #nav-open span:before, #nav-open span:after { + position: absolute; + height: 5px;/*線の太さ*/ + width: 50px;/*長さ*/ + border-radius: 3px; + background: #fff;/*color*/ + display: block; + content: ''; + cursor: pointer; + + } + #nav-open span:before { + bottom: -16px; + } + #nav-open span:after { + bottom: -32px; + } + +/*閉じる用の薄黒カバー*/ + #nav-close { + display: none;/*はじめは隠しておく*/ + position: fixed; + z-index: 99; + top: 0;/*全体に広がるように*/ + left: 0; + width: 100%; + height: 100%; + background: black; + opacity: 0; + transition: .3s ease-in-out; + } + +/*中身*/ + #nav-content { + overflow: auto; + position: fixed; + top: 0; + left: 0; + z-index: 9999;/*最前面に*/ + width: 90%;/*右側に隙間を作る*/ + max-width: 500px;/*最大幅*/ + height: 100%; + background: #006e6f;/*背景色*/ + transition: .2s ease-in-out;/*滑らかに表示*/ + -webkit-transform: translateX(-105%); + transform: translateX(-105%);/*左に隠しておく*/ + div{ + list-style: none; + text-align: right; + a{ + display: block; + color: white; + text-decoration: none; + line-height: 125px; + padding-left: 25px; + padding-right: 25px; + height: 125px; + font-size: 35px; + } + a:hover{ + transition:all 0.5s; + background-color: #5f9ea0; + } + } + } + +/*チェックが入ったらもろもろ表示*/ + #nav-input:checked ~ #nav-close { + display: block;/*カバーを表示*/ + opacity: .5; + } + + #nav-input:checked ~ #nav-content { + -webkit-transform: translateX(0%); + transform: translateX(0%);/*中身を表示*/ + box-shadow: 6px 0 25px rgba(0,0,0,.15); + } + +} + +/************* フッター ********************/ + +.footer { + text-align: right; + border-top: solid 2px #eaeaea; + color: #777; + margin-left: 15px; + a{ + color: red; + &:hover { + color: blue; + } + } + ul { + float: right; + list-style: none; + li { + float: left + } + } +} + +/************* パーシャル ********************/ + +.detail { + font-size: 28px; + word-wrap: break-word; +} + +.list { + font-size: 16px; +} diff --git a/app/assets/stylesheets/.#home.scss b/app/assets/stylesheets/.#home.scss new file mode 120000 index 00000000..833f6f9c --- /dev/null +++ b/app/assets/stylesheets/.#home.scss @@ -0,0 +1 @@ +ubuntu@poipoi-1.1249 \ No newline at end of file diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp new file mode 100644 index 0000000000000000000000000000000000000000..b2649e042b3d1ba7a836fd36f99b4e5a5dd8af54 GIT binary patch literal 24576 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 literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 870ebc63..3dac92f5 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -51,6 +51,14 @@ html { h1{ padding: 20px; } + + ul{ + display: inline; + } + div .nav-item-lg{ + float: right; + } + .nav-item { width: 15%; font-size: 30px; diff --git a/app/views/topics/.index_smart_phone.html.erb.swp b/app/views/topics/.index_smart_phone.html.erb.swp new file mode 100644 index 0000000000000000000000000000000000000000..3e0e2eb7478c413cf8b5405053e74dbc35d7bf6f GIT binary patch literal 12288 zcmeI2J#5oJ6vwZ?!bd3r#tv6kRgkFTq^(rcx)H5d7#J8}0V%q~*VyXCw(N6489=2H z5+71o+695s1(*;L8wIg5ATc4t7-(T&Ltm0KHTGvVHgb-t*7zMT&BT z%-NHt=xBO`z&Jq2`Mb}~t)&Th*-c1L2y7XI3mXsDvEZX-H?|_=Qp2HUav_|&WpJi3 z*VQT(ulkyFT&w77mTmA0dB4m&nRiXc=4n%wMVfnsUwOxMB!C3gB@oDI^;kC<9?E7y zn|`H_9y)ktU2|MO0!RP}AOR$R1dsp{KmthM|05vXE^-+jYe)2Gz0t9&?HFC+0SO=h zB!C2v01`j~NB{{S0VIF~kN^_+2MI8P5OX&npF!dO|MBntPd$XZ0H+u+q0a^wf1@(e@K)XO+qu6i5_&AUN z5;M;}ZP{Aa0+A@3M1|R`qFR!dRZ&uMI-{n?rzeznld{dL zN?ePfrLgQ7C0CojQJa5SyYggp>CuOK3#-=`*B(6AHI|FoOz%_GW=#q!>7W$~YBlr* zFO#Nz>JT~x!Z%)a-euB+P7AvN8YoT$Onf;jI7~qkI^Gzqnh;@}7Fcnn1hs7&YP8Uw z$xKa7ofr>WO^4RYscHg9XOamR{m_LYofxRWBvYkRDhXciO#m}@r#AQS-O5q}21Fqn zaA*rLyr~fH7Z*M*-~1E*L!0uycI)cu{Nq3IpY8D9tk+IblR~t|&;yaE6dJx`0PjaN doUCwHZG5dH=jt2j)%r$yxFfkzW|j?8-vJ1iE^hz; literal 0 HcmV?d00001 diff --git a/app/views/topics/index_smart_phone.html.erb b/app/views/topics/index_smart_phone.html.erb index 0afaea4c..713b7f72 100644 --- a/app/views/topics/index_smart_phone.html.erb +++ b/app/views/topics/index_smart_phone.html.erb @@ -7,7 +7,7 @@
  • 問題
  • その他
    • -
  • ニーズ新規投稿
    • +
    ニーズ新規投稿
    From 641026843090836fbbe272640c3744908a598be7 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 07:22:54 +0000 Subject: [PATCH 16/22] Delete file --- app/assets/stylesheets/#home.scss# | 418 ------------------ app/assets/stylesheets/.#home.scss | 1 - app/assets/stylesheets/.home.scss.swp | Bin 24576 -> 0 bytes .../topics/.index_smart_phone.html.erb.swp | Bin 12288 -> 0 bytes 4 files changed, 419 deletions(-) delete mode 100644 app/assets/stylesheets/#home.scss# delete mode 120000 app/assets/stylesheets/.#home.scss delete mode 100644 app/assets/stylesheets/.home.scss.swp delete mode 100644 app/views/topics/.index_smart_phone.html.erb.swp diff --git a/app/assets/stylesheets/#home.scss# b/app/assets/stylesheets/#home.scss# deleted file mode 100644 index 69aedd49..00000000 --- a/app/assets/stylesheets/#home.scss# +++ /dev/null @@ -1,418 +0,0 @@ -@import "bootstrap"; -@import "bootstrap-sprockets"; - -/************* 全体 ********************/ - -* { - box-sizing: border-box; -} - -html { - font: 100%/1.5 'Avenir Next', 'Hiragino Sans', sans-serif; - line-height: 1.7; - letter-spacing: 1px; -} - -.main { - min-height: 82vh; - h1 { - color: #007B96; - padding: 20px; - } -} - -.top { - // background-image: url('top.png'); - // background-position: 30%; - /* 画像をタイル状に繰り返し表示しない */ - // background-repeat: no-repeat; - /* 表示するコンテナの大きさに基づいて、背景画像を調整 */ - // background-size: contain; - /* 背景画像が読み込まれる前に表示される背景のカラー */ - background-color: white; - .message{ - padding-top: 50px; - text-align: right; - color: red; - h1 { - font-size: 64px; - } - font-size: 32px; - } - .top-image { - padding-left: 10%; - } - .aroundbrank { - padding: 30px; - } -} - -.smart-phone{ - h1{ - padding: 20px; - } - .nav-item { - width: 15%; - font-size: 30px; - } - .nav-item-lg { - font-size: 30px; - background-color: #00BABD; - } - .nav-item-lg a { - color: white; - } -} - -.detail-message{ - color: #006E6F; - //line-height: 100px; - h1{ - line-height: 10vw; - font-size: 5vw; - color: #006E6F; - .small{ - font-size: 3vw; - color: #:kill-session - -006E6F; - } - } - h2{ - line-height: 3vw; - font-size: 3vw; - color: #006E6F; - .small{ - font-size: 2vw; - color: #006E6F; - } - } - h3{ - line-height: 5vw; - font-size: 2vw; - } - .message-item { - p { - line-height: 5vw; - font-size: 2vw; - @media screen and (min-width: 769px) { - line-height: 4vw; - font-size: 25px; - } - } - } - .is_helloidea{ - text-align: center; - .theme{ - font-weight: bold; - } - } - - .is_object{ - text-align: center; - } - - .how_to{ - background-color: #006E6F; - color: #fff; - padding-top: 4vw; - margin-left: 0; - h2{ - text-align: center; - font-weight: bold; - color: white; - padding-bottom: 1vw; - } - p{ - text-align: center; - line-height: 2vw; - font-size: 1.5vw; - } - img{ - margin-bottom:45px; - width: 40vw; - } - .example-img img{ - width: 30vw; - } - padding-bottom: 4vw; - } - - .question{ - padding-top: 4vw; - padding-bottom: 4vw; - font-weight: bold; - text-align: center; - h2{ - font-size: 3vw; - line-height: 5vw; - font-weight:bold; - } - } - - .detail-smart-phone{ - padding: 30px; - h1{ - line-height: 10vw; - font-size: 7vw; - color: #006E6F; - .small{ - font-size: 4vw; - color: #006E6F; - } - } - h2{ - line-height: 7vw; - font-size: 5vw; - color: #006E6F; - .small{ - font-size: 3vw; - color: #006E6F; - } - } - h3{ - line-height: 6vw; - font-size: 4vw; - } - .message-item { - p { - line-height: 5vw; - font-size: 2vw; - @media screen and (min-width: 769px) { - line-height: 7vw; - font-size: 4vw; - } - } - } - } -} - -/************* ヘッダー ********************/ -.pad{ - padding-left: 100px; - padding-right: 100px; -} - -.header{ - width: 100%; - height: 100px; - .header-brand a{ - float: left; - font-size: 60px; - color: white; - text-decoration: none; - line-height: 100px; - } - .header-list{ - float: right; - height: 50px; - display: inline; - div{ - list-style: none; - float: left; - a{ - display: block; - color: white; - text-decoration: none; - line-height: 100px; - padding-left: 12px; - padding-right: 12px; - height: 100px; - } - a:hover{ - transition:all 0.5s; - background-color: #5f9ea0; - } - } - } -} - -@media(min-width:1200px){ - .smap_header{ - display:none; - } -} - -/*width:1200px 以下*/ -@media(max-width:1200px){ - .pad{ - padding: 0; - } - - .header{ - height: 125px; - } - - .header-brand{ - display: none; - } - .header-list div{ - display: none; - } - - .smap_header_list{ - float: right; - height: 125px; - display: inline; - span{ - float: left; - a{ - line-height: 125px; - color: #fff; - font-size: 60px; - padding-left: 0; - } - } - div{ - list-style: none; - float: left; - a{ - display: block; - color: white; - text-decoration: none; - line-height: 125px; - padding-left: 25px; - padding-right: 25px; - height: 125px; - font-size: 35px; - } - a:hover{ - transition:all 0.5s; - background-color: #5f9ea0; - } - } - } - - - #nav-drawer { - //position: relative; - } - -/*チェックボックス等は非表示に*/ - .nav-unshown { - display:none; - } - -/*アイコンのスペース*/ - #nav-open { - display: inline-block; - width: 125px; - height: 125px; - vertical-align: middle; - padding-left: 40px; - padding-top: 40px; - } - -/*ハンバーガーアイコンをCSSだけで表現*/ - #nav-open span, #nav-open span:before, #nav-open span:after { - position: absolute; - height: 5px;/*線の太さ*/ - width: 50px;/*長さ*/ - border-radius: 3px; - background: #fff;/*color*/ - display: block; - content: ''; - cursor: pointer; - - } - #nav-open span:before { - bottom: -16px; - } - #nav-open span:after { - bottom: -32px; - } - -/*閉じる用の薄黒カバー*/ - #nav-close { - display: none;/*はじめは隠しておく*/ - position: fixed; - z-index: 99; - top: 0;/*全体に広がるように*/ - left: 0; - width: 100%; - height: 100%; - background: black; - opacity: 0; - transition: .3s ease-in-out; - } - -/*中身*/ - #nav-content { - overflow: auto; - position: fixed; - top: 0; - left: 0; - z-index: 9999;/*最前面に*/ - width: 90%;/*右側に隙間を作る*/ - max-width: 500px;/*最大幅*/ - height: 100%; - background: #006e6f;/*背景色*/ - transition: .2s ease-in-out;/*滑らかに表示*/ - -webkit-transform: translateX(-105%); - transform: translateX(-105%);/*左に隠しておく*/ - div{ - list-style: none; - text-align: right; - a{ - display: block; - color: white; - text-decoration: none; - line-height: 125px; - padding-left: 25px; - padding-right: 25px; - height: 125px; - font-size: 35px; - } - a:hover{ - transition:all 0.5s; - background-color: #5f9ea0; - } - } - } - -/*チェックが入ったらもろもろ表示*/ - #nav-input:checked ~ #nav-close { - display: block;/*カバーを表示*/ - opacity: .5; - } - - #nav-input:checked ~ #nav-content { - -webkit-transform: translateX(0%); - transform: translateX(0%);/*中身を表示*/ - box-shadow: 6px 0 25px rgba(0,0,0,.15); - } - -} - -/************* フッター ********************/ - -.footer { - text-align: right; - border-top: solid 2px #eaeaea; - color: #777; - margin-left: 15px; - a{ - color: red; - &:hover { - color: blue; - } - } - ul { - float: right; - list-style: none; - li { - float: left - } - } -} - -/************* パーシャル ********************/ - -.detail { - font-size: 28px; - word-wrap: break-word; -} - -.list { - font-size: 16px; -} diff --git a/app/assets/stylesheets/.#home.scss b/app/assets/stylesheets/.#home.scss deleted file mode 120000 index 833f6f9c..00000000 --- a/app/assets/stylesheets/.#home.scss +++ /dev/null @@ -1 +0,0 @@ -ubuntu@poipoi-1.1249 \ No newline at end of file diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp deleted file mode 100644 index b2649e042b3d1ba7a836fd36f99b4e5a5dd8af54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 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 diff --git a/app/views/topics/.index_smart_phone.html.erb.swp b/app/views/topics/.index_smart_phone.html.erb.swp deleted file mode 100644 index 3e0e2eb7478c413cf8b5405053e74dbc35d7bf6f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J#5oJ6vwZ?!bd3r#tv6kRgkFTq^(rcx)H5d7#J8}0V%q~*VyXCw(N6489=2H z5+71o+695s1(*;L8wIg5ATc4t7-(T&Ltm0KHTGvVHgb-t*7zMT&BT z%-NHt=xBO`z&Jq2`Mb}~t)&Th*-c1L2y7XI3mXsDvEZX-H?|_=Qp2HUav_|&WpJi3 z*VQT(ulkyFT&w77mTmA0dB4m&nRiXc=4n%wMVfnsUwOxMB!C3gB@oDI^;kC<9?E7y zn|`H_9y)ktU2|MO0!RP}AOR$R1dsp{KmthM|05vXE^-+jYe)2Gz0t9&?HFC+0SO=h zB!C2v01`j~NB{{S0VIF~kN^_+2MI8P5OX&npF!dO|MBntPd$XZ0H+u+q0a^wf1@(e@K)XO+qu6i5_&AUN z5;M;}ZP{Aa0+A@3M1|R`qFR!dRZ&uMI-{n?rzeznld{dL zN?ePfrLgQ7C0CojQJa5SyYggp>CuOK3#-=`*B(6AHI|FoOz%_GW=#q!>7W$~YBlr* zFO#Nz>JT~x!Z%)a-euB+P7AvN8YoT$Onf;jI7~qkI^Gzqnh;@}7Fcnn1hs7&YP8Uw z$xKa7ofr>WO^4RYscHg9XOamR{m_LYofxRWBvYkRDhXciO#m}@r#AQS-O5q}21Fqn zaA*rLyr~fH7Z*M*-~1E*L!0uycI)cu{Nq3IpY8D9tk+IblR~t|&;yaE6dJx`0PjaN doUCwHZG5dH=jt2j)%r$yxFfkzW|j?8-vJ1iE^hz; From 536ff5b3e66739e6bb5b9942df90e2affcd8e44a Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 08:40:50 +0000 Subject: [PATCH 17/22] Link and tool url --- app/assets/stylesheets/.home.scss.swp | Bin 0 -> 24576 bytes app/assets/stylesheets/home.scss | 1 + app/views/layouts/._header.html.erb.swp | Bin 12288 -> 12288 bytes .../layouts/._header_smart_phone.html.erb.swp | Bin 0 -> 12288 bytes app/views/layouts/_header.html.erb | 4 ++-- 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/.home.scss.swp create mode 100644 app/views/layouts/._header_smart_phone.html.erb.swp diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp new file mode 100644 index 0000000000000000000000000000000000000000..ca591ab0e907cfb43066038e0e864727f9ac4884 GIT binary patch literal 24576 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 RORbG_SySC*x<6IN{0}VeJO}^) literal 0 HcmV?d00001 diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 3dac92f5..fb97c17a 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -267,6 +267,7 @@ html { color: #fff; font-size: 60px; padding-left: 0; + text-decoration: none; } } div{ diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp index d5b59a6ef200ceef2e35590f4104f15b1bb893b0..56c0c85ca0223dbef6f4de11c49d61aee72506d6 100644 GIT binary patch delta 311 zcmXxeuS)}Q9LDiy+nxL2Z5qUIg1Zw$*>^i84lIUMl~qA3L(Cd22ksBh^aZh-#x%$k z5d=Y#Hd&u#D2hb{L4&>xe&EFe4^Q}X+MTw)RbO9e1xryw+_?05d9|4}QcyVeU&`*# zk=|@RSlpj1N!_9pBZF&CI>QdC@KJ<^_fhEqJse>J6L=~}eH>s79`5qe1-dxIE-D!2 zq+{%1CZ|;mveGunDB)*>*YJn|`nbm}Zg7Go#vpvU?D3VP!e=M>o~^sia#*WbV;X5< fp*o$!<}{u8>*k{W&c-IRer3wG=9|e!=CfB;{<^oAksaEeV#N>U#e2us>l zHY*)t4K-Ad&qzPWFvbX<_`m>rsG|yl+@u9>>ZMsLG%jfyx7t~EH@4<_wwYdcu8OW@ LqyLfi>}BB(u(&tT diff --git a/app/views/layouts/._header_smart_phone.html.erb.swp b/app/views/layouts/._header_smart_phone.html.erb.swp new file mode 100644 index 0000000000000000000000000000000000000000..15d9f3f013bbd12fcdc6241d3b20e678a37a0d38 GIT binary patch literal 12288 zcmeI%yAFad7>42M;$$>>10H6nr^IV;aMYEQ&;$~Y28zZ-FV#y?5FODS-v-*i|EJCO zYy@w9*zQIfXDy1+FQ;mZJ3{1Mezf`LP5o+;u()Q6`i`n{tu~Z_j-td3eXXQ2MxH`_ z&Sa!6Np3Ug23q+#b+cHd)-^$L)J|aI$kD0y>j3HqAn-+?yI(CA^Ri(&8IOj8{g+-! z2q1s}0tg_000Iag&@=&STH;oOYQKZEYSyOZCJzD#Ab&UHM|)6 literal 0 HcmV?d00001 diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 6da1fc50..35a8c015 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -7,7 +7,7 @@ <% if logged_in? %>
    <%= link_to current_user.name, user_path(id: current_user) %>
    <%= link_to 'ニーズ', topics_path %>
    - + <% if current_user.admin? %>
    <%= link_to 'ユーザーリスト', users_path %>
    <% end %>
    <%= show_notice_link %>
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    @@ -23,7 +23,7 @@
    <% if logged_in? %>
    <%= link_to 'ニーズ', topics_path %>
    - +
    <%= show_notice_link %>
    <% else %> Hello Idea From 405f1487518a6d79d8de08dd3a0840986e5375ef Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 08:48:05 +0000 Subject: [PATCH 18/22] Delete swp files --- app/views/layouts/._header.html.erb.swp | Bin 12288 -> 0 bytes .../layouts/._header_smart_phone.html.erb.swp | Bin 12288 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/views/layouts/._header.html.erb.swp delete mode 100644 app/views/layouts/._header_smart_phone.html.erb.swp diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp deleted file mode 100644 index 56c0c85ca0223dbef6f4de11c49d61aee72506d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O^6&t6vr!mCDGkPR6KaG(qUOYwx?%T-I&?gRRW5O81SI7C=4~zH8aijR5#r{ z`vHrZX%B)CZ!tmepb|_%Fe*rl3c`BQn*=;YXkrxg;zjVH|LTvK&hE^9cnBJ*+5dJ= zb=Rx+e)a10EL+v$^Rv&;1BHhPj@t?O^}<&#?tG9CdMhFAYFh+td1K?lbu9eo;~PIk z$jgaAqseXCsaPgw26J6w!QzX)VY6kY9r#A2$(hN$LNjRD1@2WhGpg<@0*b)q1lmDe ze{`5UG%;S35AWCZ(L3*WZu5TX2}M8=Py`eKML-cy1QY>9KoPiZ2n6m9@(QB4A&qD% zJ?~g^PCu%XBA^H;0*Zhlpa>`eihv@Z2q*%IfFhs>{0|8*laR|d5%T-Za325v&;I`Z zVJ{)8&}qnmW}#isZ+i$i0lfs>4V@Y$WCgkr`g(|vvygzspnITUXbAe_HbTCK&OpbY zIp{9v3icUXgpNW_LqpKFy9qfDor2zk9Owb)@-9M-LyM3GUD`>A3Ed0rf&RV)aX>#p zm!ON#chEP`D)c_|IJ6fc(4UA|#{HL!T^)*mBA^Id&jiXNlnaxN%n(Y;hG{Lx3tWy& z)0W>z+VPRmn$3KFTC3TP&oyeYfa#{?w=CJnZ0-fx%<9`^gT;nmC+iU3qw#NDS`C(6 z4zn8dgJqjfYc1wAEK#ERMA2QMQsekFMO|i^mS~jd_#<&!di_gT*Ori$gypH{#7=A6|6i z!|2FIFsKfvjr_FgGM5_MtXSePndKRf zH956DmHXw`Psh&veDbX;C%*XQ=qH$E!58Bh8l1t*xzJnU4pgvpn*nJ9cMUb$xy7i5vp^}ZwK>c$(gOXmVe299gh{52?d zZuJ5Pomv#0i#`@!UhQoFb^G^LZ4$8-?#g;qfR8qwrPfa!TpHpJ6iT z2TyDc^ES(KpR~U=#ko817LroFy-*$Ug|)!UR#GOqhH?<_YC^7k7ANWHc;@AsN|xz0 zY1g-wAX^fn*$ObO%@WA!U2er@F42M;$$>>10H6nr^IV;aMYEQ&;$~Y28zZ-FV#y?5FODS-v-*i|EJCO zYy@w9*zQIfXDy1+FQ;mZJ3{1Mezf`LP5o+;u()Q6`i`n{tu~Z_j-td3eXXQ2MxH`_ z&Sa!6Np3Ug23q+#b+cHd)-^$L)J|aI$kD0y>j3HqAn-+?yI(CA^Ri(&8IOj8{g+-! z2q1s}0tg_000Iag&@=&STH;oOYQKZEYSyOZCJzD#Ab&UHM|)6 From c3ff51b56a192fd108268d96431e835d0ef99811 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 09:00:14 +0000 Subject: [PATCH 19/22] Add file --- app/assets/stylesheets/.home.scss.swp | Bin 24576 -> 16384 bytes app/views/layouts/._header.html.erb.swp | Bin 0 -> 12288 bytes .../layouts/_header_smart_phone.html.erb | 60 ++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 app/views/layouts/._header.html.erb.swp create mode 100644 app/views/layouts/_header_smart_phone.html.erb diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp index ca591ab0e907cfb43066038e0e864727f9ac4884..9b447fd4873aeb1e048d843d92adb7493b59f58e 100644 GIT binary patch delta 315 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 RORbG_SySC*x<6IN{0}VeJO}^) diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp new file mode 100644 index 0000000000000000000000000000000000000000..88bc9197f79b594cc1e02c56648f9fb10aed921e GIT binary patch literal 12288 zcmeI2O^6&t6vr!mCDGkPR6KaG(qUOYcBW@n-H_SYRRW5O81SI7C=4~zH8aijR5jf_ z`vHrZX%B)CZ!tmepb|_%Fe-?N3c`BQn*=;YXkrxO#fwM%SAWcQW@p!34?#mU`=9RV z?t1m!uU@_GWvW(sVfI;ip!g`kb|)dfUHJN?oevXY>?NdA>xiJEE^NNJ(#Bt5eDk{q zc_lGuwz%WSs%>#*GS@X1Y`*B54qKL;z&EQc&MfW~TS40?aFyx-VI@4oB#EwAgz1093rpnISz zw-a&^Ito1l4ME@SCgcm~6!aD(p@*Q$y9hZBEkXu#X(u5TbU(BQ`s+5t0sRDBf-XYe zL*GKH&(rc>N3l+MYBxDAB)e$S8zB*jTr*38}O%9F=Bt6EqfvM^>Yj_b??>H} zQTWE_7Oz~KpW7h^3`qb?okmFfOQU_i{laKkbIfr6#wkws>4+c?P5}r`D(P zpd9=8*tuU$zJ2Aym%kqU6r(KoVmx9S=IO?%{vmP|7T}vLw$Xf>nO0HgGlI#2&_c~) z!kWOSGTQQZW7;r{nb<5<8LWy?I$~?6Q0^RG6`0SWIK)QC_??btJ(+tQJ zT))lSbj2)!@YiNeoM34g&)uZTDT0c+=cDkwD10{xk4Iq`g|8`>Q%e8+3{y$J@xbOV zZ?ilPNc-zkoO>N_At}|<3)LZCSc}YRCuO2%C6+00#Y1Pa$u*$6(QOnjg{rS^Z8$CSb#3#qrfNz&IoF$y opBnkoc$HF +
    +
    +
    Hello Idea
    +
    +
    <%= link_to 'HelloIdeaとは', "/detail" %>
    + <% if logged_in? %> +
    <%= link_to current_user.name, user_path(id: current_user) %>
    +
    <%= link_to 'ニーズ', topics_path %>
    + + <% if current_user.admin? %>
    <%= link_to 'ユーザーリスト', users_path %>
    <% end %> +
    <%= show_notice_link %>
    +
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    +
    <%= link_to 'ログアウト', logout_path %>
    + <% else %> +
    <%= link_to 'ログイン', login_path %>
    +
    <%= link_to '新規登録', new_user_path %>
    + <% end %> +
    + + +
    +
    + <% if logged_in? %> +
    <%= link_to 'ニーズ', topics_path %>
    + +
    <%= show_notice_link %>
    + <% else %> + Hello Idea +
    <%= link_to 'HelloIdeaとは', "/detail" %>
    +
    <%= link_to 'ログイン', login_path %>
    +
    <%= link_to '新規登録', new_user_path %>
    + <% end %> +
    + <% if logged_in? %> + + <% end %> +
    + +
    +
    +
    + +<% flash.each do |type, msg| %> +
    + × + <%= msg %> +
    +<% end %> + From abddac07e78e696e726c3639a801c6acbae673f5 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 09:40:03 +0000 Subject: [PATCH 20/22] Complete all header repair --- app/assets/stylesheets/.home.scss.swp | Bin 16384 -> 28672 bytes app/assets/stylesheets/home.scss | 60 +++++++++++++++++- app/views/layouts/._header.html.erb.swp | Bin 12288 -> 12288 bytes .../layouts/._header_smart_phone.html.erb.swp | Bin 0 -> 12288 bytes app/views/layouts/_header.html.erb | 11 ++-- .../layouts/_header_smart_phone.html.erb | 21 +----- 6 files changed, 66 insertions(+), 26 deletions(-) create mode 100644 app/views/layouts/._header_smart_phone.html.erb.swp diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp index 9b447fd4873aeb1e048d843d92adb7493b59f58e..01a6baa97ee8b3def740c173379abe1e494bd240 100644 GIT binary patch literal 28672 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 delta 81 zcmZp8z}V2hD3)Xp=IN_ou4lpk1Of~U>v!#qKBuu!>@xGj1lG;(m_>LPnI|&~sB->? af(?@m1;jc2L3x`e2o&&7+~BZCK>+}~KO-#w diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index fb97c17a..9dce0337 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -201,6 +201,7 @@ html { .header{ width: 100%; + min-width: 500px; height: 100px; .header-brand a{ float: left; @@ -237,6 +238,9 @@ html { .smap_header{ display:none; } + .hamburger_header{ + display: none; + } } /*width:1200px 以下*/ @@ -245,10 +249,62 @@ html { padding: 0; } - .header{ + .smap_header{ height: 125px; } + .hamburger_header{ + display: inline; + .header_brand{ + padding-left: 20px; + float: left; + a{ + line-height: 100px; + color: #fff; + font-size: 60px; + padding-left: 0; + text-decoration: none; + float: left; + } + } + } + .hamburger_header_list{ + float: right; + height: 100px; + display: inline; + padding-right: 20px; + .header_brand{ + float: left; + a{ + line-height: 100px; + color: #fff; + font-size: 60px; + padding-left: 0; + text-decoration: none; + float: left; + } + } + div{ + list-style: none; + float: left; + a{ + display: block; + color: white; + text-decoration: none; + line-height: 100px; + padding-left: 12px; + padding-right: 12px; + height: 100px; + float: left; + } + a:hover{ + transition:all 0.5s; + background-color: #5f9ea0; + } + } + } + + .header-brand{ display: none; } @@ -260,7 +316,7 @@ html { float: right; height: 125px; display: inline; - span{ + .smap_header_brand{ float: left; a{ line-height: 125px; diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp index 88bc9197f79b594cc1e02c56648f9fb10aed921e..34bab3ebe1457cd8d87ff66f2c31cf13c5845f86 100644 GIT binary patch delta 377 zcmZ9`JuCwO6bJCv++AB#v=TQoIjKrD{Wu|M!XRhUcCZ+TG}7K_sRYAmM|8kQ;zgtu zV!2gw(@BKMM+^oFiP0t%36semv3SWZ?+x#(R;U$ZV_-5n9vbRT5yDS&esz|6OEu(s zL8?~f)M5Ko2>V=`9q_+*w6jQLNxzL62SQWpA8kZ;V8apQAPWk3;kK1%3#MTVB)DuL z+5i(~Aq_Ej_7WY!1PsEHho}zS@aQJG1_vxSfV!Kaw2fjD)?gK8;1e(2z$rAql5Cf_ zD{?d9v6~S~Wai5yy@<59uu=*0OP|8~@lJQ%F!kjk spTtLbFBas7gfIDjBCOF!kE&+=7KJiDi&Rx3Vpp^aC;9uV?IhE}7g}OnasU7T delta 345 zcmZojXh;xCG6?hZRWR2xVE_UF28P$W_C~X7Zxp-CJTZZF^E+lG9!BfUf&!oUd7rW{ zFuY}jsIs0cs1RQNiJO7p5)iKj;%Pt}3B)2m{G5w{;R+D<0I@d^^8oQFP6mb@K)e!& zdx1C~h_!(DDF*|?3?MECVkIEH&(6S*0>tt_%m>8(*?_hJ@dF^f55!l1_%sk7VPlYI zI1FSg24V*w<_BU1ApQ#hO67y1wCf8`& zPwvs=p4_jiJh@+Mk!NvkVnKXHYGO)iQG8Bjafy;0g8~@Xq-2&UBEFCpvSee>MkhY9%%<94lW`EBuH{N>mNesa^}tq6H3 zCRBB9ns(LDI8&M9s7nT4_EeLt+HK!ct2$>IcdK5Dxqj8rZHwo1zh&mRTiY&xd@mJ{ z3S=wL_8YmQd&uFL>4GqrP!7-s_MObOm9tU-sen{KDj*e*3P=T{0#X5~z%8kO@9ZL{ zQQ2+X>JE1AySCiBkMbrJkP1izqyka_sen{KDj*e*3P=T{0#X5~!2eJIrV$d}Maa9m zkv#tApZxv*%l(901>Of<1!}-?U^j5>K0?j`>%dXq#vVex0G0p^I0?)F`+=YDCFFJB zF<=7t@g71pfW5#EcN202xCERB&H@`i2Y3N^9(WeGf!w|aJ_kMoE&?LoP2d9XBCrO` z1N(trQO~!)B9I5J-w8fo0r=?-Lf!yQ1CIj#+)l_}z;A%Oqyka_slctSKxuND3QLoe zz$pD0ZC)DnD)mi*CHGMdBHH*XqNLo?Xq4JmV^P8QYtSOAj?^Lwyp0-J1pNtYTU|!| zTjIu#32BM^myjtn=+e|i5ssQqQi(YR(n~q}YzBwhTBPz1`t9tg7bPiTAkCeT3F{u= zfbWRu0h{_#c?`ZTpCs_Sehl5t3p1*4HvVxkzx#$gs^HixoDcV3jdY-eoPBojZ3ED#<6I8`J~yzL83sz zBybNt4Lcu)!Pha#lunpu?B$Q_N&FZYFIdtlE~R+sl^HbBmi3 zI>j`G<+MRk!U15oW{@TEY=?tp$j@__1@G={m?Yv)qsP&r2FE(ld3~{FuP9jw_c9r% zT65Vlcl(M)n;Q+$OHHm-4eJrn+KC`rda8dNrzS%^_WPTcuW!Eg$N8`RJo^d0vc;F9 zFE+AIN4NS#^ePyTn_=z1eTSV^64ECM;?%a2oZzmx%+l~>8P#3hC@ZQ`iKwaQVzCQ# zzgkZ&>~p3kcAj*qZzYR9s#>;h)Ol5`>Wl_09mwUnOFs$PLJrKtQF2c;ERC-yl`vS3 zR_~=a1)+Z~ml?5d@7NG7ohwk&w;iMIjgWI}Gl<30-J$zsG7Yb{h@xH_HWJ$@Y70AG zhQZrma3Kud3WFdFUXC;G_rjhmtVOWy?p
    - -
    -
    + +
    + <% if logged_in? %> + <% else %> + Hello Idea + <% end %> +
    <% if logged_in? %>
    <%= link_to 'ニーズ', topics_path %>
    <%= show_notice_link %>
    <% else %> - Hello Idea
    <%= link_to 'HelloIdeaとは', "/detail" %>
    <%= link_to 'ログイン', login_path %>
    <%= link_to '新規登録', new_user_path %>
    diff --git a/app/views/layouts/_header_smart_phone.html.erb b/app/views/layouts/_header_smart_phone.html.erb index 8f131560..856bfa92 100644 --- a/app/views/layouts/_header_smart_phone.html.erb +++ b/app/views/layouts/_header_smart_phone.html.erb @@ -1,23 +1,5 @@
    -
    -
    Hello Idea
    -
    -
    <%= link_to 'HelloIdeaとは', "/detail" %>
    - <% if logged_in? %> -
    <%= link_to current_user.name, user_path(id: current_user) %>
    -
    <%= link_to 'ニーズ', topics_path %>
    - - <% if current_user.admin? %>
    <%= link_to 'ユーザーリスト', users_path %>
    <% end %> -
    <%= show_notice_link %>
    -
    <%= link_to 'アンケート', 'https://goo.gl/forms/QrNsbvBYoYa6WB7N2', style: "color: #ff9190;"%>
    -
    <%= link_to 'ログアウト', logout_path %>
    - <% else %> -
    <%= link_to 'ログイン', login_path %>
    -
    <%= link_to '新規登録', new_user_path %>
    - <% end %> -
    -
    @@ -26,7 +8,7 @@
    <%= show_notice_link %>
    <% else %> - Hello Idea + Hello Idea
    <%= link_to 'HelloIdeaとは', "/detail" %>
    <%= link_to 'ログイン', login_path %>
    <%= link_to '新規登録', new_user_path %>
    @@ -47,7 +29,6 @@ <% end %>
    -
    From ea415e8a9326fcde37f85c02d359ec3f5777b7b8 Mon Sep 17 00:00:00 2001 From: MasatoshiOsugi Date: Wed, 10 Oct 2018 09:44:25 +0000 Subject: [PATCH 21/22] Delete swp files --- app/assets/stylesheets/.home.scss.swp | Bin 28672 -> 0 bytes app/views/layouts/._header.html.erb.swp | Bin 12288 -> 0 bytes .../layouts/._header_smart_phone.html.erb.swp | Bin 12288 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/assets/stylesheets/.home.scss.swp delete mode 100644 app/views/layouts/._header.html.erb.swp delete mode 100644 app/views/layouts/._header_smart_phone.html.erb.swp diff --git a/app/assets/stylesheets/.home.scss.swp b/app/assets/stylesheets/.home.scss.swp deleted file mode 100644 index 01a6baa97ee8b3def740c173379abe1e494bd240..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 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 diff --git a/app/views/layouts/._header.html.erb.swp b/app/views/layouts/._header.html.erb.swp deleted file mode 100644 index 34bab3ebe1457cd8d87ff66f2c31cf13c5845f86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2ONbmr7{@DWbfZ}n1rLH!>9DMU?dh3SH)eKrgn)7PU_e1-i89no*GxCt)7|uA zAFxI;8%0p`ASmla5lJ)>Obi4P6@`EgJa`nrTZ<3y;K7q8|JB_y+q2XA@(@g@VgJ+5 z`s(|B^?lX7Ox26e%sfF479Jw_+)2on-+XcGFB~X$5E9lyI|#*v%|EVV;!iDYeitFf z6N8$;Ez7ByI%gVlU2Wdv3%+KtB_|Agt!8khbFW|oZL7e&`c_8ebxA-H*qT5XG}T9j z$%EsiqPTg#vX9<<*V9|KlXpl0l7J*22}lBxfFvLZNCJ|;bweO$ji_ybOhQBeZ7Z}laL2BpvR#D&@V%TybC=Am7t$*fltu=&`&oL@-1`; zIt{%8twOIuFG0tl7og{%e-QI`&}Ha66f?L6$56T~2}lChCxOZc<+e`K%}A9{TG4cK zUhH6ZWQw-^7LCv2kkN+4e1A%5SdPyXsR@0EV&$J73v2|7N1hu%xjr;nX2POcaaK}@HI(Yrt7BND$~-#@wxa4b|jE9vP^rf7C3Y? zS~(ka&PAQ~qt2;l<(1JfYB?>eKdZScFyLCopTuge5j0=95OvN+E1xGuMvWkF{j#RD z9H-E-w5H>=eeFr_s9&EyJnPJ|iDwTVJUWiuIrs zZU!spq7xrRCq98eMbmk}OiS6O_l?l=xE<6&AB*j5*2b`i-59_Fre3Dm8xG_d6;!FI zPboH=R~wEUz#Im>%L~LTR_9hX!^B;o?HkU5t*kXm@)VpBGp6l^FjB#CKs3!U*6q)6 zIm`^S^Ic}6b-Ece65H?fp7a*yI!eaijk&tBsN^}k=1E`Fy2lo{mkApAX*NYJwYXk0 z?MFqHcY&}^K|1>{{XoP3-HafchG!C znI>Ygd@*tKqRs>*#=d4df!W|SQHeQ8RoSPiX}L0Lc)TfQ9$RM?^RPD5v~|9yRHK!X zam9Ts=COpTs^<2XsrOe!lg?!j2prdJ`0Eht*>vPG6Q#l0_0VgfQj&$Lh{VsP{ot@x zL^gJlDs5Ev5Eb&g8>FUGW6)I8bP`sa!##{SWH;hK+G}O>AAr4b~4%Y3}qnT0f)@L7?;eM zsBXxByRi{ Dpv!=4 diff --git a/app/views/layouts/._header_smart_phone.html.erb.swp b/app/views/layouts/._header_smart_phone.html.erb.swp deleted file mode 100644 index 84b06a0a4e04abdfec1f2d171f6de7ecda91fab9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeHNO^n+_6rLjSQ=m|lV=q&$R!gNO&Te7b%_ad=P|*V`aVV&8h$itQw$`yN+u0vj zD2?|3+DZrxl&TU3s8*l~C?Eusp98J9AaMgEu0~KK?mZwOzOiE`**Mv*I8lwY-+DZL z?|bikelyZ)r&f6S#FO+${vm>EFCpvSee>MkhY9%%<94lW`EBuH{N>mNesa^}tq6H3 zCRBB9ns(LDI8&M9s7nT4_EeLt+HK!ct2$>IcdK5Dxqj8rZHwo1zh&mRTiY&xd@mJ{ z3S=wL_8YmQd&uFL>4GqrP!7-s_MObOm9tU-sen{KDj*e*3P=T{0#X5~z%8kO@9ZL{ zQQ2+X>JE1AySCiBkMbrJkP1izqyka_sen{KDj*e*3P=T{0#X5~!2eJIrV$d}Maa9m zkv#tApZxv*%l(901>Of<1!}-?U^j5>K0?j`>%dXq#vVex0G0p^I0?)F`+=YDCFFJB zF<=7t@g71pfW5#EcN202xCERB&H@`i2Y3N^9(WeGf!w|aJ_kMoE&?LoP2d9XBCrO` z1N(trQO~!)B9I5J-w8fo0r=?-Lf!yQ1CIj#+)l_}z;A%Oqyka_slctSKxuND3QLoe zz$pD0ZC)DnD)mi*CHGMdBHH*XqNLo?Xq4JmV^P8QYtSOAj?^Lwyp0-J1pNtYTU|!| zTjIu#32BM^myjtn=+e|i5ssQqQi(YR(n~q}YzBwhTBPz1`t9tg7bPiTAkCeT3F{u= zfbWRu0h{_#c?`ZTpCs_Sehl5t3p1*4HvVxkzx#$gs^HixoDcV3jdY-eoPBojZ3ED#<6I8`J~yzL83sz zBybNt4Lcu)!Pha#lunpu?B$Q_N&FZYFIdtlE~R+sl^HbBmi3 zI>j`G<+MRk!U15oW{@TEY=?tp$j@__1@G={m?Yv)qsP&r2FE(ld3~{FuP9jw_c9r% zT65Vlcl(M)n;Q+$OHHm-4eJrn+KC`rda8dNrzS%^_WPTcuW!Eg$N8`RJo^d0vc;F9 zFE+AIN4NS#^ePyTn_=z1eTSV^64ECM;?%a2oZzmx%+l~>8P#3hC@ZQ`iKwaQVzCQ# zzgkZ&>~p3kcAj*qZzYR9s#>;h)Ol5`>Wl_09mwUnOFs$PLJrKtQF2c;ERC-yl`vS3 zR_~=a1)+Z~ml?5d@7NG7ohwk&w;iMIjgWI}Gl<30-J$zsG7Yb{h@xH_HWJ$@Y70AG zhQZrma3Kud3WFdFUXC;G_rjhmtVOWy?p Date: Fri, 12 Oct 2018 09:58:35 +0900 Subject: [PATCH 22/22] Fix edit bugs --- app/controllers/users_controller.rb | 2 +- app/models/user.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2cd6f369..326d9bba 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -53,7 +53,7 @@ def edit end def update - if @user.update(user_params) + if @user.update_attributes(user_params) flash[:success] = "更新しました" redirect_to @user else diff --git a/app/models/user.rb b/app/models/user.rb index 8d541dc8..585d0f1d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,8 +7,9 @@ class User < ApplicationRecord #validates :email, {presence: true, uniqueness: true} validates :password, confirmation: true, - presence: { message: 'を入力してください'} - + presence: { message: 'を入力してください'}, + allow_nil: true + has_many :ideas, dependent: :destroy has_many :topics, dependent: :destroy has_many :likes, dependent: :destroy