Skip to content

Commit cc82f2c

Browse files
author
Jarred
committed
tidy design and remove types we dont handle
1 parent 02bbfc8 commit cc82f2c

12 files changed

+141
-45
lines changed

‎coffee/main.coffee

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jb.Main =
2424
"js/view.instapaper"
2525
"js/view.svpply"
2626
"js/view.pinboard"
27+
"js/view.scroller"
2728
"js/view.lookwork"
2829
"js/view.activity-stream"
2930
], () =>

‎coffee/view.activity-stream.coffee

+16-11
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ jb.Views.ActivityStream = Backbone.View.extend
1515
url: 'http://xml2json.heroku.com?url=https://github.com/jarred.atom&callback=?'
1616
favicon: 'http://g.etfv.co/http://github.com'
1717
,
18-
type: 'tumblr'
19-
url: 'http://api.tumblr.com/v2/blog/jarredbishop.tumblr.com/posts?api_key=YgpsEXCrpCtKL9U7aNBzWeDp0sSbZw1AeZQSt5QgsXRLdb5o24&jsonp=?'
20-
favicon: 'http://g.etfv.co/http://tumblr.com'
18+
type: 'pinboard'
19+
url: 'http://xml2json.heroku.com?url=http://feeds.pinboard.in/rss/secret:f06efe78d64f6c8a98b3/u:jarred/&callback=?'
20+
favicon: 'http://g.etfv.co/http://pinboard.in'
2121
,
22+
# type: 'tumblr'
23+
# url: 'http://api.tumblr.com/v2/blog/jarredbishop.tumblr.com/posts?api_key=YgpsEXCrpCtKL9U7aNBzWeDp0sSbZw1AeZQSt5QgsXRLdb5o24&jsonp=?'
24+
# favicon: 'http://g.etfv.co/http://tumblr.com'
25+
# ,
2226
type: 'dribbble'
2327
url: 'http://xml2json.heroku.com?url=http://dribbble.com/jarred/shots.rss&callback=?'
2428
favicon: 'http://g.etfv.co/http://dribbble.com'
@@ -30,15 +34,16 @@ jb.Views.ActivityStream = Backbone.View.extend
3034
type: 'svpply'
3135
url: 'https://api.svpply.com/v1/users/jarred/wants/products.json?limit=20&callback=?'
3236
favicon: 'http://g.etfv.co/http://svpply.com'
33-
,
34-
type: 'pinboard'
35-
url: 'http://xml2json.heroku.com?url=http://feeds.pinboard.in/rss/secret:f06efe78d64f6c8a98b3/u:jarred/&callback=?'
36-
favicon: 'http://g.etfv.co/http://pinboard.in'
37-
,
38-
type: 'lookwork'
39-
url: 'http://xml2json.heroku.com?url=http://lookwork.com/jarred/library.rss&callback=?'
40-
favicon: 'http://lookwork.com/assets/images/favicon.png'
37+
# ,
38+
# type: 'lookwork'
39+
# url: 'http://xml2json.heroku.com?url=http://lookwork.com/jarred/library.rss&callback=?'
40+
# favicon: 'http://lookwork.com/assets/images/favicon.png'
4141
]
42+
43+
###
44+
candidates
45+
http://coderwall.com/jarred.json
46+
###
4247

4348
initialize: (@o) ->
4449
_.bindAll @

‎coffee/view.instapaper.coffee

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jb.Views.instapaper = Backbone.View.extend
2323
waitForRenderAndUpdate: ->
2424
headingLines = @$('h2').height() / 20
2525
_.each @$('.line'), (el, index) ->
26-
if index > (13 - headingLines)
26+
if index > (14 - headingLines)
2727
$(el).remove()
2828
return
2929
@$('.line:last').css
30-
width: '30%'
30+
width: "#{30 + Math.round(Math.random() * 50)}%"
3131
return
3232

