Skip to content

add twitcher key #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add twitcher key #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31d431
add twitcher key
imjohnlouie04 Feb 24, 2014
b8715f0
add placeholder for avatar
imjohnlouie04 Feb 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions css/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ section {
}

.mini-feed ul {
margin: 0 10px 0 0;
margin: 0;
padding: 0;
}

.mini-feed li {
border-bottom: 1px solid #F2F2F2;
list-style: none;
padding: 10px 20px 10px 10px;
padding: 10px;
font-size: 13px;
line-height: 16px;
min-height: 48px;
Expand All @@ -73,14 +73,16 @@ section {
border: none;
}

.mini-feed li img {
border-radius: 6px;
.mini-feed li .feed-avatar {
float: left;
margin: 0 10px 10px 0;
margin-right: 10px;
}

.mini-feed li .feed-avatar img {
border-radius: 6px;
}

.mini-feed li span {
margin-left: 58px;
display: block;
}

Expand All @@ -89,6 +91,13 @@ section {
color: #999;
font-size: 11px;
padding-top: 5px;
margin-left: 59px;
}

.mini-feed li .tweet-time,
.mini-feed li .tweet-text {
width: auto;
overflow: hidden;
}


Expand Down
4 changes: 2 additions & 2 deletions js/miniFeed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Tweet = (function() {
};

Tweet.prototype.avatar = function() {
return "<img src='" + (this.avatarUrl()) + "' class='" + this.options.avatarClass + "' title='" + this.options.username + "' height='" + this.options.avatarSize + "' width='" + this.options.avatarSize + "'/>";
return "<div class='feed-avatar'><img src='" + (this.avatarUrl()) + "' class='" + this.options.avatarClass + "' title='" + this.options.username + "' height='" + this.options.avatarSize + "' width='" + this.options.avatarSize + "'/></div>";
};

Tweet.prototype.time = function() {
Expand Down Expand Up @@ -84,7 +84,7 @@ Tweet = (function() {
};

Tweet.apiUrl = function(options) {
return "http://twitcher.steer.me/user_timeline/" + options.username;
return "http://twitcher.steer.me/user_timeline/" + options.username + "?key=qxmpj2dr";
};

return Tweet;
Expand Down