mirror of
https://github.com/brmlab/povoden.git
synced 2025-06-08 10:14:20 +02:00
Merge branch 'master' into xmllint
Conflicts: Makefile
This commit is contained in:
commit
e1784c741f
8 changed files with 48 additions and 25 deletions
|
@ -13,8 +13,6 @@
|
|||
%li <a href='doprava.html'>Doprava</a>
|
||||
|
||||
.content
|
||||
%p
|
||||
=File.read('data/timestamp.html')
|
||||
%table.twocolumn
|
||||
%tr
|
||||
%td(style="padding: 16px;")
|
||||
|
@ -30,4 +28,7 @@
|
|||
%th datum a čas
|
||||
%th stav [cm]
|
||||
%th průtok [m<sup>3</sup>s<sup>-1</sup>]
|
||||
%th teplota [°C]
|
||||
=File.read("data/table.html")
|
||||
%hr
|
||||
.footer Data poskytuje Český hydrometeorologický ústav. Bez záruky.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue