Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Edit layout

  • Loading branch information...
commit 776d05199265e43c69499bb73e9b850a45d45958 1 parent 8d7dac2
Hiroshi Shimoju authored
42 app/assets/stylesheets/base.css.scss
View
@@ -1,44 +1,7 @@
// Common Style & Layout
-html,
-button,
-input,
-select,
-textarea {
- color: #222;
-}
-
-body {
- font-size: 1em;
- line-height: 1.4;
-}
-
-hr {
- display: block;
- height: 1px;
- border: 0;
- border-top: 1px solid #ccc;
- margin: 1em 0;
- padding: 0;
-}
-
-img {
- vertical-align: middle;
-}
-
-fieldset {
- border: 0;
- margin: 0;
- padding: 0;
-}
-
-textarea {
- resize: vertical;
-}
-
#notice {
background: #eee;
- font-size: 80%;
left: 50%;
margin: 0 0 0 -100px;
padding: 5px;
@@ -47,8 +10,3 @@ textarea {
top: 0;
width: 200px;
}
-
-#wrapper {
- margin: 0 auto;
- width: 960px;
-}
27 app/views/layouts/application.html.slim
View
@@ -1,12 +1,20 @@
doctype html
-html id=controller.controller_name
+html
head
+ meta charset="utf-8"
+ meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
+ meta name="viewport" content="width=device-width, initial-scale=1.0"
title= @title ? "Zoomix / #{@title}" : 'Zoomix'
- = stylesheet_link_tag "application", :media => "all"
- = javascript_include_tag "application"
+ meta name="description" content="Zoomix : Always by your side."
= csrf_meta_tags
- body
- #wrapper
+
+ / Le HTML5 shim, for IE6-8 support of HTML elements
+ /[if lt IE 9]
+ = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
+ = stylesheet_link_tag "application", :media => "all"
+
+ body class=controller.controller_name
+ .container
header
h1= link_to image_tag('logo.png', alt: 'Zoomix', width: 240), root_path
p Always by your side.
@@ -16,7 +24,8 @@ html id=controller.controller_name
li= link_to 'ログアウト', destroy_user_session_path, method: :delete
- else
li= link_to 'ログイン', user_omniauth_authorize_path(:twitter)
- #main
+
+ .main
= yield
footer
@@ -26,3 +35,9 @@ html id=controller.controller_name
p#notice= notice
- if alert
p#alert= alert
+
+ /!
+ Javascripts
+ \==================================================
+ / Placed at the end of the document so the pages load faster
+ = javascript_include_tag "application"
Please sign in to comment.
Something went wrong with that request. Please try again.