diff options
| -rw-r--r-- | include/permissions.php | 4 | ||||
| -rw-r--r-- | mod/lostpass.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/bluegrid.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/dark.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.css | 4 | ||||
| -rw-r--r-- | view/tpl/removeaccount.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/removeme.tpl | 2 |
10 files changed, 27 insertions, 7 deletions
diff --git a/include/permissions.php b/include/permissions.php index a8e761f87..8071af686 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -641,10 +641,10 @@ function get_role_perms($role) { $ret['directory_publish'] = true; $ret['online'] = false; $ret['perms_follow'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK - |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['perms_accept'] = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_ABOOK - |PERMS_W_STREAM|PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT + |PERMS_W_WALL|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT |PERMS_R_STORAGE|PERMS_R_PAGES|PERMS_A_REPUBLISH|PERMS_W_LIKE|PERMS_W_TAGWALL; $ret['channel_r_stream'] = PERMS_PUBLIC; $ret['channel_r_profile'] = PERMS_PUBLIC; 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/version.inc b/version.inc index f5b62614f..2e8e8f4ff 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2016-01-20.1284H +2016-01-21.1285H 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; diff --git a/view/tpl/removeaccount.tpl b/view/tpl/removeaccount.tpl index aefcd51a8..ce6c8ac22 100644 --- a/view/tpl/removeaccount.tpl +++ b/view/tpl/removeaccount.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="verify" value="{{$hash}}" /> <div class="form-group" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> - <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> {{include file="field_checkbox.tpl" field=$global}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> diff --git a/view/tpl/removeme.tpl b/view/tpl/removeme.tpl index 5b329dd6d..40b9546d2 100755 --- a/view/tpl/removeme.tpl +++ b/view/tpl/removeme.tpl @@ -10,7 +10,7 @@ <input type="hidden" name="verify" value="{{$hash}}" /> <div class="form-group" id="remove-account-pass-wrapper"> <label id="remove-account-pass-label" for="remove-account-pass">{{$passwd}}</label> - <input class="form-control" type="password" id="remove-account-pass" name="qxz_password" /> + <input class="form-control" type="password" id="remove-account-pass" autocomplete="off" name="qxz_password" value=" " /> </div> {{include file="field_checkbox.tpl" field=$global}} <button type="submit" name="submit" class="btn btn-danger">{{$submit}}</button> |