Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:olton/Metro-UI-CSS into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
olton committed Mar 16, 2013
2 parents a31c348 + c4d511b commit e45507c
Show file tree
Hide file tree
Showing 2 changed files with 232 additions and 45 deletions.
6 changes: 3 additions & 3 deletions public/calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<div class="grid">
<div class="row">
<div class="span4">
<div class="calendar span4" data-role="calendar" data-param-lang="en"></div>
<div class="calendar span4" id="cal1" data-role="calendar" data-param-lang="en"></div>
<p><code>data-param-lang="en"</code></p>
</div>
<div class="span4">
<div class="calendar span4" data-role="calendar" data-param-lang="ru" data-param-init-date="1972-12-21"></div>
<div class="calendar span4" data-role="calendar" data-param-lang="ru" data-param-init-date="1972-12-21" data-param-year-buttons="1"></div>
<p>
<code>data-param-lang="ru"</code>
<br />
Expand All @@ -40,7 +40,7 @@

<h2>Date Picker</h2>
<p>This component in progress...</p>
<div class="input-control text datepicker span4" data-param-lang="ru">
<div class="input-control text datepicker span4" id="picker1" data-param-lang="ru">
<input type="text" />
<button class="btn-date"></button>
</div>
Expand Down
Loading

0 comments on commit e45507c

Please sign in to comment.