From 839d76c15e672cbb3bbb847378167670cebf9b88 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Tue, 21 Jul 2015 18:12:01 +0200
Subject: [PATCH] Moar entypo on mobile website

---
 app/assets/images/mobile/arrow-left.png     | Bin 2414 -> 0 bytes
 app/assets/images/mobile/arrow-right.png    | Bin 2439 -> 0 bytes
 app/assets/images/mobile/camera.png         | Bin 1217 -> 0 bytes
 app/assets/stylesheets/mobile/mobile.scss   |  44 ++++++++------------
 app/views/photos/show.mobile.haml           |  19 +++++----
 app/views/publisher/_publisher.mobile.haml  |   2 +-
 app/views/users/getting_started.mobile.haml |   4 --
 features/mobile/multiphoto.feature          |  12 +++---
 8 files changed, 35 insertions(+), 46 deletions(-)
 delete mode 100644 app/assets/images/mobile/arrow-left.png
 delete mode 100644 app/assets/images/mobile/arrow-right.png
 delete mode 100644 app/assets/images/mobile/camera.png

diff --git a/app/assets/images/mobile/arrow-left.png b/app/assets/images/mobile/arrow-left.png
deleted file mode 100644
index 8ae1a3d0e36242e8abc4b1f2c43aafd8f1609cf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2414
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

diff --git a/app/assets/images/mobile/arrow-right.png b/app/assets/images/mobile/arrow-right.png
deleted file mode 100644
index 9683d7bbaa1f6dfafa256d271c27a7ea7f0483ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2439
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
FV1iMEc5DCu

diff --git a/app/assets/images/mobile/camera.png b/app/assets/images/mobile/camera.png
deleted file mode 100644
index cc4d3bd54fe2f1c9f57d342bfc6da111bc6418d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1217
zcmeAS@N?(olHy`uVBq!ia0vp^!a&T&!3HGHN~m`NDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#X#-XL734=V|E2lkiEpy*OmP?Hw&|Z=FInx<}xs_IC{D`hFAzP
znz5Yx4OD>@Fakwq0P#m4{*Qz~{OLdpk|!EC0aYR!g3flpWs(d~Vk;1T0b+Db#PC7-
zwg9m-$hkX!*d2(mf$u;;ko;>P76W1rAm#vKY+yS`5TpT{3-$xWr9cXRfEPkBNCWAE
zK#Wa2$Q-N^cYxv`1A>A01ys#*APq_wAn|)pF?2(*8kPZ6tO>+F(KP)4^3{Pj3r!qs
zC=*Z+8#n<J^aEm0!bAq_K#o5UgXA#)F2g`J;Y&*(c?^KdFk7I?jX?YhO$W%^AaOf1
zaX1$}5J7xU0ON~*`#^bY`ly#QsG4X&hJmuvOdvJ`VrC#F75oKiI0?k*H{R6bJ3e--
P02$!v>gTe~DWM4f@H(MP

diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index ca3bbb840..f059a133e 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -292,29 +292,22 @@ h3 {  margin-top: 0; }
 }
 
 #photo_controls {
-  margin-bottom: 5px;
-}
-
-.arrow {
-  color: white !important;
-  font-size: 26pt;
-  text: {
-    shadow: 0 1px 2px #333;
-    decoration: none; };
-  padding: 0;
-  position: fixed;
-  bottom: 10%;
-  z-index: 1;
-  height: 50px;
-  width: 50px;
-}
-
-#left.arrow {
-  left: 5%;
-}
-
-#right.arrow{
-  right: 5%;
+  .arrow {
+    font-size: 10em;
+    text-decoration: none;
+    text-shadow: 0 0 3px $white;
+    position: fixed;
+    bottom: -0.2em;
+    z-index: 1;
+    &.left {
+      left: -0.2em;
+    }
+    &.right {
+      right: -0.2em;
+      text-align: right;
+    }
+    .entypo-chevron-left, .entypo-chevron-right { margin-right: 0; }
+  }
 }
 
 .header-full-width {
@@ -931,10 +924,7 @@ select#aspect_ids_ {
   float: left;
   padding: 3px 12px;
   cursor: pointer;
-
-  &:hover img {
-      opacity: 0.4;
-  }
+  .entypo-camera { margin-right: 0; }
 }
 
 #publisher_textarea_wrapper {
