From 7cb5bdae06a12d7e8a50fc9689fa442eca613807 Mon Sep 17 00:00:00 2001 From: ChengHsuanLiu Date: Tue, 24 Feb 2015 18:45:09 +0800 Subject: [PATCH] navigation bar update --- app/assets/stylesheets/main/main.scss | 16 ++++++++++++++-- app/views/layouts/application.html.erb | 18 ++++++++++++++++-- app/views/pages/faq.html.erb | 22 ---------------------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/main/main.scss b/app/assets/stylesheets/main/main.scss index 142ae5d8..9c531fd6 100644 --- a/app/assets/stylesheets/main/main.scss +++ b/app/assets/stylesheets/main/main.scss @@ -1405,9 +1405,9 @@ footer > p{ } .push-menu-ul > li > a{ color: #ffffff; - font-size: 20px; + font-size: 15px; text-align: left; - padding: 20px 30px; + padding: 15px 30px; width: 100%; transition: background-color 0.5s, color 0.5s; } @@ -1511,3 +1511,15 @@ p.bjqs-caption{ .home-dropdown .select2-arrow > b{ background-position: 0 8px !important; } +.mobile-profile{ + padding-bottom: 20px; + padding-top: 20px; + padding-left: 30px; + + p{ + font-size: 20px; + margin-left: 20px; + margin-top: 8px; + color: #fff; + } +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 55999218..f9d964ac 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -81,15 +81,29 @@
-

Menu

    + <% if current_user.blank? %> +
  • + <%= link_to "登入 / 註冊", user_omniauth_authorize_path(:colorgy), class: 'btn' %> +
    • + <% else %> +
  • +
    + <%= image_tag current_user.avatar_url %> +
    +

    <%= current_user.name %>

    +
    • + <% end %>
  • <%= link_to("書庫瀏覽", books_path) %>
    • -
  • <%= link_to("購物車", cart_items_path) %>
  • <%= link_to("訂單查詢", bills_path) %>
  • <%= link_to("我揪的團", groups_path) %>
  • <%= link_to("使用流程", flow_path) %>
  • <%= link_to("常見問題", faq_path) %>
  • 關於我們
    • + <% if current_user.blank? %> + <% else %> +
  • <%= link_to("登出", "#{ENV['CORE_URL']}/logout") %>
    • + <% end %>
diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb index 8c5b0d49..f351c29a 100644 --- a/app/views/pages/faq.html.erb +++ b/app/views/pages/faq.html.erb @@ -322,28 +322,6 @@

-
-
- <%= image_tag "close.png", class: "faqs" %> -

網購不是有七天鑑賞期嗎，為什麼不能退換書？

-
-
-

- 一般而言，主揪在書籍送達、發書給同學時，都會「向同學再次確認書籍情況無誤」，才會讓同學收下使用。除非在書籍有本身問題、或是老師臨時換課本導致整班買錯書籍時，我們才會受理退換貨。因為我們有請主揪再向大家確認商品狀態是否無誤，原則上就已經「不具有網路購物無法確認貨品狀態的風險」，故我們無法受理。 -

-
-
-
-
- <%= image_tag "close.png", class: "faqs" %> -

我可以叫別人幫我拿書嗎？

-
-
-

- 可以！主揪發書確認的是購書紀錄，不用本人到場。 -

-
-