aboutsummaryrefslogtreecommitdiffstats
path: root/view/css
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-30 06:30:46 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-30 06:30:46 -0400
commitf17f51a9c1f62dc0229e2428cacea4e84313560e (patch)
tree7486b05738e943bf39619d06bec9d83d7795e746 /view/css
parent5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6 (diff)
parentd858bd9265a4a0fa3589cdb2126031998310c7c3 (diff)
downloadvolse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.gz
volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.bz2
volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.zip
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'view/css')
-rw-r--r--view/css/conversation.css6
-rw-r--r--view/css/mod_cloud.css13
2 files changed, 19 insertions, 0 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 68aa8bfbe..5af0c55e7 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -40,6 +40,12 @@
resize: vertical;
}
+#profile-jot-text.hover {
+ background-color: aliceblue;
+ opacity: 0.5;
+ box-shadow: inset 0 0px 7px #5cb85c;
+}
+
.jot-attachment {
border: 0px;
padding: 10px;
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index ed07ceb6f..53eb80b44 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -41,3 +41,16 @@
padding: 7px 10px;
width: 100%;
}
+
+#cloud-drag-area.hover {
+ background-color: aliceblue;
+ opacity: 0.5;
+ box-shadow: inset 0 0px 7px #5cb85c;
+}
+
+.upload-progress-bar {
+ background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mOM2RFTDwAE2QHxFMHIIwAAAABJRU5ErkJggg==') repeat-y;
+ background-size: 0px;
+ padding: 0px !important;
+ height: 3px;
+}