diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 38a669a..4d94f29 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -14,6 +14,11 @@ *= require_self */ +.main_div { + background-color: #fff; + border-radius: 30px 30px 30px 30px; +} + .main_application { position: absolute; top: 8px; @@ -22,9 +27,7 @@ right: 8px; overflow: scroll; - - background-color: #fff; - border-radius: 8px 8px 8px 8px; + background-color: #888; } .header_layout { @@ -37,3 +40,7 @@ margin-right: 10px; float: right; } + +.main_footer { + padding-top: 30px; +} diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index 953b605..9aa7d62 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -7,6 +7,7 @@ width: 90vw; margin-top: 20px; position: relative; + margin-left: -20px; } .br:before { @@ -29,5 +30,5 @@ } .landing_img { - padding-right: 70px; + border-radius: 30px 30px 30px 30px; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dd28514..0f6cc12 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,33 +7,36 @@ <%= csrf_meta_tags %> +
-
- - <%= link_to image_tag("main_logo.png"), root_path %> - - - <% if user_signed_in? %> - - - Logged in as <%=link_to current_user.username, bots_path(current_user.username)%> - <%= link_to 'プロフィール変更', edit_user_registration_path(current_user.username) %> | - <%= link_to "ログアウト", destroy_user_session_path, method: :delete %> - <% else %> - <%= link_to image_tag("signin_with_twitter_logo.png", :size => "188x30", :class => "twitter_layout"), user_omniauth_authorize_path(:twitter) %> - <% end %> -
-
+
+ + <%= link_to image_tag("main_logo.png"), root_path %> + + + <% if user_signed_in? %> + + + Logged in as <%=link_to current_user.username, bots_path(current_user.username)%> + <%= link_to 'プロフィール変更', edit_user_registration_path(current_user.username) %> | + <%= link_to "ログアウト", destroy_user_session_path, method: :delete %> + <% else %> + <%= link_to image_tag("signin_with_twitter_logo.png", :size => "188x30", :class => "twitter_layout"), user_omniauth_authorize_path(:twitter) %> + <% end %> +
+
- <%= yield %> + <%= yield %> -
+
+ + - +