logaling/logaling-server [master] Add style to body (logaling-commit) - logaling

SUZUKI Miho	2012-09-26 15:02:36 +0900 (Wed, 26 Sep 2012)

  New Revision: b01b4ff362b659e5ce61c65c9904dd735ec07a6a
  https://github.com/logaling/logaling-server/commit/b01b4ff362b659e5ce61c65c9904dd735ec07a6a

  Merged ef3396d: Merge pull request #17 from logaling/apply-design

  Log:
    Add style to body

  Modified files:
    app/views/layouts/application.html.haml

  Modified: app/views/layouts/application.html.haml (+17 -17)
===================================================================

--- app/views/layouts/application.html.haml    2012-09-26 14:54:47 +0900 (3da6e7c)
+++ app/views/layouts/application.html.haml    2012-09-26 15:02:36 +0900 (ac7760d)
@@ -16,31 +16,31 @@
     %link{:href => "images/apple-touch-icon-114x114.png", :rel => "apple-touch-icon", :sizes => "114x114"}/
 
   %body
-    .navbar.navbar-fixed-top
-      .navbar-inner
-        .container
-          = link_to "logaling", root_path, :class => 'brand'
-          = form_tag search_path, :method => :get, :class => 'navbar-search pull-left' do
-            = text_field_tag :query, @query, :class => 'search-query', :placeholder => 'Search'
-            = submit_tag 'Search', style: 'display: none'
-          %ul.nav.pull-right
+    <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
+    %header.container
+      .row
+        .span4
+          .brand
+            = link_to image_tag('commonLogo.png', { :alt => 'logalingけんさく'}), root_path, :class => 'brand'
+        %nav.span4
+          = form_tag search_path, :method => :get, :class => 'form-search' do
+            .input-append
+              = text_field_tag :query, @query, :class => 'search-query', :placeholder => '単語/フレーズを入力'
+              %button.btn{ :type => 'submit' }
+                検索
+        %nav.span4
+          %ul.userNav
             - if signed_in?
               %li= link_to current_user.name, dashboard_path
-              %li.divider-vertical
-              %li= link_to "Sign out", signout_path
+              %li= link_to "サインアウト", signout_path
             - else
               - if Rails.env.development?
-                %li= link_to "Sign in (for dev)", "/auth/developer"
-              - %w(github facebook twitter).each do |provider|
-                %li= link_to "Sign in with #{provider.capitalize}", "/auth/#{provider}"
+                %li= link_to "用語を登録（サインイン）(for dev)", "/auth/developer"
 
     .container
       - [:notice, :alert, :error].map {|k| flash[k] }.reject {|msg| msg.blank? }.each do |msg|
         %p= msg
-      .content
-        .row
-          .span12
-            = yield
+      = yield
 
       %footer
         %p &copy; logaling project
-------------- next part --------------
An HTML attachment was scrubbed...
Download 


logaling

[logaling-commit] logaling/logaling-server [master] Add style to body