Skip to content

Commit 4320971

Browse files
authored
Merge pull request #402 from coopdevs/remove_jquery_ui
Remove jquery-ui
2 parents 50f930d + 009250e commit 4320971

File tree

8 files changed

+2
-41
lines changed

8 files changed

+2
-41
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ gem 'rufus-scheduler', '~> 3.4.2'
3131

3232
# Assets
3333
gem 'jquery-rails', '>= 4.2.0'
34-
gem 'jquery-ui-rails'
3534
gem 'bootstrap-sass'
3635
gem 'sass-rails', '~> 5.0.7'
3736
gem 'coffee-rails'

Gemfile.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ GEM
180180
rails-dom-testing (>= 1, < 3)
181181
railties (>= 4.2.0)
182182
thor (>= 0.14, < 2.0)
183-
jquery-ui-rails (5.0.3)
184-
railties (>= 3.2.16)
185183
json (2.1.0)
186184
kaminari (1.1.1)
187185
activesupport (>= 4.1.0)
@@ -423,7 +421,6 @@ DEPENDENCIES
423421
hstore_translate
424422
http_accept_language (~> 2.1.1)
425423
jquery-rails (>= 4.2.0)
426-
jquery-ui-rails
427424
kaminari (~> 1.1.1)
428425
letter_opener (= 1.4.1)
429426
localeapp (= 2.1.1)

app/assets/javascripts/application.js.coffee

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#= require_self
2-
#= require datepicker
31
#= require give_time
42
#= require tags
53
#= require mobile_app_libs

app/assets/javascripts/datepicker.js.coffee

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/assets/javascripts/libs.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//= require jquery
22
//= require jquery_ujs
3-
//= require jquery-ui
43
//= require jquery.validate
54
//= require bootstrap
65
//= require highcharts

app/assets/stylesheets/application.css.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
/*
2-
*= require_self
3-
*/
4-
51
@import "variables";
62
@import "bootstrap-sprockets";
73
@import "bootstrap-custom";
@@ -312,11 +308,6 @@ ul.statistics li{
312308
padding-left: 1.5rem;
313309
}
314310

315-
// if not navbar hidden datepicker in small windows
316-
.ui-datepicker{
317-
z-index: 1000 !important;
318-
}
319-
320311
// fields that contain an error
321312
.field_with_errors{
322313
color: red;

app/assets/stylesheets/libs.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/*
2-
*= require jquery-ui
32
*= require select2
43
*/

app/views/statistics/statistics_global_activity.html.erb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828
<form class="form-inline text-right">
2929
<div class="form-group">
3030
<input class="form-control"
31-
id="datepicker_from"
31+
type="date"
3232
name="ini"
33-
placeholder="<%= t '.ini_date' %>"
3433
value="<%= params[:ini] %>">
3534
<input class="form-control"
36-
id="datepicker_to"
35+
type="date"
3736
name="fin"
38-
placeholder="<%= t '.end_date' %>"
3937
value="<%= params[:fin] %>">
4038
<button class="btn btn-default" type="submit">
4139
<%= t '.show' %>

0 commit comments

Comments
 (0)