Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Rudi Grinberg 2012-09-19 17:38:00 -04:00
commit cde8c60afc
6 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View file

@ -4,7 +4,7 @@ if (isset($this->obj)) {
$count = count($contents);
}
?>
<div class="btn-toolbar clearfix">
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
New <span class="caret"></span>

2
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View file

@ -4,7 +4,7 @@ if (isset($this->obj)) {
$count = count($contents);
}
?>
<div class="btn-toolbar clearfix">
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false">
New <span class="caret"></span>

2
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View file

@ -1,4 +1,4 @@
<div class="btn-toolbar clearfix">
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left">
<button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
New <span class="caret"></span>