Skip to content

Commit 6031479

Browse files
berbaqueroberbaquero
committed
Merge branch 'share-on-twitter' into gh-pages
2 parents 3562bda + abf593c commit 6031479

File tree

4 files changed

+43
-22
lines changed

4 files changed

+43
-22
lines changed

‎about/index.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,15 @@
101101

102102
#links { padding: 25px 10px; }
103103

104-
#share { width: 100%; text-align: center; padding: 25px 0; }
104+
#share {
105+
padding: 30px 0;
106+
background-color: #eee;
107+
margin-top: 15px;
108+
}
109+
110+
#share iframe { margin-right: 10px; }
105111

106-
#share > div { margin-bottom: 20px; }
112+
.foot-btn { margin: 50px auto; }
107113

108114
#press {
109115
padding: 10px 10px 25px 10px;
@@ -193,17 +199,11 @@ <h3>"Ugly ol&#8217; Reddit gets a spiffy new UI with Reeddit."</h3>
193199
</div>
194200

195201
<footer>
196-
<a class='button' href='http://reedditapp.com/' target="_blank">Launch Reeddit</a>
197-
<div id='links'>
198-
<p>For comments, suggestions and to keep up-to-date on Reeddit's development, <a href="https://twitter.com/berbaquero" target="_blank">follow @BerBaquero on Twitter</a>.</p>
199-
<p>The source code, tools used and compatibility info is on <a href="https://github.com/berbaquero/reeddit" target="_blank">GitHub</a>.</p>
200-
</div>
202+
<a class='button foot-btn' href='http://reedditapp.com/' target="_blank">Launch Reeddit</a>
201203
<div id='share'>
202204
<div>
203205
<a href="https://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
204-
<a href="https://twitter.com/berbaquero" class="twitter-follow-button" data-show-count="false" data-lang="en">Follow @berbaquero</a>
205-
</div>
206-
<div>
206+
<a href="https://twitter.com/ReedditApp" class="twitter-follow-button" data-show-count="false" data-lang="en">Follow @ReedditApp</a>
207207
<iframe src="http://ghbtns.com/github-btn.html?user=berbaquero&repo=reeddit&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe>
208208
<iframe src="http://ghbtns.com/github-btn.html?user=berbaquero&repo=reeddit&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe>
209209
</div>

‎css/reeddit.css

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ a { color: #999; }
103103

104104
.comment-body p { margin: 10px 0; color: #3D525E; }
105105

106-
#link-summary { background-color: #777; padding: 10px 0 16px; }
106+
#link-summary { background-color: #777; padding: 10px 0 0; }
107107

108108
#link-summary:before {
109109
content: '';
@@ -130,13 +130,26 @@ a { color: #999; }
130130
color: #fafafa;
131131
font-weight: 700;
132132
padding-right: 10px;
133+
padding-bottom: 2px;
133134
}
134135

135136
#summary-time { color: white; text-align: center; }
136137

137-
#summary-domain { color: #F75433; font-weight: 700; font-size: 13px; }
138+
#summary-domain { color: #F75433; font-weight: 700; font-size: 13px; display: inline; }
138139

139-
#summary-author { color: #E2E2E0; font-weight: 700; display: inline; }
140+
#summary-author {
141+
color: #E2E2E0; font-weight: 700;
142+
-webkit-box-flex: 1; -moz-box-flex: 1; -ms-box-flex: 1;
143+
}
144+
145+
#share-tw { /* Share button position */
146+
-webkit-box-flex: 1; -moz-box-flex: 1; -ms-box-flex: 1;
147+
background-color: #BBB;
148+
padding: 3px 6px;
149+
margin-right: 10px;
150+
border-radius: 5px;
151+
font-weight: 700;
152+
}
140153

141154
#summary-sub { color: #FAFAFA; text-align: left; }
142155

@@ -158,6 +171,12 @@ a { color: #999; }
158171
width: 33%;
159172
}
160173

174+
#summary-footer {
175+
display: -webkit-box; display: -moz-box; display: box;
176+
padding-bottom: 10px;
177+
padding-top: 2px;
178+
}
179+
161180
#selftext {
162181
padding: 10px;
163182
margin: 10px;
@@ -373,7 +392,7 @@ a { color: #999; }
373392
-webkit-box-flex: 1; -moz-box-flex: 1; box-flex: 1;
374393
}
375394

