VRFS-1172 - easydropdown plugin thinkns client has touch support... but it doesn't

This commit is contained in:
Seth Call 2014-02-23 02:26:19 +00:00
parent 2acecc5dea
commit acf8f84624
3 changed files with 21 additions and 6 deletions

View File

@ -566,7 +566,7 @@
// if this has already been initialized, re-init it so it picks up any new <options>
$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});
})
}

View File

@ -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;
}

View File

@ -37,7 +37,7 @@
<div class="field country right-side">
<%= f.label :country, "Country:" %>
<select id="country_select" name="jam_ruby_user[country]" autocomplete="off" class="easydropdown">
<option value="" <%= @location[:country].blank? ? "selected" : "" %>>Select Country</option>
<option class="label" value="" <%= @location[:country].blank? ? "selected" : "" %>>Select Country</option>
<% @countries.each do |country| %>
<% unless country.blank? %>
<option value="<%= country %>" <%= @location[:country] == country ? "selected" : "" %>><%= country %></option>