Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAugier <contact@c-henry.fr>2016-09-24 14:28:46 +0300
committerDennis Schubert <mail@dennis-schubert.de>2016-09-25 04:12:28 +0300
commit523f1e848ec3373313fc781200b0ea3ba0cad1ee (patch)
tree4be13944454c8c5275e366e14f942a8a97bd67eb /app/assets
parent709547860a7ecd3f7c113f120c7c60f96f5586a2 (diff)
Replace .stream_element by .stream-element
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/app/views/conversations_view.js2
-rw-r--r--app/assets/javascripts/app/views/notification_dropdown_view.js2
-rw-r--r--app/assets/javascripts/app/views/notifications_view.js8
-rw-r--r--app/assets/javascripts/app/views/preview_post_view.js2
-rw-r--r--app/assets/javascripts/app/views/stream/shortcuts.js16
-rw-r--r--app/assets/javascripts/app/views/stream_post_views.js2
-rw-r--r--app/assets/javascripts/mobile/mobile_application.js2
-rw-r--r--app/assets/javascripts/mobile/mobile_comments.js2
-rw-r--r--app/assets/javascripts/mobile/mobile_post_actions.js2
-rw-r--r--app/assets/stylesheets/color_themes/_color_theme_override.scss4
-rw-r--r--app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss2
-rw-r--r--app/assets/stylesheets/contacts.scss2
-rw-r--r--app/assets/stylesheets/conversations.scss10
-rw-r--r--app/assets/stylesheets/header.scss2
-rw-r--r--app/assets/stylesheets/interactions.scss6
-rw-r--r--app/assets/stylesheets/map.scss2
-rw-r--r--app/assets/stylesheets/mobile/comments.scss2
-rw-r--r--app/assets/stylesheets/mobile/conversations.scss4
-rw-r--r--app/assets/stylesheets/mobile/mobile.scss12
-rw-r--r--app/assets/stylesheets/mobile/stream_element.scss2
-rw-r--r--app/assets/stylesheets/notifications.scss2
-rw-r--r--app/assets/stylesheets/people.scss2
-rw-r--r--app/assets/stylesheets/rtl.scss10
-rw-r--r--app/assets/stylesheets/stream_element.scss6
-rw-r--r--app/assets/templates/contact_tpl.jst.hbs2
-rw-r--r--app/assets/templates/no_posts_info_tpl.jst.hbs2
26 files changed, 55 insertions, 55 deletions
diff --git a/app/assets/javascripts/app/views/conversations_view.js b/app/assets/javascripts/app/views/conversations_view.js
index d5ed22a3a..524b93f6b 100644
--- a/app/assets/javascripts/app/views/conversations_view.js
+++ b/app/assets/javascripts/app/views/conversations_view.js
@@ -23,7 +23,7 @@ app.views.Conversations = Backbone.View.extend({
app.helpers.timeago($(this.el));
$(".control-icons a").tooltip({placement: "bottom"});
- var conv = $(".conversation-wrapper .stream_element.selected"),
+ var conv = $(".conversation-wrapper .stream-element.selected"),
cBadge = $("#conversations-link .badge");
if(conv.hasClass("unread") ){
diff --git a/app/assets/javascripts/app/views/notification_dropdown_view.js b/app/assets/javascripts/app/views/notification_dropdown_view.js
index 3fec6a793..a44556c9a 100644
--- a/app/assets/javascripts/app/views/notification_dropdown_view.js
+++ b/app/assets/javascripts/app/views/notification_dropdown_view.js
@@ -95,7 +95,7 @@ app.views.NotificationDropdown = app.views.Base.extend({
renderNotifications: function(){
var self = this;
- this.dropdownNotifications.find(".media.stream_element").remove();
+ this.dropdownNotifications.find(".media.stream-element").remove();
$.each(self.notifications, function(index, notifications){
$.each(notifications, function(index, notification){
if($.inArray(notification, notifications) === -1){
diff --git a/app/assets/javascripts/app/views/notifications_view.js b/app/assets/javascripts/app/views/notifications_view.js
index 3af3e717d..69ac3cd01 100644
--- a/app/assets/javascripts/app/views/notifications_view.js
+++ b/app/assets/javascripts/app/views/notifications_view.js
@@ -13,14 +13,14 @@ app.views.Notifications = Backbone.View.extend({
},
toggleUnread: function(evt) {
- var note = $(evt.target).closest(".stream_element");
+ var note = $(evt.target).closest(".stream-element");
var unread = note.hasClass("unread");
var guid = note.data("guid");
if (unread){ this.setRead(guid); }
else { this.setUnread(guid); }
},
- getAllUnread: function(){ return $(".media.stream_element.unread"); },
+ getAllUnread: function(){ return $(".media.stream-element.unread"); },
setRead: function(guid) { this.setUnreadStatus(guid, false); },
@@ -38,7 +38,7 @@ app.views.Notifications = Backbone.View.extend({
clickSuccess: function(data) {
var guid = data.guid;
- var type = $(".stream_element[data-guid=" + guid + "]").data("type");
+ var type = $(".stream-element[data-guid=" + guid + "]").data("type");
this.updateView(guid, type, data.unread);
},
@@ -55,7 +55,7 @@ app.views.Notifications = Backbone.View.extend({
allNotes = $("#notifications_container .list-group > a:eq(0) .badge"),
typeNotes = $("#notifications_container .list-group > a[data-type=" + type + "] .badge"),
headerBadge = $(".notifications-link .badge"),
- note = $(".notifications .stream_element[data-guid=" + guid + "]"),
+ note = $(".notifications .stream-element[data-guid=" + guid + "]"),
markAllReadLink = $("a#mark_all_read_link"),
translationKey = unread ? "notifications.mark_read" : "notifications.mark_unread";
diff --git a/app/assets/javascripts/app/views/preview_post_view.js b/app/assets/javascripts/app/views/preview_post_view.js
index 1f8fe3981..d3b975f65 100644
--- a/app/assets/javascripts/app/views/preview_post_view.js
+++ b/app/assets/javascripts/app/views/preview_post_view.js
@@ -2,7 +2,7 @@
app.views.PreviewPost = app.views.Post.extend({
templateName: "stream-element",
- className: "stream_element loaded",
+ className: "stream-element loaded",
subviews: {
".feedback": "feedbackView",
diff --git a/app/assets/javascripts/app/views/stream/shortcuts.js b/app/assets/javascripts/app/views/stream/shortcuts.js
index dd62588c9..0be50ca26 100644
--- a/app/assets/javascripts/app/views/stream/shortcuts.js
+++ b/app/assets/javascripts/app/views/stream/shortcuts.js
@@ -57,7 +57,7 @@ app.views.StreamShortcuts = Backbone.View.extend({
gotoNext: function() {
// select next post: take the first post under the header
- var streamElements = this.$("div.stream_element.loaded");
+ var streamElements = this.$("div.stream-element.loaded");
var posUser = window.pageYOffset;
for (var i = 0; i < streamElements.length; i++) {
@@ -74,7 +74,7 @@ app.views.StreamShortcuts = Backbone.View.extend({
gotoPrev: function() {
// select previous post: take the first post above the header
- var streamElements = this.$("div.stream_element.loaded");
+ var streamElements = this.$("div.stream-element.loaded");
var posUser = window.pageYOffset;
for (var i = streamElements.length - 1; i >= 0; i--) {
@@ -90,23 +90,23 @@ app.views.StreamShortcuts = Backbone.View.extend({
},
commentSelected: function() {
- $('a.focus_comment_textarea',this.$('div.stream_element.loaded.shortcut_selected')).click();
+ $('a.focus_comment_textarea',this.$('div.stream-element.loaded.shortcut_selected')).click();
},
likeSelected: function() {
- $('a.like:first',this.$('div.stream_element.loaded.shortcut_selected')).click();
+ $('a.like:first',this.$('div.stream-element.loaded.shortcut_selected')).click();
},
reshareSelected: function() {
- $('a.reshare:first',this.$('div.stream_element.loaded.shortcut_selected')).click();
+ $('a.reshare:first',this.$('div.stream-element.loaded.shortcut_selected')).click();
},
expandSelected: function() {
- $('div.expander:first',this.$('div.stream_element.loaded.shortcut_selected')).click();
+ $('div.expander:first',this.$('div.stream-element.loaded.shortcut_selected')).click();
},
openFirstLinkSelected: function() {
- var link = $('div.collapsible a[target="_blank"]:first',this.$('div.stream_element.loaded.shortcut_selected'));
+ var link = $('div.collapsible a[target="_blank"]:first',this.$('div.stream-element.loaded.shortcut_selected'));
if(link.length > 0) {
// click does only work with vanilla javascript
link[0].click();
@@ -115,7 +115,7 @@ app.views.StreamShortcuts = Backbone.View.extend({
selectPost: function(element){
//remove the selection and selected-class from all posts
- var selected=this.$('div.stream_element.loaded.shortcut_selected');
+ var selected=this.$('div.stream-element.loaded.shortcut_selected');
selected.removeClass('shortcut_selected').removeClass('highlighted');
//move to new post
window.scrollTo(window.pageXOffset, Math.round($(element).offset().top - this._headerSize));
diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js
index 60812f6b9..4e4f4f307 100644
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -2,7 +2,7 @@
app.views.StreamPost = app.views.Post.extend({
templateName: "stream-element",
- className : "stream_element loaded",
+ className : "stream-element loaded",
subviews : {
".feedback": "feedbackView",
diff --git a/app/assets/javascripts/mobile/mobile_application.js b/app/assets/javascripts/mobile/mobile_application.js
index d10e2111d..e1d3c64d1 100644
--- a/app/assets/javascripts/mobile/mobile_application.js
+++ b/app/assets/javascripts/mobile/mobile_application.js
@@ -2,7 +2,7 @@
Diaspora.Mobile = {
initialize: function(){
$(".shield a").click(function(){
- $(this).parents(".stream_element").removeClass("shield-active");
+ $(this).parents(".stream-element").removeClass("shield-active");
return false;
});
diff --git a/app/assets/javascripts/mobile/mobile_comments.js b/app/assets/javascripts/mobile/mobile_comments.js
index 1690b2d9c..e753b70f2 100644
--- a/app/assets/javascripts/mobile/mobile_comments.js
+++ b/app/assets/javascripts/mobile/mobile_comments.js
@@ -195,7 +195,7 @@
if(!count){
text = Diaspora.I18n.t("stream.reactions", {count: 1});
var parent = toggleReactionsLink.parent();
- var postGuid = bottomBar.parents(".stream_element").data("guid");
+ var postGuid = bottomBar.parents(".stream-element").data("guid");
toggleReactionsLink.remove();
toggleReactionsLink = $("<a/>", {"class": "show-comments", "href": Routes.postComments(postGuid) + ".mobile"})
diff --git a/app/assets/javascripts/mobile/mobile_post_actions.js b/app/assets/javascripts/mobile/mobile_post_actions.js
index ff83a62f5..6f7c18ee6 100644
--- a/app/assets/javascripts/mobile/mobile_post_actions.js
+++ b/app/assets/javascripts/mobile/mobile_post_actions.js
@@ -70,7 +70,7 @@
onLike: function(evt){
evt.preventDefault();
var link = $(evt.target),
- likeCounter = $(evt.target).closest(".stream_element").find(".like-count");
+ likeCounter = $(evt.target).closest(".stream-element").find(".like-count");
if(!link.hasClass("loading") && link.hasClass("inactive")) {
Diaspora.Mobile.PostActions.like(likeCounter, link);
diff --git a/app/assets/stylesheets/color_themes/_color_theme_override.scss b/app/assets/stylesheets/color_themes/_color_theme_override.scss
index 899885f8e..2be21f1e1 100644
--- a/app/assets/stylesheets/color_themes/_color_theme_override.scss
+++ b/app/assets/stylesheets/color_themes/_color_theme_override.scss
@@ -3,9 +3,9 @@ body {
a,
a.tag,
.btn-link,
- #main_stream .stream_element > .media a.author-name,
+ #main_stream .stream-element > .media a.author-name,
#hovercard h4 a,
- .stream_element .from a.self {
+ .stream-element .from a.self {
color: $link-color;
&:hover, &:focus {
diff --git a/app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss b/app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss
index ff7450ecf..c8e7fe62f 100644
--- a/app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss
+++ b/app/assets/stylesheets/color_themes/_color_theme_override_origwhite.scss
@@ -1,5 +1,5 @@
body {
- #main_stream .stream_element {
+ #main_stream .stream-element {
border: 0;
border-bottom: 1px solid $border-grey;
margin-bottom: 10px;
diff --git a/app/assets/stylesheets/contacts.scss b/app/assets/stylesheets/contacts.scss
index aaef928f7..a11cc8a93 100644
--- a/app/assets/stylesheets/contacts.scss
+++ b/app/assets/stylesheets/contacts.scss
@@ -49,7 +49,7 @@
#suggest_member.btn { margin-top: 8px; }
}
- .stream_element {
+ .stream-element {
.contact_remove-from-aspect, .contact_add-to-aspect {
text-decoration: none;
cursor: pointer;
diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index 01540628e..2cb78e2da 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -16,7 +16,7 @@
width: 100%;
}
- .stream_element {
+ .stream-element {
background-color: $white;
padding: 10px;
@@ -28,8 +28,8 @@
> .media { margin: 0; }
}
- .stream_element.message,
- .stream_element.new-message {
+ .stream-element.message,
+ .stream-element.new-message {
border: 1px solid $light-grey;
box-shadow: $card-shadow;
margin-bottom: 20px;
@@ -46,7 +46,7 @@
}
}
- .stream_element.new-message,
+ .stream-element.new-message,
.new-conversation {
label { font-weight: bold; }
@@ -57,7 +57,7 @@
}
}
- .stream_element.conversation {
+ .stream-element.conversation {
border-top: 1px solid $border-grey;
.timestamp { font-size: $font-size-small; }
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss
index 9cb3a533d..4d7aa516b 100644
--- a/app/assets/stylesheets/header.scss
+++ b/app/assets/stylesheets/header.scss
@@ -87,7 +87,7 @@
position: relative;
max-height: 350px;
}
- .stream_element.media {
+ .stream-element.media {
padding: 5px;
.tooltip { position: fixed; }
.unread-toggle {
diff --git a/app/assets/stylesheets/interactions.scss b/app/assets/stylesheets/interactions.scss
index 90c5d0063..e2f95d677 100644
--- a/app/assets/stylesheets/interactions.scss
+++ b/app/assets/stylesheets/interactions.scss
@@ -41,10 +41,10 @@
}
}
-.stream_element,
+.stream-element,
.comment,
.photo,
-.stream_element:hover .comment {
+.stream-element:hover .comment {
.control-icons {
@include transition(opacity);
opacity: 0;
@@ -53,7 +53,7 @@
&:hover .control-icons { opacity: 1; }
}
-.stream_element,
+.stream-element,
.comment,
.photo {
.control-icons > a {
diff --git a/app/assets/stylesheets/map.scss b/app/assets/stylesheets/map.scss
index c521795bf..ef190f3f5 100644
--- a/app/assets/stylesheets/map.scss
+++ b/app/assets/stylesheets/map.scss
@@ -3,7 +3,7 @@
overflow: hidden;
}
-.stream_element .near-from:hover {
+.stream-element .near-from:hover {
cursor: pointer;
text-decoration: underline;
}
diff --git a/app/assets/stylesheets/mobile/comments.scss b/app/assets/stylesheets/mobile/comments.scss
index 3b10f6bd3..7f5382c37 100644
--- a/app/assets/stylesheets/mobile/comments.scss
+++ b/app/assets/stylesheets/mobile/comments.scss
@@ -90,7 +90,7 @@
}
}
-.stream_element .comments {
+.stream-element .comments {
margin: 0;
padding: 0;
width: 100%;
diff --git a/app/assets/stylesheets/mobile/conversations.scss b/app/assets/stylesheets/mobile/conversations.scss
index ac6495f65..e0e02411a 100644
--- a/app/assets/stylesheets/mobile/conversations.scss
+++ b/app/assets/stylesheets/mobile/conversations.scss
@@ -31,14 +31,14 @@
}
}
- .stream .stream_element .timeago,
+ .stream .stream-element .timeago,
.conversation-participants .last-message-timeago {
display: block;
font-style: italic;
color: $text-grey;
}
- .stream .stream_element {
+ .stream .stream-element {
padding: 0.5rem;
.ltr {
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 87e496e04..87f6ca9bb 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -49,7 +49,7 @@ textarea { resize: vertical; }
.badge-important { background-color: $red; }
-.stream_element,
+.stream-element,
.comments {
overflow: auto;
position: relative;
@@ -108,11 +108,11 @@ textarea { resize: vertical; }
width: 100%;
}
-.stream_element:not(.shield-active) .shield{
+.stream-element:not(.shield-active) .shield{
display: none;
}
-.stream_element.shield-active .nsfw-hidden{
+.stream-element.shield-active .nsfw-hidden{
display: none;
}
@@ -153,7 +153,7 @@ footer {
}
.settings_container,
-.stream_element,
+.stream-element,
#login_form {
border-radius: 5px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
@@ -165,7 +165,7 @@ footer {
border-bottom-color: #aaa;
}
-.stream_element {
+.stream-element {
padding: 0px;
div.img img.avatar {
@@ -575,7 +575,7 @@ form#new_user.new_user input.btn {
}
}
-.read.stream_element {
+.read.stream-element {
color: dimGray;
.from {
a {
diff --git a/app/assets/stylesheets/mobile/stream_element.scss b/app/assets/stylesheets/mobile/stream_element.scss
index 13734c6a9..f52dc9fa4 100644
--- a/app/assets/stylesheets/mobile/stream_element.scss
+++ b/app/assets/stylesheets/mobile/stream_element.scss
@@ -1,4 +1,4 @@
-.stream_element {
+.stream-element {
.location {
color: $text-grey;
font-size: $font-size-small;
diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss
index f4349d1e1..16f12513c 100644
--- a/app/assets/stylesheets/notifications.scss
+++ b/app/assets/stylesheets/notifications.scss
@@ -62,7 +62,7 @@
}
#notifications_container .stream, header .nav-badges .notifications {
- .stream_element.media {
+ .stream-element.media {
padding: 10px;
margin: 0px;
line-height: 18px;
diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss
index 66dcb7082..fbe3900ba 100644
--- a/app/assets/stylesheets/people.scss
+++ b/app/assets/stylesheets/people.scss
@@ -9,7 +9,7 @@
.media, .media-body {
overflow: visible;
}
- .stream_element.media {
+ .stream-element.media {
border-bottom: 1px solid $border-grey;
padding: 10px;
margin: 0;
diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss
index 15a564872..bec248686 100644
--- a/app/assets/stylesheets/rtl.scss
+++ b/app/assets/stylesheets/rtl.scss
@@ -8,12 +8,12 @@ body {
right: auto;
}
-.stream_element .content {
+.stream-element .content {
padding-right: 60px;
padding-left: 0;
}
-.stream_element .right {
+.stream-element .right {
left: 12px;
right: auto;
}
@@ -75,17 +75,17 @@ ul.comments li form p, ul.show_comments li form p, div.likes li form p, div.disl
right: 35px;
}
-.stream .stream_element time {
+.stream .stream-element time {
right: auto;
left: 20px;
}
-.stream_element.conversation .message-count {
+.stream-element.conversation .message-count {
right: auto;
left: 10px;
}
-.stream_element.conversation .timestamp {
+.stream-element.conversation .timestamp {
right: auto;
left: 10px;
}
diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss
index 26899f05f..e9f466676 100644
--- a/app/assets/stylesheets/stream_element.scss
+++ b/app/assets/stylesheets/stream_element.scss
@@ -1,4 +1,4 @@
-.stream_element,
+.stream-element,
.photo {
& > .media {
margin: 0px;
@@ -60,7 +60,7 @@
}
}
-#main_stream .stream_element {
+#main_stream .stream-element {
margin-bottom: 20px;
border: 1px solid $light-grey;
box-shadow: $card-shadow;
@@ -71,7 +71,7 @@
}
}
-.stream_element {
+.stream-element {
background-color: $white;
padding: 10px;
diff --git a/app/assets/templates/contact_tpl.jst.hbs b/app/assets/templates/contact_tpl.jst.hbs
index beddbdc3b..9be2e1d62 100644
--- a/app/assets/templates/contact_tpl.jst.hbs
+++ b/app/assets/templates/contact_tpl.jst.hbs
@@ -1,4 +1,4 @@
-<div class="clearfix stream_element media contact {{in_aspect}}" id={{person_id}}>
+<div class="clearfix stream-element media contact {{in_aspect}}" id={{person_id}}>
<div class="pull-right">
{{{aspectMembershipIndicator this in_aspect}}}
</div>
diff --git a/app/assets/templates/no_posts_info_tpl.jst.hbs b/app/assets/templates/no_posts_info_tpl.jst.hbs
index b617b72f1..7786819c9 100644
--- a/app/assets/templates/no_posts_info_tpl.jst.hbs
+++ b/app/assets/templates/no_posts_info_tpl.jst.hbs
@@ -1,4 +1,4 @@
-<div class="stream_element">
+<div class="stream-element">
<div class="no-posts-info text-center">
<strong>{{ t "stream.no_posts_yet" }}</strong>
</div>