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

Merge branch 'CC-3174' into devel

This commit is contained in:
Naomi Aro 2012-02-23 22:54:41 +01:00
parent 9c6bd4bf4d e0134ed6d1
commit 8b02f3d902
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/layouts/scripts/builder.phtml
View File

@ -22,7 +22,7 @@
<div class="wrapper"> <div class="wrapper">
<!--Set to z-index 254 to make it lower than the top-panel and the ZFDebug info bar, but higher than the side-playlist--> <!--Set to z-index 254 to make it lower than the top-panel and the ZFDebug info bar, but higher than the side-playlist-->
<div id="library_content" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded" style="z-index:254"><?php echo $this->layout()->library ?></div> <div id="library_content" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded" style="z-index:254"><?php echo $this->layout()->library ?></div>
<div id="show_builder" style="width:500px;" class="ui-widget ui-widget-content block-shadow omega-block padded"><?php echo $this->layout()->builder ?></div> <div id="show_builder" class="ui-widget ui-widget-content block-shadow omega-block padded"><?php echo $this->layout()->builder ?></div>
</div> </div>
</body> </body>
</html> </html>

4
airtime_mvc/public/css/showbuilder.css
View File

@ -1,5 +1,9 @@
@CHARSET "UTF-8"; @CHARSET "UTF-8";
#show_builder {
width:45%;
}
#show_builder input.input_text { #show_builder input.input_text {
width:100px; width:100px;
} }