mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
changing around markup to accommodate comments
This commit is contained in:
Roy Yang
parent
971ffe1b5a
commit
34108b6fe5
6 changed files with 63 additions and 61 deletions
|
|
@ -381,12 +381,12 @@ blockquote {
|
|||
margin: 0 10px;
|
||||
}
|
||||
|
||||
/* line 263, ../sass/screen.scss */
|
||||
/* line 264, ../sass/screen.scss */
|
||||
.NB-mark {
|
||||
margin: 20px 0 50px 0;
|
||||
}
|
||||
|
||||
/* line 267, ../sass/screen.scss */
|
||||
/* line 268, ../sass/screen.scss */
|
||||
.NB-story-wrapper {
|
||||
border-left: 1px solid #fff;
|
||||
background: #fff;
|
||||
|
|
@ -394,7 +394,7 @@ blockquote {
|
|||
-moz-box-shadow: 0px 0px 5px #c8c8c8;
|
||||
box-shadow: 0px 0px 5px #c8c8c8;
|
||||
}
|
||||
/* line 272, ../sass/screen.scss */
|
||||
/* line 273, ../sass/screen.scss */
|
||||
.NB-story-wrapper .NB-story-inner {
|
||||
border-left: 4px solid #fff;
|
||||
padding: 25px 25px 15px;
|
||||
|
|
@ -402,7 +402,7 @@ blockquote {
|
|||
position: relative;
|
||||
/* contains all children */
|
||||
}
|
||||
/* line 279, ../sass/screen.scss */
|
||||
/* line 280, ../sass/screen.scss */
|
||||
.NB-story-wrapper .NB-story-title a {
|
||||
font-size: 21px;
|
||||
font-weight: bold;
|
||||
|
|
@ -410,7 +410,7 @@ blockquote {
|
|||
text-decoration: none;
|
||||
color: #333333;
|
||||
}
|
||||
/* line 288, ../sass/screen.scss */
|
||||
/* line 289, ../sass/screen.scss */
|
||||
.NB-story-wrapper .NB-story-metadata {
|
||||
font-size: 14px;
|
||||
color: gray;
|
||||
|
|
@ -419,17 +419,17 @@ blockquote {
|
|||
/* to ensure that the author is always on one line */
|
||||
margin: 5px 0 8px;
|
||||
}
|
||||
/* line 296, ../sass/screen.scss */
|
||||
/* line 297, ../sass/screen.scss */
|
||||
.NB-story-wrapper .NB-feed {
|
||||
margin: 2px 0 10px;
|
||||
text-transform: capitalize;
|
||||
}
|
||||
/* line 300, ../sass/screen.scss */
|
||||
/* line 301, ../sass/screen.scss */
|
||||
.NB-story-wrapper .NB-feed a {
|
||||
color: gray;
|
||||
font-size: 12px;
|
||||
}
|
||||
/* line 305, ../sass/screen.scss */
|
||||
/* line 306, ../sass/screen.scss */
|
||||
.NB-story-wrapper .NB-feed img {
|
||||
float: left;
|
||||
width: 16px;
|
||||
|
|
@ -437,7 +437,7 @@ blockquote {
|
|||
margin-right: 4px;
|
||||
}
|
||||
|
||||
/* line 314, ../sass/screen.scss */
|
||||
/* line 315, ../sass/screen.scss */
|
||||
.NB-story {
|
||||
font-size: 14px;
|
||||
line-height: 140%;
|
||||
|
|
@ -449,37 +449,37 @@ blockquote {
|
|||
|
||||
*/
|
||||
}
|
||||
/* line 321, ../sass/screen.scss */
|
||||
/* line 322, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-wrapper {
|
||||
max-height: 300px;
|
||||
overflow: hidden;
|
||||
}
|
||||
/* line 325, ../sass/screen.scss */
|
||||
/* line 326, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-wrapper.NB-story-content-wrapper-height-fudged {
|
||||
max-height: none;
|
||||
}
|
||||
/* line 335, ../sass/screen.scss */
|
||||
/* line 336, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content {
|
||||
margin: 10px 0;
|
||||
}
|
||||
/* line 338, ../sass/screen.scss */
|
||||
/* line 339, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content p {
|
||||
margin: 10px 0;
|
||||
}
|
||||
/* line 342, ../sass/screen.scss */
|
||||
/* line 343, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content img {
|
||||
margin: 10px 0;
|
||||
}
|
||||
/* line 346, ../sass/screen.scss */
|
||||
/* line 347, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content ins {
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
}
|
||||
/* line 351, ../sass/screen.scss */
|
||||
/* line 352, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content del {
|
||||
display: none;
|
||||
}
|
||||
/* line 357, ../sass/screen.scss */
|
||||
/* line 358, ../sass/screen.scss */
|
||||
.NB-story .NC-story-cutoff {
|
||||
position: absolute;
|
||||
display: none;
|
||||
|
|
@ -490,7 +490,7 @@ blockquote {
|
|||
z-index: 0;
|
||||
background: transparent url('/../../../media/img/circular/module_cutoff.png?1345259189') repeat-x left bottom;
|
||||
}
|
||||
/* line 368, ../sass/screen.scss */
|
||||
/* line 369, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-expander {
|
||||
display: none;
|
||||
position: absolute;
|
||||
|
|
@ -502,27 +502,27 @@ blockquote {
|
|||
color: #1a9fff;
|
||||
font-size: 12px;
|
||||
}
|
||||
/* line 379, ../sass/screen.scss */
|
||||
/* line 380, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-expander:hover {
|
||||
color: #306187;
|
||||
}
|
||||
/* line 382, ../sass/screen.scss */
|
||||
/* line 383, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-expander:active {
|
||||
color: #722125;
|
||||
}
|
||||
/* line 386, ../sass/screen.scss */
|
||||
/* line 387, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-expander .NB-story-content-expander-text,
|
||||
.NB-story .NB-story-content-expander .NB-story-content-expander-pages {
|
||||
display: inline-block;
|
||||
}
|
||||
/* line 390, ../sass/screen.scss */
|
||||
/* line 391, ../sass/screen.scss */
|
||||
.NB-story .NB-story-content-expander .NB-story-content-expander-pages {
|
||||
line-height: 8px;
|
||||
padding: 0 12px;
|
||||
font-size: 24px;
|
||||
}
|
||||
|
||||
/* line 398, ../sass/screen.scss */
|
||||
/* line 399, ../sass/screen.scss */
|
||||
.NB-story-shares-container {
|
||||
text-align: right;
|
||||
color: gray;
|
||||
|
|
@ -530,13 +530,13 @@ blockquote {
|
|||
line-height: 16px;
|
||||
float: right;
|
||||
}
|
||||
/* line 405, ../sass/screen.scss */
|
||||
/* line 406, ../sass/screen.scss */
|
||||
.NB-story-shares-container .NB-story-share-label {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
margin-top: 3px;
|
||||
}
|
||||
/* line 414, ../sass/screen.scss */
|
||||
/* line 415, ../sass/screen.scss */
|
||||
.NB-story-shares-container .NB-story-share-profiles,
|
||||
.NB-story-shares-container .NB-story-share-profiles-shares-friends,
|
||||
.NB-story-shares-container .NB-story-share-profiles-shares-public,
|
||||
|
|
@ -544,17 +544,17 @@ blockquote {
|
|||
.NB-story-shares-container .NB-story-share-profiles-comments-public {
|
||||
display: inline-block;
|
||||
}
|
||||
/* line 418, ../sass/screen.scss */
|
||||
/* line 419, ../sass/screen.scss */
|
||||
.NB-story-shares-container .NB-story-share-profiles-shares-public,
|
||||
.NB-story-shares-container .NB-story-share-profiles-comments-public {
|
||||
opacity: .5;
|
||||
}
|
||||
/* line 421, ../sass/screen.scss */
|
||||
/* line 422, ../sass/screen.scss */
|
||||
.NB-story-shares-container .NB-user-avatar {
|
||||
display: inline-block;
|
||||
margin: 2px 1px 0 2px;
|
||||
}
|
||||
/* line 425, ../sass/screen.scss */
|
||||
/* line 426, ../sass/screen.scss */
|
||||
.NB-story-shares-container .NB-user-avatar img {
|
||||
-webkit-box-shadow: 0px 0px 1px #bdbdbd;
|
||||
-moz-box-shadow: 0px 0px 1px #bdbdbd;
|
||||
|
|
@ -564,17 +564,17 @@ blockquote {
|
|||
display: block;
|
||||
}
|
||||
|
||||
/* line 434, ../sass/screen.scss */
|
||||
/* line 435, ../sass/screen.scss */
|
||||
body.NC-hide-comments .NB-story-comments-container {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* line 438, ../sass/screen.scss */
|
||||
/* line 439, ../sass/screen.scss */
|
||||
.NB-story-comments-container {
|
||||
font-size: 14px;
|
||||
z-index: 10;
|
||||
}
|
||||
/* line 443, ../sass/screen.scss */
|
||||
/* line 444, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-user-avatar img,
|
||||
.NB-story-comments-container img.NB-user-avatar {
|
||||
position: absolute;
|
||||
|
|
@ -587,7 +587,7 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
border-radius: 3px / 3px;
|
||||
/* @include single-box-shadow; gets in the way of transparent PNGs */
|
||||
}
|
||||
/* line 453, ../sass/screen.scss */
|
||||
/* line 454, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-user-avatar.NB-story-comment-reshare img {
|
||||
top: 27px;
|
||||
left: 0px;
|
||||
|
|
@ -595,27 +595,27 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
width: 24px;
|
||||
height: 24px;
|
||||
}
|
||||
/* line 461, ../sass/screen.scss */
|
||||
/* line 462, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment {
|
||||
padding: 15px 0 18px 44px;
|
||||
border-top: 1px solid #bdbdbd;
|
||||
position: relative;
|
||||
min-height: 32px;
|
||||
}
|
||||
/* line 467, ../sass/screen.scss */
|
||||
/* line 468, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-username {
|
||||
float: left;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
/* line 473, ../sass/screen.scss */
|
||||
/* line 474, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-date {
|
||||
float: right;
|
||||
font-size: 12px;
|
||||
color: gray;
|
||||
text-shadow: 0px 1px 1px white;
|
||||
}
|
||||
/* line 480, ../sass/screen.scss */
|
||||
/* line 481, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-location {
|
||||
float: left;
|
||||
font-size: 12px;
|
||||
|
|
@ -623,18 +623,18 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
text-shadow: 0px 1px 1px white;
|
||||
margin-left: 15px;
|
||||
}
|
||||
/* line 489, ../sass/screen.scss */
|
||||
/* line 490, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-reply-button,
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-edit-button {
|
||||
display: none;
|
||||
}
|
||||
/* line 493, ../sass/screen.scss */
|
||||
/* line 494, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-content {
|
||||
padding-top: 4px;
|
||||
line-height: 18px;
|
||||
clear: both;
|
||||
}
|
||||
/* line 499, ../sass/screen.scss */
|
||||
/* line 500, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment .NB-story-comment-reshares .NB-user-avatar img {
|
||||
top: 15px;
|
||||
left: 12px;
|
||||
|
|
@ -642,7 +642,7 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
/* line 508, ../sass/screen.scss */
|
||||
/* line 509, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment-reply {
|
||||
margin-top: 15px;
|
||||
padding: 15px 0 0px 44px;
|
||||
|
|
@ -650,13 +650,13 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
position: relative;
|
||||
min-height: 32px;
|
||||
}
|
||||
/* line 515, ../sass/screen.scss */
|
||||
/* line 516, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment-reply .NB-story-comment-reply-content {
|
||||
padding-top: 4px;
|
||||
line-height: 18px;
|
||||
clear: both;
|
||||
}
|
||||
/* line 522, ../sass/screen.scss */
|
||||
/* line 523, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment-input {
|
||||
width: 431px;
|
||||
height: 16px;
|
||||
|
|
@ -664,7 +664,7 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
padding: 6px 4px;
|
||||
border: 1px solid #bdbdbd;
|
||||
}
|
||||
/* line 531, ../sass/screen.scss */
|
||||
/* line 532, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment-buttons .NB-story-comment-save {
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
|
|
@ -715,11 +715,11 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
text-shadow: 0px -1px 1px white;
|
||||
color: #333333;
|
||||
}
|
||||
/* line 539, ../sass/screen.scss */
|
||||
/* line 540, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comment-buttons .NB-story-comment-delete {
|
||||
display: none;
|
||||
}
|
||||
/* line 544, ../sass/screen.scss */
|
||||
/* line 545, ../sass/screen.scss */
|
||||
.NB-story-comments-container .NB-story-comments-public-header-wrapper {
|
||||
color: gray;
|
||||
font-size: 12px;
|
||||
|
|
@ -727,7 +727,7 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
padding: 3px 0;
|
||||
}
|
||||
|
||||
/* line 553, ../sass/screen.scss */
|
||||
/* line 554, ../sass/screen.scss */
|
||||
.NB-page-controls-next,
|
||||
.NB-page-controls-end {
|
||||
background-color: #6eb4e3;
|
||||
|
|
@ -782,7 +782,7 @@ body.NC-hide-comments .NB-story-comments-container {
|
|||
-moz-box-shadow: inset 0px 0px 10px #1f74b8;
|
||||
box-shadow: inset 0px 0px 10px #1f74b8;
|
||||
}
|
||||
/* line 564, ../sass/screen.scss */
|
||||
/* line 565, ../sass/screen.scss */
|
||||
.NB-page-controls-next .NB-page-controls-text,
|
||||
.NB-page-controls-end .NB-page-controls-text {
|
||||
position: absolute;
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ blockquote {
|
|||
}
|
||||
|
||||
.NB-error {
|
||||
|
||||
font-size: $smallest-font-size;
|
||||
color: #6A1000;
|
||||
padding: 15px 0 0;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ NEWSBLUR.Views.SocialPage = Backbone.View.extend({
|
|||
initialize_stories: function($stories) {
|
||||
var self = this;
|
||||
$stories = $stories || this.$el;
|
||||
$('.NB-story', $stories).each(function() {
|
||||
$('.NB-story-wrapper', $stories).each(function() {
|
||||
var $story = $(this);
|
||||
var guid = $story.data('guid');
|
||||
if (!self.stories[guid]) {
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ NEWSBLUR.Views.SocialPageComments = Backbone.View.extend({
|
|||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
console.log(this.page_view);
|
||||
this.page_view.toggle_login_dialog();
|
||||
this.page_view.toggle_login_dialog({});
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
|
@ -55,7 +55,9 @@ NEWSBLUR.Views.SocialPageComments = Backbone.View.extend({
|
|||
if (!NEWSBLUR.Globals.is_authenticated) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
this.page_view.login_view.toggle_login_dialog();
|
||||
this.page_view.login_view.toggle_login_dialog({
|
||||
open: true
|
||||
});
|
||||
return false;
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -18,8 +18,9 @@ NEWSBLUR.Views.SocialPageLoginSignupView = Backbone.View.extend({
|
|||
var $login_username = this.$('input[name=login_username]');
|
||||
var $login_password = this.$('input[name=login_password]');
|
||||
|
||||
if (options.close ||
|
||||
($popover.hasClass('NC-active'))) {
|
||||
if (options.open != true &&
|
||||
(options.close ||
|
||||
($popover.hasClass('NC-active')))) {
|
||||
// Close
|
||||
$popover.animate({
|
||||
'opacity': 0
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="NB-mark">
|
||||
<div class="NB-divider"></div>
|
||||
|
||||
<div class="NB-story-wrapper" style="border-color: #{{ story.feed.favicon_border }};">
|
||||
<div class="NB-story-wrapper" style="border-color: #{{ story.feed.favicon_border }};" data-feed-id="{{ story.story_feed_id }}" data-story-id="{{ story.id }}" data-guid="{{ story.guid_hash }}" {% if story.user_comments %}data-user-comments="{{ story.user_comments }}"{% endif %}>
|
||||
<div class="NB-story-inner" style="border-color: #{{ story.feed.favicon_color }};">
|
||||
<div class="NB-story-header-wrapper">
|
||||
<div class="NB-story-header">
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="NB-story {% if story.saved %}NB-story-saved{% endif %} {% if story.shared_by_user %}NB-story-shared{% endif %}" data-feed-id="{{ story.story_feed_id }}" data-story-id="{{ story.id }}" data-guid="{{ story.guid_hash }}" {% if story.user_comments %}data-user-comments="{{ story.user_comments }}"{% endif %}>
|
||||
<div class="NB-story {% if story.saved %}NB-story-saved{% endif %} {% if story.shared_by_user %}NB-story-shared{% endif %}">
|
||||
|
||||
<div class="NB-story-content-wrapper">
|
||||
<div class="NB-story-content">
|
||||
|
|
@ -63,15 +63,13 @@
|
|||
<div class="NB-story-content-expander-pages"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="NB-story-comments-container">
|
||||
{% if story.comment_count or not story.shared_by_user %}
|
||||
{% render_story_comments story %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="NB-story-comments-container">
|
||||
{% if story.comment_count or not story.shared_by_user %}
|
||||
{% render_story_comments story %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- end NB-story-wrapper -->
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue