Merge remote branch 'ritchewilson/prev_next'
Conflicts: public/stylesheets/sass/mobile.sass
This commit is contained in:
commit
5dcfff104a
2 changed files with 23 additions and 3 deletions
9
app/views/photos/show.mobile.haml
Normal file → Executable file
9
app/views/photos/show.mobile.haml
Normal file → Executable file
|
|
@ -6,3 +6,12 @@
|
|||
#show_content.photo
|
||||
= image_tag @photo.url(:scaled_full)
|
||||
|
||||
-if @additional_photos && @additional_photos.length > 1
|
||||
#photo_controls
|
||||
%table
|
||||
%tr
|
||||
%td
|
||||
=link_to "←", @prev_photo, :rel => 'prefetch', :class => 'arrow'
|
||||
%td{:width => '100%'}
|
||||
%td
|
||||
=link_to "→", @next_photo, :rel => 'prefetch', :class => 'arrow'
|
||||
|
|
|
|||
17
public/stylesheets/sass/mobile.sass
Normal file → Executable file
17
public/stylesheets/sass/mobile.sass
Normal file → Executable file
|
|
@ -7,8 +7,7 @@
|
|||
|
||||
$blue: #3F8FBA
|
||||
|
||||
|
||||
a:not([role='button'])
|
||||
a:not([role='button']):not(.arrow)
|
||||
:text
|
||||
:decoration none
|
||||
:font
|
||||
|
|
@ -174,6 +173,19 @@ a
|
|||
:background
|
||||
:color #000
|
||||
|
||||
#photo_controls
|
||||
:margin
|
||||
:bottom -42px
|
||||
|
||||
.arrow
|
||||
:color white !important
|
||||
:font
|
||||
:size 26pt
|
||||
:text
|
||||
:shadow 0 1px 2px #333
|
||||
:decoration none
|
||||
:padding 0
|
||||
|
||||
ul
|
||||
:margin 0
|
||||
:padding 0
|
||||
|
|
@ -346,4 +358,3 @@ ul
|
|||
:background
|
||||
:color #333
|
||||
:color #ccc
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue