bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Son Sep 13 11:03:05 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-13 11:03:05 +02:00
parent 4a8e5d393e
commit d85a01c810
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@@ -13,8 +13,8 @@ gem 'webrick', '1.3.1'
# Gems used only for assets and not required
# in production environments by default.
gem 'sass-rails', '~> 3.2'
gem 'coffee-rails', '~> 3.2.1'
gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'bootstrap-sass','~> 2.3.2.1'
group :assets do
@@ -102,7 +102,7 @@ gem 'rmagick'
gem 'bootstrap-addons-rails'
gem "jquery-fileupload-rails", "0.4.1"
gem "jquery-ui-rails","~> 4.1.1"
gem "jquery-ui-rails","~> 4.2.0"
gem "font-awesome-rails"
gem "jquery-datetimepicker-rails"
# gem "jquery-sortable-rails"

4
app/assets/stylesheets/application.css.scss
View File

@@ -12,6 +12,10 @@
* require_tree .
*= require 'calendars'
*= require jquery.fileupload-ui
*= require jquery.ui.progressbar
*= require jquery.datetimepicker
*= require jquery.ui.dialog
*= require jquery.ui.tabs
* require 'bootstrap'
*= require 'tinymce'

2
app/assets/stylesheets/themes/blue2/application.css.scss
View File

@@ -17,6 +17,8 @@
*= require jquery.datetimepicker
*= require jquery.ui.dialog
*= require jquery.ui.tabs
*= require jquery.ui.progressbar
* require 'bootstrap'
* require 'neuigkeiten'

8
app/views/home/infoscreen.html.erb
View File

@@ -53,8 +53,8 @@
<% end %>
</div>
<div class="ui-progressbar ui-widget ui-widget-content ui-corner-all" style="bottom: 0; width:500px; height:20px; z-index: 2000; left:auto; right:auto; position:absolute">
<div id="my-progress-bar" class="ui-progressbar-value ui-widget-header ui-corner-left" style="width:0;height:20px"></div>
<div class="ui-progressbar ui-widget ui-widget-content ui-corner-all" style="height:10px; z-index: 2000; left: 5px; right: 5px; bottom: 5px; height: 10px; position:absolute">
<div id="my-progress-bar" class="ui-progressbar-value ui-widget-header ui-corner-left" style="width:0;height:100%"></div>
</div>
<script>
@@ -62,9 +62,9 @@ $(function () {
$('#jmpress').jmpress({
duration: {
barPropertyStart: '0',
barSelector: '#my-progress-bar'
barSelector: '#my-progress-bar'
}
});
});
});
</script>
</body>