Mobile fixes
This commit is contained in:
@@ -54,6 +54,9 @@ DragNDrop.Draggable = Ember.Mixin.create
|
|||||||
if Math.abs(@touchStartEvent.pageX - touch.pageX) < 2 and Math.abs(@touchStartEvent.pageY - touch.pageY) < 2
|
if Math.abs(@touchStartEvent.pageX - touch.pageX) < 2 and Math.abs(@touchStartEvent.pageY - touch.pageY) < 2
|
||||||
# The preventDefaults are preventing the click action to fire, therefore we trigger it ourselves
|
# The preventDefaults are preventing the click action to fire, therefore we trigger it ourselves
|
||||||
# But do not trigger when a handle insed the element is clicked
|
# But do not trigger when a handle insed the element is clicked
|
||||||
|
#NOTE: I think that $(ev.target).click() will work for all cases, makes the code simpler,
|
||||||
|
# but no time to test that now. Tested mostly on section elements, since they are draggable, clickable
|
||||||
|
# and have subclickable buttons
|
||||||
unless $(ev.target).parents('.handles-inside-draggable') or $(ev.target).hasClass('handles-inside-draggable')
|
unless $(ev.target).parents('.handles-inside-draggable') or $(ev.target).hasClass('handles-inside-draggable')
|
||||||
@click() if @click
|
@click() if @click
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -4,16 +4,19 @@
|
|||||||
background-position: center
|
background-position: center
|
||||||
overflow: visible
|
overflow: visible
|
||||||
position: relative
|
position: relative
|
||||||
|
padding-bottom: 22px
|
||||||
.footer-shadow
|
.footer-shadow
|
||||||
height: 1px
|
height: 1px
|
||||||
//+box-shadow(0px 4px 10px #000)
|
//+box-shadow(0px 4px 10px #000)
|
||||||
|
.signup-button
|
||||||
|
+button
|
||||||
.footer-content-container
|
.footer-content-container
|
||||||
max-width: 838px
|
max-width: 838px
|
||||||
margin: 0 auto
|
margin: 0 auto
|
||||||
.footer-content
|
.footer-content
|
||||||
background-color: #420F03
|
background-color: #420F03
|
||||||
text-align: right
|
text-align: right
|
||||||
padding: 72px 30px 20px 10px
|
padding: 32px 30px 10px 10px
|
||||||
overflow: visible
|
overflow: visible
|
||||||
margin: 0 auto
|
margin: 0 auto
|
||||||
a
|
a
|
||||||
@@ -25,6 +28,5 @@
|
|||||||
padding-left: 30px
|
padding-left: 30px
|
||||||
padding-right: 30px
|
padding-right: 30px
|
||||||
max-width: 838px
|
max-width: 838px
|
||||||
position: relative
|
|
||||||
overflow: visible
|
overflow: visible
|
||||||
margin: 0 auto
|
margin: 0 auto
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ private
|
|||||||
|
|
||||||
#START CMTOOL
|
#START CMTOOL
|
||||||
def authorize_cmtool
|
def authorize_cmtool
|
||||||
redirect_to main_app.new_administrator_session_path, alert: t('general.unauthorized') unless current_administrator.present?
|
redirect_to main_app.new_administrator_session_path, alert: t('devise.failure.unauthenticated') unless current_administrator.present?
|
||||||
end
|
end
|
||||||
|
|
||||||
def cmtool_user
|
def cmtool_user
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ html lang="en"
|
|||||||
body
|
body
|
||||||
.header-nav-banner
|
.header-nav-banner
|
||||||
= render 'theme1/header'
|
= render 'theme1/header'
|
||||||
#home-splash
|
#home-splash.show-for-large-up
|
||||||
#home-splash-content
|
#home-splash-content
|
||||||
#home-splash-content-inner
|
#home-splash-content-inner
|
||||||
#home-splash-content-inner-bar
|
#home-splash-content-inner-bar
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ html lang=I18n.locale
|
|||||||
body
|
body
|
||||||
.header-nav-banner
|
.header-nav-banner
|
||||||
= render 'theme1/header'
|
= render 'theme1/header'
|
||||||
#content-header
|
#content-header.show-for-large-up
|
||||||
.left
|
.left
|
||||||
.right
|
.right
|
||||||
.container
|
.container
|
||||||
|
|||||||
@@ -3,10 +3,12 @@
|
|||||||
.footer-content-container
|
.footer-content-container
|
||||||
.footer-content
|
.footer-content
|
||||||
.fb-like data-href="http://mozo.bar/" data-layout="button" data-action="like" data-show-faces="true" data-share="true"
|
.fb-like data-href="http://mozo.bar/" data-layout="button" data-action="like" data-show-faces="true" data-share="true"
|
||||||
|
= link_to t('devise.registrations.link'), main_app.new_suppliers_path, class: 'signup-button'
|
||||||
= yield :footer
|
= yield :footer
|
||||||
/= link_to 'disclaimer', go_to_path('disclaimer', locale: 'en')
|
/= link_to 'disclaimer', go_to_path('disclaimer', locale: 'en')
|
||||||
/'
|
/'
|
||||||
= link_to 'privacy', main_app.go_to_path('privacy', locale: 'en')
|
= link_to 'privacy', main_app.go_to_path('privacy', locale: 'en')
|
||||||
'
|
'
|
||||||
= link_to 'contact', main_app.go_to_path('contact', locale: 'en')
|
= link_to 'contact', main_app.go_to_path('contact', locale: 'en')
|
||||||
|
.clearfix
|
||||||
.footer-bottom © mozo.bar 2015
|
.footer-bottom © mozo.bar 2015
|
||||||
|
|||||||
@@ -8,9 +8,9 @@
|
|||||||
.light3
|
.light3
|
||||||
.container
|
.container
|
||||||
#header
|
#header
|
||||||
#header-right= render 'theme1/social'
|
#header-right.show-for-medium-up= render 'theme1/social'
|
||||||
#logo= link_to image_tag('icons/logo-text.png', alt: application_title), main_app.root_path
|
#logo= link_to image_tag('icons/logo-text.png', alt: application_title), main_app.root_path
|
||||||
= link_to t('devise.registrations.link'), main_app.new_suppliers_path, class: 'signup-button'
|
= link_to t('devise.registrations.link'), main_app.new_suppliers_path, class: 'signup-button show-for-medium-up'
|
||||||
#nav-wrap
|
#nav-wrap
|
||||||
.navbar
|
.navbar
|
||||||
.navbar-inner= render 'theme1/navigation'
|
.navbar-inner= render 'theme1/navigation'
|
||||||
|
|||||||
Reference in New Issue
Block a user