Merge pull request #4854 from Flaburgan/fix-mobile-drawer

Fix mobile drawer

app/assets/stylesheets/mobile/header.css.scss

@@ -59,7 +59,7 @@ header {
   position: fixed;
   top: 0;
   bottom: 0;
-  width: 80%;
+  width: 100%;
   left: 100%;
   background-color: #444;
   
@@ -70,13 +70,17 @@ header {
   -webkit-box-shadow: -2px 0px 2px 1px #333;
 
   header {
-    width: 80%;
+    position: static;
+    left: 100%;
+    right: -80%;
     
     #global_search {
-      margin-left: 10px;
+      position: relative;
 
       form {
-        margin-right: 20px;
+        position: absolute;
+        left: 5px;
+        right: 22%;
 
         input {
           @include box-shadow(0, 1px, 1px, #444);
@@ -112,7 +116,6 @@ header {
     bottom: 0px;
     overflow: auto;
     width: 100%;
-    height: 100%;
 
     li {
       font-size: 25px;
@@ -130,6 +133,10 @@ header {
       padding: 0px;
       border-bottom: 0px;
       
+      &:hover {
+        background-color: transparent;
+      }
+      
       > ul > li > a {
         font-size: 14px;
         padding: 8px 42px;
@@ -162,7 +169,7 @@ header {
 }
 
 /* This class is added when the user open the drawer */
-#app.draw {
+#app.draw > * {
           transform: translateX(-80%);
        -o-transform: translateX(-80%);
       -ms-transform: translateX(-80%);

app/assets/stylesheets/mobile/mobile.css.scss

@@ -30,7 +30,7 @@ h3 {
   clear: both;
 }
 
-#app {
+#app > * {
   transition: all 0.25s ease;
 }
 
@@ -330,19 +330,6 @@ h3 {
   float: right;
 }
 
-footer {
-  text-align: center;
-  a,
-  a:visited {
-    color: $text-grey;
-    margin: 10px;
-  }
-  padding: {
-    top: 20px;
-    bottom: 20px;
-  }
-}
-
 .bottom_bar {
   @include border-radius(0, 0, 5px, 5px);
   z-index: 3;
@@ -813,10 +800,6 @@ textarea#conversation_text {
   text-shadow: 1px 1px 5px #666;
 }
 
-.registrations {
-  margin: -45px;
-}
-
 form#new_user.new_user input.btn {
   white-space: normal;
 }

app/views/layouts/application.mobile.haml

@@ -76,7 +76,6 @@
                 %div
                   = hidden_field_tag "utf8", "✓"
                   = search_field_tag "q", nil, id: "q", placeholder: t("search"), results: "5", autocomplete: "off", class: "ac_input"
-
           %nav
             %ul
               %li
@@ -109,9 +108,6 @@
             = t('streams.activity.title')
         = yield
 
-      - if user_signed_in?
-        = render :partial =>'shared/footer'
-
     / javascripts at the bottom
     = jquery_include_tag
     = javascript_include_tag :mobile

app/views/shared/_footer.mobile.haml

@@ -1,3 +0,0 @@
-%footer
-  %strong
-    = link_to current_user.name, current_user.person

app/views/streams/main_stream.mobile.haml

@@ -2,17 +2,16 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-.span12
+%h2{:style => "padding:0 10px;display:none;"}
-  %h2{:style => "padding:0 10px;display:none;"}
+  - if @stream.for_all_aspects?
-    - if @stream.for_all_aspects?
+    = t('all_aspects')
-      = t('all_aspects')
+  - else
-    - else
+    = @stream.aspect
-      = @stream.aspect
 
-  #main_stream.stream
+#main_stream.stream
-    = render 'shared/stream', :posts => @stream.stream_posts
+  = render 'shared/stream', :posts => @stream.stream_posts
-    -if @stream.stream_posts.length > 0
+  -if @stream.stream_posts.length > 0
-      #pagination
+    #pagination
-        %a.more-link.paginate{:href => next_page_path}
+      %a.more-link.paginate{:href => next_page_path}
-          %h1
+        %h1
-            = t("more")
+          = t("more")

features/support/user_cuke_helpers.rb

@@ -110,7 +110,7 @@ module UserCukeHelpers
     page.should have_content("What are you into?")
 
     # the username that was just entered for registration
-    page.should have_content(@username)
+    page.should have_field("profile_first_name", with: @username)
   end
 end