diff --git a/app/views/photos/show.mobile.haml b/app/views/photos/show.mobile.haml
index 4b5c3a3ea..6082e8edc 100644
--- a/app/views/photos/show.mobile.haml
+++ b/app/views/photos/show.mobile.haml
@@ -20,12 +20,13 @@
 
 -if additional_photos && additional_photos.length > 1
   #photo_controls
-  %table
-    %tr
-      %td
-        - if previous_photo != additional_photos.last
-          = link_to(image_tag("mobile/arrow-left.png", id: "arrow-left"), person_photo_path(previous_photo.author, previous_photo), rel: "prefetch", class: "arrow", id: "left")
-      %td{:width => '100%'}
-      %td
-        - if next_photo == additional_photos[additional_photos.index(photo)+1]
-          = link_to(image_tag("mobile/arrow-right.png", id: "arrow-right"), person_photo_path(next_photo.author, next_photo), rel: "prefetch", class: "arrow", id: "right")
+    - if previous_photo != additional_photos.last
+      = link_to(content_tag(:i, nil, id: "arrow-left", class: "entypo-chevron-left"),
+                person_photo_path(previous_photo.author, previous_photo),
+                rel:   "prefetch",
+                class: "arrow left")
+    - if next_photo == additional_photos[additional_photos.index(photo)+1]
+      = link_to(content_tag(:i, nil, id: "arrow-right", class: "entypo-chevron-right"),
+                person_photo_path(next_photo.author, next_photo),
+                rel: "prefetch",
+                class: "arrow right")
diff --git a/app/views/publisher/_publisher.mobile.haml b/app/views/publisher/_publisher.mobile.haml
index 9aced532e..c29d73c2e 100644
--- a/app/views/publisher/_publisher.mobile.haml
+++ b/app/views/publisher/_publisher.mobile.haml
@@ -30,7 +30,7 @@
     #fileInfo-publisher
 
     #file-upload-publisher{title: t('shared.publisher.upload_photos'), class: 'btn btn-default'}
-      = image_tag "mobile/camera.png", alt: t("shared.publisher.upload_photos").titleize
+      %i.entypo-camera.middle
     #publisher_mobile
       = submit_tag t('shared.publisher.share'), class: 'btn btn-primary', id: "submit_new_message"
     .clearfix
diff --git a/app/views/users/getting_started.mobile.haml b/app/views/users/getting_started.mobile.haml
index 951e82a49..66f5d2687 100644
--- a/app/views/users/getting_started.mobile.haml
+++ b/app/views/users/getting_started.mobile.haml
@@ -59,10 +59,6 @@
       %fieldset
         = label_tag 'profile[first_name]', t('profiles.edit.your_name'), class: "bootstrapped"
         = text_field_tag 'profile[first_name]', current_user.first_name
-        = image_tag 'ajax-loader2.gif', id: "gs-name-form-spinner", class: "hidden"
-        %span.saved{class: "hidden"}
-          = image_tag "mobile/check_yes_ok.png"
-          = t(".saved")
         .clearfix.visible-xs-block
         = label_tag :your_photo, t('profiles.edit.your_photo'), class: "bootstrapped"
         = render 'photos/new_profile_photo', aspect: :getting_started, person: current_user.person
diff --git a/features/mobile/multiphoto.feature b/features/mobile/multiphoto.feature
index 956db048b..f36966b3e 100644
--- a/features/mobile/multiphoto.feature
+++ b/features/mobile/multiphoto.feature
@@ -15,7 +15,8 @@ Feature: viewing photos on the mobile main page
     When I press "Share"
     And I click on selector "img.stream-photo"
     Then I should see a "img" within "#show_content"
-    And I should not see a "#right" within "#main"
+    And I should not see a "#arrow-right" within "#main"
+    And I should not see a "#arrow-left" within "#main"
 
   Scenario: view multiphoto post
     Given I attach the file "spec/fixtures/button.png" to hidden "file" within "#file-upload-publisher"
@@ -25,8 +26,9 @@ Feature: viewing photos on the mobile main page
     Then I should see "+ 1" within ".additional_photo_count"
 
     When I click on selector "img.stream-photo"
-    Then I should see a "#right" within "tbody"
+    Then I should see a "#arrow-right" within "#main"
+    And I should not see a "#arrow-left" within "#main"
 
-    When I click on selector "img#arrow-right"
-    And I should see a "#left" within "tbody"
-    And I should not see a "#right" within "tbody"
+    When I click on selector "#arrow-right"
+    Then I should see a "#arrow-left" within "#main"
+    And I should not see a "#arrow-right" within "#main"