diff --git a/Gemfile b/Gemfile index fbb92e0..a4cce5e 100644 --- a/Gemfile +++ b/Gemfile @@ -22,8 +22,7 @@ gem 'coffee-rails', '~> 4.2' # Use jquery as the JavaScript library gem 'jquery-rails' -# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem 'turbolinks', '~> 5' + # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 569bd70..7a9acf9 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,6 +15,5 @@ //= require moment //= require moment/pl //= require bootstrap-datetimepicker -//= require turbolinks //= require_tree . //= require cocoon diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css.erb similarity index 99% rename from app/assets/stylesheets/bootstrap.css rename to app/assets/stylesheets/bootstrap.css.erb index ce0ac9f..a7a647d 100644 --- a/app/assets/stylesheets/bootstrap.css +++ b/app/assets/stylesheets/bootstrap.css.erb @@ -2681,8 +2681,8 @@ input[type="button"].btn-block { @font-face { font-family: 'Glyphicons Halflings'; - src: url('/assets/glyphicons-halflings-regular.eot'); - src: url('/assets/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('/assets/glyphicons-halflings-regular.woff') format('woff'), url('/assets/glyphicons-halflings-regular.ttf') format('truetype'), url('/assets/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); + src: url('<%= asset_path('glyphicons-halflings-regular.eot') %>'); + src: url('<%= asset_path('glyphicons-halflings-regular.eot?#iefix') %>') format('embedded-opentype'), url('<%= asset_path('glyphicons-halflings-regular.woff') %>') format('woff'), url('<%= asset_path('glyphicons-halflings-regular.ttf') %>') format('truetype'), url('<%= asset_path('glyphicons-halflings-regular.svg#glyphicons-halflingsregular') %>') format('svg'); } .glyphicon { diff --git a/app/assets/stylesheets/customers.scss b/app/assets/stylesheets/customers.scss deleted file mode 100644 index a1ddb21..0000000 --- a/app/assets/stylesheets/customers.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Clients controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/invoices.scss b/app/assets/stylesheets/invoices.scss deleted file mode 100644 index a9a8e9d..0000000 --- a/app/assets/stylesheets/invoices.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Invoices controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/products.scss b/app/assets/stylesheets/products.scss deleted file mode 100644 index bff386e..0000000 --- a/app/assets/stylesheets/products.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Products controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss deleted file mode 100644 index 5d40e48..0000000 --- a/app/assets/stylesheets/settings.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Settings controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss deleted file mode 100644 index 4e19aa4..0000000 --- a/app/assets/stylesheets/welcome.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the Welcome controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1a9dab0..09d4cba 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,71 +5,76 @@ <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'application', media: 'all' %> + <%= javascript_include_tag 'application'%> <%= favicon_link_tag %>