1. Christoffer Niska
  2. yii-bootstrap

Commits

Christoffer Niska  committed 6c56be0

fixed add-this in the demo

  • Participants
  • Parent commits ca82f73
  • Branches bootstrap-2.0.2

Comments (0)

Files changed (4)

File demo/css/styles.css

View file
   text-align: justify;
 }
 .navbar .add-this {
-  background: #EEE;
   margin: 6px 0 6px 10px;
-  padding: 6px;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  padding: 6px 0;
 }
 .subnav {
   border: 1px solid #E5E5E5;

File demo/less/styles.less

View file
 
 .navbar {
 	.add-this {
-	    background: #EEE;
 	    margin: 6px 0 6px 10px;
-		padding: 6px;
-		.border-radius(3px);
+		padding: 6px 0;
 	}
 }
 

File demo/protected/views/layouts/main.php

View file
 						'active'=>Yii::app()->controller->id === 'site' && Yii::app()->controller->action->id === 'index'),
 				array('label'=>'Setup', 'url'=>array('site/setup')),
 			),
-			'htmlOptions'=>array('pull-left'),
+			'htmlOptions'=>array('class'=>'pull-left'),
 		),
 		'<div class="add-this pull-right">
 			<!-- AddThis Button BEGIN -->
 	<footer>
 
 		<p class="powered">
-			Powered by <?php echo CHtml::link('Yii PHP framework 1.1.10', 'http://www.yiiframework.com', array('target'=>'_blank')); ?> //
-			<?php echo CHtml::link('jQuery 1.7.1', 'http://www.jquery.com', array('target'=>'_blank')); ?> //
-			<?php echo CHtml::link('Yii-Bootstrap 0.9.10', 'http://www.yiiframework.com/extension/bootstrap', array('target'=>'_blank')); ?> //
-			<?php echo CHtml::link('Yii-LESS 0.9.1', 'http://www.yiiframework.com/extension/less', array('target'=>'_blank')); ?>  //
-			<?php echo CHtml::link('Yii-SEO 0.9.3', 'http://www.yiiframework.com/extension/seo', array('target'=>'_blank')); ?> //
-			<?php echo CHtml::link('Yii-Facebook 0.9.1', '#', array('rel'=>'tooltip', 'title'=>'Link available soon')); ?> //
-			<?php echo CHtml::link('Bootstrap 2.0.2', 'http://twitter.github.com/bootstrap', array('target'=>'_blank')); ?> //
+			Powered by <?php echo CHtml::link('Yii PHP framework 1.1.10', 'http://www.yiiframework.com', array('target'=>'_blank')); ?> /
+			<?php echo CHtml::link('jQuery 1.7.1', 'http://www.jquery.com', array('target'=>'_blank')); ?> /
+			<?php echo CHtml::link('Yii-Bootstrap 0.9.10', 'http://www.yiiframework.com/extension/bootstrap', array('target'=>'_blank')); ?> /
+			<?php echo CHtml::link('Yii-LESS 0.9.1', 'http://www.yiiframework.com/extension/less', array('target'=>'_blank')); ?>  /
+			<?php echo CHtml::link('Yii-SEO 0.9.3', 'http://www.yiiframework.com/extension/seo', array('target'=>'_blank')); ?> /
+			<?php echo CHtml::link('Yii-Facebook 0.9.1', '#', array('rel'=>'tooltip', 'title'=>'Link available soon')); ?> /
+			<?php echo CHtml::link('Bootstrap 2.0.2', 'http://twitter.github.com/bootstrap', array('target'=>'_blank')); ?> /
 			<?php echo CHtml::link('LESS', 'http://www.lesscss.org', array('target'=>'_blank')); ?>
 		</p>
 
 
 </div>
 
-<?php Yii::app()->clientScript->registerScript('http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4f362fc83fc39768', CClientScript::POS_END); ?>
+<?php Yii::app()->clientScript->registerScriptFile('http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-4f362fc83fc39768', CClientScript::POS_END); ?>
 
 </body>
 </html>

File demo/protected/views/site/index.php

View file
 
 	<?php $this->endWidget(); ?>
 
+	<div class="alert alert-block alert-warning">
+
+	</div>
+
 	<h3>Horizontal</h3>
 
 	<?php /** @var BootActiveForm $form */