aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-18 13:51:39 -0800
committerfriendica <info@friendica.com>2013-12-18 13:51:39 -0800
commit2be50ab580e46572e821e54891077b2b5316b16e (patch)
tree4faa72aa0d2b602890c0a3c4c9558a969051f324
parentdf34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
parent176fe3256428c8a2226030c4e1de89723e37cca7 (diff)
downloadvolse-hubzilla-2be50ab580e46572e821e54891077b2b5316b16e.tar.gz
volse-hubzilla-2be50ab580e46572e821e54891077b2b5316b16e.tar.bz2
volse-hubzilla-2be50ab580e46572e821e54891077b2b5316b16e.zip
Merge pull request #246 from git-marijus/master
minor fixes
-rw-r--r--view/css/conversation.css10
-rw-r--r--view/theme/redbasic/css/style.css10
-rw-r--r--view/theme/redbasic/js/redbasic.js12
3 files changed, 13 insertions, 19 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5bf6a3607..8125b6278 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -110,7 +110,7 @@
/* conversation */
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
width: 92%;
}
@@ -125,6 +125,14 @@
position: relative;
}
+.wall-item-content-wrapper .wall-item-delete-wrapper {
+ opacity: 0;
+}
+
+.wall-item-content-wrapper:hover .wall-item-delete-wrapper {
+ opacity: 1;
+}
+
.wall-item-info {
display: block;
float: left;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9ac021a54..411356d80 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2087,12 +2087,12 @@ margin-right: 50px;
}
a .drop-icons {
- color: #777;
+ color: $toolicon_colour;;
font-size: 1.2em;
text-decoration: none;
}
-.drop-icons:hover {
+a .drop-icons:hover {
color: #FF0000;
}
@@ -2265,7 +2265,7 @@ img.mail-list-sender-photo {
border-left: 2px solid #eee;
}
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
max-width: $converse_width;
}
@@ -2364,10 +2364,6 @@ img.mail-list-sender-photo {
color: $toolicon_activecolour;
}
-.drop-icons.item-tool {
- color: $toolicon_colour;
-}
-
.like-rotator {
color: $toolicon_colour;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e89c51119..e41fde2b8 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -47,16 +47,6 @@ $('.savedsearchdrop').hover(
$(this).css('opacity','0');}
);
-$('.savedsearchterm').hover(
- function() {
- id = $(this).attr('id');
- $('#dropicon-' + id).css('opacity','1.0');},
-
- function() {
- id = $(this).attr('id');
- $('#dropicon-' + id).css('opacity','0');
- });
-
});
@@ -72,4 +62,4 @@ $(document).ready(function(){
}
};
setInterval(function () {checkNotify();}, 10 * 1000);
-}); \ No newline at end of file
+});