376-
.comments-button, #top-buttons > div, .list-button > span {
395+
.comments-button, #top-buttons > div, .list-button > span, #share-tw {
377396
color: #555;
378397
background-image: -webkit-linear-gradient(whiteSmoke 0%, #CCC 100%);
379398
background-image: -moz-linear-gradient(whiteSmoke 0%, #CCC 100%);
@@ -505,7 +524,7 @@ header > div {
505524

506525
.comments-button {
507526
padding: 3px 10px;
508-
border-radius: 8px;
527+
border-radius: 5px;
509528
font-size: 11px;
510529
font-weight: 700;
511530
display: block;
@@ -953,15 +972,15 @@ header > div {
953972
#edit-subs { height: 4%; }
954973
}
955974

956-
@-moz-document url-prefix() { /* Firefox only - layout hacks, for lack of solid flexbox */
975+
@-moz-document url-prefix() { /* Firefox only - layout hacks (TODO: update to new flexbox) */
957976

958-
#remove-sub, .item-to-remove > div, .to-comments { float: right; }
977+
#remove-sub, .item-to-remove > div, .to-comments, #share-tw { float: right; }
959978

960-
#add-new-sub, .item-to-remove > p, .corner, header > div { float: left; }
979+
#add-new-sub, .item-to-remove > p, .corner, header > div, #summary-author { float: left; }
961980

962981
.item-to-remove { width: 100%; }
963982

964-
.link-wrap, #back-arrow, #refresh-icon, .item-to-remove { display: block; }
983+
.link-wrap, #back-arrow, #refresh-icon, .item-to-remove, #summary-footer { display: block; }
965984

966985
.to-comments { padding-top: 30px; }
967986

@@ -978,4 +997,6 @@ header > div {
978997
.btn-add-sub { display: table-cell; vertical-align: middle; }
979998

980999
.refresh-icon-FS { right: 20px; }
1000+
1001+
#share-tw { margin-bottom: 7px; }
9811002
}

‎js/reeddit.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
single: '<li><div class="channel" data-title="{{name}}"><p>{{name}}</p><div>{{#subs}}<p>{{.}}</p>{{/subs}}</div></div></li>',
1313
list: '{{#.}}<li><div class="channel" data-title="{{name}}"><p>{{name}}</p><div>{{#subs}}<p>{{.}}</p>{{/subs}}</div></div></li>{{/.}}'
1414
},
15-
linkSummary: "<section><div id='link-summary'><a href='{{url}}' target='_blank'><p id='summary-title'>{{title}}</p><p id='summary-domain'>{{domain}}</p></a><p id='summary-author'>by {{author}}</p>{{#over_18}}<span class='link-nsfw summary-nsfw'>NSFW</span>{{/over_18}}</div><div id='summary-extra'><p id='summary-sub'>{{subreddit}}</p><p id='summary-time'></p><a id='summary-comment-num' href='http://reddit.com{{link}}' target='_blank'>{{num_comments}} comments</a></div></section>",
15+
linkSummary: "<section><div id='link-summary'><a href='{{url}}' target='_blank'><p id='summary-title'>{{title}}</p><p id='summary-domain'>{{domain}}</p>{{#over_18}}<span class='link-nsfw summary-nsfw'>NSFW</span>{{/over_18}}</a><div id='summary-footer'><p id='summary-author'>by {{author}}</p><a id='share-tw' href='https://twitter.com/intent/tweet?text=\"{{title}}\" — &url={{url}}&via=ReedditApp&related=ReedditApp'>Tweet</a></div><div id='summary-extra'><p id='summary-sub'>{{subreddit}}</p><p id='summary-time'></p><a id='summary-comment-num' href='http://reddit.com{{link}}' target='_blank'>{{num_comments}} comments</a></div></section>",
1616
botonAgregarSubManual: "<div id='top-buttons'><div id='btn-sub-man'>Insert Manually</div><div id='btn-add-channel'>Add Channel</div></div>",
1717
formAgregarSubManual: '<div class="new-form" id="form-new-sub"><div class="close-form">close</div><form><input type="text" id="txt-new-sub" placeholder="New subreddit name" /></form></div>',
1818
formAddNewChannel: '<div class="new-form" id="form-new-channel"><div class="close-form">close</div><input type="text" id="txt-channel" placeholder="Channel name" /><div id="subs-for-channel"><input type="text" placeholder="Subreddit 1" /><input type="text" placeholder="Subreddit 2" /><input type="text" placeholder="Subreddit 3" /></div><div id="btn-add-new-channel">Add Channel</div></div>',
1919
botonCargarMasSubs: "<div class='list-button'><span id='more-subs'>More</span></div>",
2020
noLink: "<div id='no-link'><p>No Post Selected.</div>",
21-
about: "<div class='new-form about-reeddit'><div class='close-form'>close</div><ul><li><a href='http://reedditapp.com/about' target='_blank'>Reeddit info site</a></li><li><a href='https://github.com/berbaquero/reeddit' target='_blank'>GitHub Project</a></li></ul><p>Built by <a href='http://berbaquero.com' target='_blank'>Bernardo Baquero Stand</a></p></div>"
21+
about: "<div class='new-form about-reeddit'><div class='close-form'>close</div><ul><li><a href='http://reedditapp.com/about' target='_blank'>Reeddit Homepage</a></li><li><a href='https://github.com/berbaquero/reeddit' target='_blank'>GitHub Project</a></li></ul><p><a href='https://twitter.com/reedditapp'>@ReedditApp</a></p><p>Built by <a href='http://berbaquero.com' target='_blank'>Bernardo Baquero Stand</a></p></div>"
2222
};
2323

2424
var doc = win.document,

‎reeddit.appcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CACHE MANIFEST
22

3-
#v1.4.9 28-07-2013
3+
#v1.5.0 29-07-2013
44

55
css/style.css
66
css/desk.css

0 commit comments

Comments
 (0)