diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index 4ca652715..2cc124c70 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -566,7 +566,7 @@ // if this has already been initialized, re-init it so it picks up any new $item.easyDropDown('destroy') } - $item.easyDropDown({nativeTouch: !gon.isNativeClient && gon.global.env != "test", cutOff:7}); + $item.easyDropDown({nativeTouch: !(context.jamClient && context.jamClient.IsNativeClient()) && gon.global.env != "test", cutOff:7}); }) } diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss index c2ba9e1be..d5e28ce18 100644 --- a/web/app/assets/stylesheets/web/main.css.scss +++ b/web/app/assets/stylesheets/web/main.css.scss @@ -1,3 +1,10 @@ +@mixin box_sizing { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; +} + html { min-height:100%; } @@ -90,7 +97,7 @@ body.web { padding:25px; padding-top:0px; line-height:130%; - + h2 { font-size:18px !important; line-height:normal; @@ -209,7 +216,7 @@ body.web { width:345px; font-size:12px; } - + white-space: nowrap; p, ul { @@ -269,24 +276,32 @@ body.web { input[type=text], input[type=password] { margin-top:1px; width:100%; + @include box_sizing; } select { width:100%; } + #instrument_selector .easydropdown-wrapper .easydropdown { + box-shadow: none !important; + } + .easydropdown-wrapper { width:100%; .easydropdown { - padding: 0 3px; + padding: 0px; width:100%; - box-shadow: none !important; + } + } + + .right-side { margin-left:25px; } diff --git a/web/app/views/users/new.html.erb b/web/app/views/users/new.html.erb index 7d613e655..30c2dd4f4 100644 --- a/web/app/views/users/new.html.erb +++ b/web/app/views/users/new.html.erb @@ -37,7 +37,7 @@
<%= f.label :country, "Country:" %>