Commit d6587469 authored by Jonne Haß's avatar Jonne Haß

Merge pull request #6218 from svbergerem/mobile-entypo

Entypo on mobile website
parents 2ae1d021 839d76c1
......@@ -40,6 +40,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Replace remaining faceboxes with Bootstrap modals [#6106](https://github.com/diaspora/diaspora/pull/6106) [#6161](https://github.com/diaspora/diaspora/pull/6161)
* Rewrite header using Bootstrap 3 [#6109](https://github.com/diaspora/diaspora/pull/6109) [#6130](https://github.com/diaspora/diaspora/pull/6130) [#6132](https://github.com/diaspora/diaspora/pull/6132)
* Use upstream CSS mappings for Entypo [#6158](https://github.com/diaspora/diaspora/pull/6158)
* Replace some mobile icons with Entypo [#6218](https://github.com/diaspora/diaspora/pull/6218)
## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
......
......@@ -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 {
......
......@@ -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")
......@@ -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
......
......@@ -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
......
......@@ -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"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment