aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-01-21 14:04:37 -0800
committerredmatrix <git@macgirvin.com>2016-01-21 14:04:37 -0800
commit699d5d10813855fc2897a778dec74e6857bb1be6 (patch)
tree5416740714ad429bc233aba42922f4282a204b09
parent8847e39fb737f36a9d478a12d6f72e87c5b15114 (diff)
parent55e9bd36605690cc0dfdc03145ab8ed13a417866 (diff)
downloadvolse-hubzilla-699d5d10813855fc2897a778dec74e6857bb1be6.tar.gz
volse-hubzilla-699d5d10813855fc2897a778dec74e6857bb1be6.tar.bz2
volse-hubzilla-699d5d10813855fc2897a778dec74e6857bb1be6.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rw-r--r--mod/lostpass.php2
-rw-r--r--view/theme/redbasic/schema/bluegrid.css8
-rw-r--r--view/theme/redbasic/schema/dark.css2
-rw-r--r--view/theme/redbasic/schema/simple_black_on_white.css4
-rw-r--r--view/theme/redbasic/schema/simple_green_on_black.css4
-rw-r--r--view/theme/redbasic/schema/simple_white_on_black.css4
6 files changed, 22 insertions, 2 deletions
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 3dbc2fe7d..ffdd7b62e 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -87,7 +87,7 @@ function lostpass_content(&$a) {
'$lbl2' => t('Your password has been reset as requested.'),
'$lbl3' => t('Your new password is'),
'$lbl4' => t('Save or copy your new password - and then'),
- '$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+ '$lbl5' => '<a href="' . $a->get_baseurl() . '/login">' . t('click here to login') . '</a>.',
'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
'$newpass' => $new_password,
'$baseurl' => $a->get_baseurl()
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index f0ae1e8df..38701024f 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus {
color: rgba(255,255,255,.8);
}
+.widget .conv-participants {
+ color: #BBB;
+}
+
+.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
+ color: inherit;
+}
+
.help-block, .comment-icon, .jot-icons, .admin-icons {
color: inherit;
}
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 936f74761..f65e9aac9 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -88,7 +88,7 @@
background-color: #111;
}
-.jotnets-wrapper > a.btn {
+a.btn, aside a {
font-weight: 400 !important;
}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index f69ba3450..5a6b2655b 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -75,6 +75,10 @@
background-color: #fff;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #fff;
border-color: #000;
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 1f0a2f1e6..d25585f98 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -75,6 +75,10 @@
background-color: #000;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #000;
border-color: #143D12;
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 627f3ee5c..277ac7a12 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -71,6 +71,10 @@
background-color: #000;
}
+a.btn, aside a {
+ font-weight: 400 !important;
+}
+
.btn-default {
background-color: #000;
border-color: #fff;