Merge branch 'master' of https://github.com/aredo/hulk

hengkiardo · Aug 14, 2012 · 03dc4fd · 03dc4fd
2 parents 9b5fb66 + d688d3d
commit 03dc4fd
Show file tree

Hide file tree

Showing 14 changed files with 5,567 additions and 3 deletions.
diff --git a/application/views/include/footer.php b/application/views/include/footer.php
@@ -9,6 +9,8 @@
 	<script src="<?php echo base_url(); ?>assets/js/jquery.fancybox-1.3.4.pack.js"></script>
 	<script src="<?php echo base_url(); ?>assets/js/jquery.ColorPicker.min.js"></script>
 	<script src="<?php echo base_url(); ?>assets/js/bootstrap/bootstrap-modal.min.js"></script>
+	<script src="<?php echo base_url(); ?>assets/js/jquery.imagesloaded.min.js"></script>
+	<script src="<?php echo base_url(); ?>assets/js/jquery.masonry.js"></script>
 	<script src="<?php echo base_url(); ?>assets/js/applications.js"></script>
 	<?php $this->load->view('include/ga'); ?>
 </body>

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
@@ -5,12 +5,12 @@
 
 			<?php if(is_array($media_data)) { ?>
 
-			<ul class="image-list">
+		<ul class="image-list">
 
 			<?php foreach($media_data as $media) { ?>
 
-				<li>
-					<?php echo anchor($media->images->standard_resolution->url, img(array('src' => $media->images->thumbnail->url, 'width' => '140', 'height' => '140')), 'class="fancybox" rel="fancybox_group"'); ?>
+				<li class="item">
+					<?php echo anchor($media->images->standard_resolution->url, img(array('src' => $media->images->thumbnail->url)), 'class="fancybox" rel="fancybox_group"'); ?>
 				</li>
 
 			<?php } ?>

diff --git a/assets/css/hulk.css b/assets/css/hulk.css
@@ -2732,6 +2732,12 @@ ol.linenums li {
   background-color: #fff;
   cursor: default;
 }
+.item {
+  width: 150px;
+  margin: 10px;
+  float: left;
+  list-style: none;
+}
 .modal-open .dropdown-menu {
   z-index: 2050;
 }

diff --git a/assets/css/hulk.less b/assets/css/hulk.less
@@ -156,6 +156,7 @@ ol.linenums li {
 @import "less/breadcrumbs.less";
 @import "less/pagination.less";
 @import "less/pager.less";
+@import "less/masonry.less";
 
 @import "less/modals.less";
 @import "less/close.less";