3333
template: _.template """

‎coffee/view.scroller.coffee

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
jb = window.JB ||= {}
2+
jb.Views ||= {}
3+
jb.Views.Scroller = Backbone.View.extend
4+
5+
initialize: (@o) ->
6+
return
7+
_.bindAll @
8+
@$el = $(@el)
9+
@$el.addClass 'hide'
10+
setInterval @position, 20
11+
# $(document).bind 'scroll', @position
12+
return
13+
14+
position: ->
15+
y = $('body').scrollTop() || 0
16+
h = $(document).height() - $(window).height() || 0
17+
pc = Math.round (y/h) * 100
18+
newY = pc * h
19+
# console.log pc
20+
@$el.css
21+
top: "#{newY}"
22+
return

‎css/style.css

+29-9
Original file line numberDiff line numberDiff line change
@@ -245,41 +245,49 @@ section#activity > .items {
245245
background-color: #1fb9e4;
246246
}
247247
.block.twitter > .content > p.tweet {
248+
margin: 20px;
249+
color: #FFF;
250+
font: 700 14px/22px "proxima-nova";
251+
text-transform: uppercase;
252+
letter-spacing: 1px;
248253
position: absolute;
249254
bottom: 0px;
250255
left: 0px;
251256
right: 0px;
252257
text-align: center;
253-
margin: 20px;
254-
color: #FFF;
255-
font: 400 15px/20px 'EuclidBPBoldBold';
256258
}
257259
.block.twitter > .content > p.tweet a {
258260
color: #FFF;
259-
text-decoration: underline;
261+
text-decoration: none;
262+
border-bottom: 1px solid #FFF;
263+
}
264+
.block.twitter > .content > p.tweet a:hover {
265+
border-bottom-color: transparent;
260266
}
261267
.block.instapaper > .content {
262268
position: absolute;
263269
left: 20px;
264270
top: 20px;
265271
right: 20px;
266272
bottom: 20px;
267-
background-color: #c0bfbf;
273+
/*background-color: #c0bfbf;*/
274+
268275
overflow: hidden;
269276
}
270277
.block.instapaper > .content > h2 {
271-
padding: 20px;
278+
/*padding: 20px;*/
279+
272280
padding-bottom: 26px;
273-
font: 600 16px/20px 'Helvetica Neue', Sans-Serif;
281+
font: 700 17px/20px 'Helvetica Neue';
274282
}
275283
.block.instapaper > .content > h2 a {
276284
color: #000;
277285
text-decoration: none;
278286
}
279287
.block.instapaper > .content > .lines-illustration > .line {
280288
height: 10px;
281-
background-color: #FFF;
282-
margin: 0px 20px 10px 20px;
289+
background-color: #CCC;
290+
margin: 0px 0px 10px 0px;
283291
}
284292
.block.flickr > .content {
285293
position: absolute;
@@ -306,6 +314,7 @@ section#activity > .items {
306314
right: 0px;
307315
height: 20px;
308316
background: #81382f;
317+
border-bottom: 1px solid rgba(0, 0, 0, 0.3);
309318
}
310319
.block.pinboard > .content > .corner {
311320
position: absolute;
@@ -389,3 +398,14 @@ section#activity > .items {
389398
width: 150px !important;
390399
border: 1px solid #000;
391400
}
401+
.scroller {
402+
position: fixed;
403+
right: 30px;
404+
top: 0%;
405+
height: 40px;
406+
background: #000;
407+
font: 400 13px/40px Sans-Serif;
408+
color: #FFF;
409+
padding: 0px 10px;
410+
z-index: 10;
411+
}

‎css/style.less

+28-9
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,23 @@ section#activity{
160160
bottom: 20px;
161161
background-color: #1fb9e4;
162162
> p.tweet{
163+
margin: 20px;
164+
color: #FFF;
165+
font: 700 14px/22px "proxima-nova";
166+
text-transform: uppercase;
167+
letter-spacing: 1px;
163168
position: absolute;
164169
bottom: 0px;
165170
left: 0px;
166171
right: 0px;
167172
text-align: center;
168-
margin: 20px;
169-
color: #FFF;
170-
font: 400 15px/20px 'EuclidBPBoldBold';
171173
a{
172174
color: #FFF;
173-
text-decoration: underline;
175+
text-decoration: none;
176+
border-bottom: 1px solid #FFF;
177+
&:hover{
178+
border-bottom-color: transparent;
179+
}
174180
}
175181
}
176182
}
@@ -183,12 +189,12 @@ section#activity{
183189
top: 20px;
184190
right: 20px;
185191
bottom: 20px;
186-
background-color: #c0bfbf;
192+
/*background-color: #c0bfbf;*/
187193
overflow: hidden;
188194
> h2{
189-
padding: 20px;
195+
/*padding: 20px;*/
190196
padding-bottom: 26px;
191-
font: 600 16px/20px 'Helvetica Neue', Sans-Serif;
197+
font: 700 17px/20px 'Helvetica Neue';
192198
a{
193199
color: #000;
194200
text-decoration: none;
@@ -197,8 +203,8 @@ section#activity{
197203
> .lines-illustration{
198204
> .line{
199205
height: 10px;
200-
background-color: #FFF;
201-
margin: 0px 20px 10px 20px;
206+
background-color: #CCC;
207+
margin: 0px 0px 10px 0px;
202208
}
203209
}
204210
}
@@ -232,6 +238,7 @@ section#activity{
232238
right: 0px;
233239
height: 20px;
234240
background: #81382f;
241+
border-bottom: 1px solid rgba(0, 0, 0, .3);
235242
}
236243
> .corner{
237244
position: absolute;
@@ -326,4 +333,16 @@ section#activity{
326333
}
327334

328335
}
336+
}
337+
338+
.scroller{
339+
position: fixed;
340+
right: 30px;
341+
top: 0%;
342+
height: 40px;
343+
background: #000;
344+
font: 400 13px/40px Sans-Serif;
345+
color: #FFF;
346+
padding: 0px 10px;
347+
z-index: 10;
329348
}

‎design/04.psd

4.99 KB
Binary file not shown.

‎index.html

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<title>Hi.</title>
66
<meta name="generator" content="TextMate http://macromates.com/">
77
<meta name="author" content="Jarred Bishop">
8+
<script type="text/javascript" src="http://use.typekit.com/pif5ymh.js"></script>
9+
<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
810
<link rel="stylesheet" type="text/css" href="/css/style.css">
911
</head>
1012
<body>

‎js/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/view.activity-stream.js

+8-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/view.instapaper.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/view.scroller.js

+30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)