Some mobile layout improvments

- Cleanup - Fixed siedebar buttons - Removed back buttons from mobile version
guluc3m · Oct 21, 2016 · 7aa9194 · 7aa9194
1 parent 19cd80b
commit 7aa9194
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 32 deletions.
diff --git a/app/views/events/new.html.haml b/app/views/events/new.html.haml
@@ -1,14 +1,6 @@
 - page_title t("event.new_event")
 = render partial: "breadcrumbs"
 
--# TODO: create helper or partial for this block
-.row
-  .visible-for-small-down
-    .large-3.columns
-      = link_to conference_path(params[:conference_id]), { class: "button tiny radius expand" } do
-        %span.fa.fa-chevron-left.fa-fw.fa-lg
-        = t("back").humanize
-
 .row
   .large-12.columns
     %h1.subheader

diff --git a/app/views/events/new_detailed.html.haml b/app/views/events/new_detailed.html.haml
@@ -1,14 +1,6 @@
 - page_title t("event.new_event")
 = render partial: "breadcrumbs"
 
--# TODO: create helper or partial for this block
-.row
-  .visible-for-small-down
-    .large-3.columns
-      = link_to conference_path(params[:conference_id]), { class: "button tiny radius expand" } do
-        %span.fa.fa-chevron-left.fa-fw.fa-lg
-        = t("back").humanize
-
 .row
   .large-12.columns
     %h1.subheader

diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
@@ -157,12 +157,6 @@
   .large-12.columns
     %hr
 
-  .visible-for-medium-down
-    .medium-4.columns.left
-      = link_to conference_path(@conference), class: "button radius expand" do
-        %span.fa.fa-chevron-left.fa-fw.fa-lg
-        = t("event.back_to_events").humanize
-
   - unless @event.cancelled
     - if @conference.voting_enabled
       .medium-3.columns.right

diff --git a/app/views/events/vote.html.haml b/app/views/events/vote.html.haml
@@ -43,9 +43,3 @@
           .large-4.columns
             = submit_tag t("vote.send_vote"), class: "button radius success expand"
 
-    .row
-      .show-for-medium-down
-        .large-4.columns
-          = link_to conference_event_path(@conference, @event), { class: "button radius expand" } do
-            %span.fa.fa-chevron-left.fa-fw.fa-lg
-            = t("event.back_to_event").humanize
diff --git a/app/views/layouts/_aside_offcanvas.haml b/app/views/layouts/_aside_offcanvas.haml
@@ -18,6 +18,10 @@
       // TODO: localize
       %label Options
       %br
-        - if Conference.find_by(call_for_papers_enabled: true)
-          = link_to t("conference.propose_event"), new_conference_event_path(Conference.find_by(call_for_papers_enabled: true)), { class: "button success tiny radius" }
-        = link_to "Admin", admin_path, { class: "button secondary tiny radius"}
+      - if Conference.find_by(call_for_papers_enabled: true)
+        .row
+          .small-12.columns
+            = link_to t("conference.propose_event"), new_conference_event_path(Conference.find_by(call_for_papers_enabled: true)), { class: "button success tiny radius" }
+      .row
+        .small-12.columns
+          = link_to "Admin", admin_path, { class: "button secondary tiny radius"}
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
@@ -4,7 +4,7 @@
     %nav.tab-bar{"data-topbar" => "", role:"navigation", "data-options" => "sticky_on: small"}
       %section.middle.tab-bar-section
         .row
-          %div{:class => (defined?(conference) ? "large-2 columns" : "large-12 columns")}
+          %div{:class => (defined?(conference) ? "large-2 small-6 columns" : "large-12 columns")}
             = link_to root_path do
               = image_tag("/favicon-32x32.png", height: '32', width: '32', alt: "GulTalks ", style: "float:left; margin-top: 6px;")
               %h1.title