Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:bathtimefish/biteup

  • Loading branch information...
commit 58b62b83425bbadcbcd4a8eca7b4fdaa827059c2 2 parents 2953807 + 742aace
BathTimeFish authored
View
2  app/views/feeds/timeline.ctp
@@ -43,7 +43,7 @@
</div>
-<div class="woodFrame">
+<div id="timeline" class="woodFrame">
<div class="woodWrapper">
<?php if(!empty($feeds)) { // Friend Timeline Loop ?>
<ul>
View
4 app/webroot/css/style.css
@@ -28,6 +28,10 @@ a{
color:#cf4c05;
}
+#nolist{
+ margin:0 30px;
+}
+
#container {
overflow: hidden;
width: 320px;
View
BIN  app/webroot/img/avatar/chara_shop_lv1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/webroot/img/avatar/chara_shop_lv2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/webroot/img/avatar/chara_shop_lv3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/webroot/img/avatar/chara_shop_lv4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  app/webroot/img/avatar/chara_shop_lv5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.