aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-07 16:48:54 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-07 16:48:54 -0700
commit09e365c797a6e63b2028e5980b32b52551f774db (patch)
tree27598390e6724365b572920e5c843273f9cbf498 /view/theme
parent78f0138270347d3e9621ba7b5cdffbc7fc34a48b (diff)
parentf6cf992aee86e69d1ea5790c22d4af40c266d79e (diff)
downloadvolse-hubzilla-09e365c797a6e63b2028e5980b32b52551f774db.tar.gz
volse-hubzilla-09e365c797a6e63b2028e5980b32b52551f774db.tar.bz2
volse-hubzilla-09e365c797a6e63b2028e5980b32b52551f774db.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/redbasic/css/style.css6
-rw-r--r--view/theme/redbasic/schema/focus.css5
-rw-r--r--view/theme/redbasic/schema/focus.php2
3 files changed, 7 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fcc089cf0..716298845 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -741,8 +741,8 @@ a.rateme, div.rateme {
}
.wall-item-conv {
- margin-top: 5px;
- margin-bottom: 25px;
+ padding-top: 5px;
+ padding-bottom: 10px;
}
@@ -1932,12 +1932,14 @@ nav .dropdown-menu {
background-color: $comment_item_colour;
border-bottom-left-radius: $radiuspx;
border-bottom-right-radius: $radiuspx;
+ word-wrap: break-word;
}
.section-content-wrapper-np {
background-color: $comment_item_colour;
border-bottom-left-radius: $radiuspx;
border-bottom-right-radius: $radiuspx;
+ word-wrap: break-word;
}
[id^="cloud-index-"]:hover td,
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
index 8d945a83e..3d64b8a7d 100644
--- a/view/theme/redbasic/schema/focus.css
+++ b/view/theme/redbasic/schema/focus.css
@@ -21,7 +21,6 @@
}
.wall-item-conv {
- margin-bottom: 10px;
- margin-top: 10px;
- margin-left: 10px;
+ padding-top: 10px;
+ padding-left: 10px;
}
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
index d93ee003e..4186c9f64 100644
--- a/view/theme/redbasic/schema/focus.php
+++ b/view/theme/redbasic/schema/focus.php
@@ -46,7 +46,7 @@ if (! $radius)
if (! $shadow)
$shadow = "0";
if (! $converse_width)
- $converse_width = "676";
+ $converse_width = "656";
if(! $top_photo)
$top_photo = '48px';
if(! $comment_indent)