Update bootstrap to 2.3.1

This commit is contained in:
Eelco Dolstra 2013-04-26 14:45:20 +02:00
parent bbc3e25d5a
commit 4a2cb5e206
3 changed files with 28 additions and 9 deletions

View File

@ -7,7 +7,7 @@ STATIC = \
FLOT = flot-0.6.zip FLOT = flot-0.6.zip
TABLESORTER = jquery.tablesorter.zip TABLESORTER = jquery.tablesorter.zip
JQUERY = jquery-ui-1.8.5.custom.zip JQUERY = jquery-ui-1.8.5.custom.zip
BOOTSTRAP = bootstrap-2.0.3.zip BOOTSTRAP = bootstrap-2.3.1.zip
ZIPS = $(FLOT) $(TABLESORTER) $(JQUERY) $(BOOTSTRAP) ZIPS = $(FLOT) $(TABLESORTER) $(JQUERY) $(BOOTSTRAP)

View File

@ -56,7 +56,26 @@ table.clickable-rows > tbody > tr {
cursor: pointer; cursor: pointer;
} }
h3 { h2 {
margin-top: 0.5em; font-size: 150%;
margin-bottom: 0.5em; margin-bottom: 0em;
}
h3 {
font-size: 120%;
margin-top: 0.5em;
margin-bottom: 0em;
}
div.page-header {
margin-top: 0em;
margin-bottom: 1em;
}
div.page-header h1 {
margin-bottom: 0em;
}
div.page-header h1 small {
font-size: 45%;
} }

View File

@ -1,5 +1,5 @@
[% BLOCK menuItem %] [% BLOCK menuItem %]
<li class="[% IF "${root}${curUri}" == uri %]active[% END %]"> <li class="[% IF "${root}${curUri}" == uri %]active[% END %]" [% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>
<a href="[% uri %]">[% title %]</a> <a href="[% uri %]">[% title %]</a>
</li> </li>
[% END %] [% END %]
@ -167,14 +167,14 @@
uri = c.uri_for(c.controller('Admin').action_for('users')) uri = c.uri_for(c.controller('Admin').action_for('users'))
title = "Manage users" %] title = "Manage users" %]
<li class="divider"></li> <li class="divider"></li>
[% INCLUDE maybeLink [% INCLUDE menuItem
uri = c.uri_for(c.controller('Admin').action_for('clearfailedcache')) uri = c.uri_for(c.controller('Admin').action_for('clearfailedcache'))
content = "Clear failed builds cache" title = "Clear failed builds cache"
confirmmsg = "Are you sure you want to clear the failed builds cache?" confirmmsg = "Are you sure you want to clear the failed builds cache?"
class = "" %] class = "" %]
[% INCLUDE maybeLink [% INCLUDE menuItem
uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current')) uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current'))
content = "Clear all non-running old builds from queue" title = "Clear all non-running old builds from queue"
confirmmsg = "Are you sure you want to clear the queue?" confirmmsg = "Are you sure you want to clear the queue?"
class = "" %] class = "" %]
[% END %] [% END %]