Merge tag 'v1.12.1' into development

Release 1.12.1
This commit is contained in:
Paul van Tilburg 2015-06-06 12:27:52 +02:00
commit ed56393d8f
3 changed files with 31 additions and 1 deletions

View File

@ -1,5 +1,10 @@
= Stop… Camping Time! release news
== 1.12.1
Small update release to include to missing 1.12 change log and added
a footer with the current version.
== 1.12
Bugfixes:

View File

@ -54,7 +54,7 @@ end
module StopTime
# The version of the application
VERSION = '1.12'
VERSION = '1.12.1'
puts "Starting Stop… Camping Time! version #{VERSION}"
# @return [Hash{String=>Object}] The parsed configuration.
@ -1772,6 +1772,14 @@ module StopTime::Views
self << yield
footer { br }
end
footer.footer do
div.container do
small do
text! "Stop… Camping Time! v#{StopTime::VERSION} — by "
a "Mozcode", :href => "https://mozcode.nl"
end
end
end
# JQuery and Bootstrap JavaScript
script :src => (R(Static, "") + "javascripts/jquery.min.js")
script :src => (R(Static, "") + "javascripts/bootstrap.min.js")

View File

@ -18,8 +18,25 @@
margin-bottom: 8px
/* Main elements */
html
position: relative
min-height: 100%
body
padding-top: 40px
margin-bottom: 24px
overflow-x: hidden
footer
position: absolute
width: 100%
height: 24px
bottom: 0
background-color: #f5f5f5
div
padding-top: 3px
text-align: center
/* General classes */
.billed