diff options
| author | friendica <info@friendica.com> | 2014-05-26 16:39:35 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-05-26 16:39:35 -0700 |
| commit | d749c1d9c63150f26140e6abab4e50507d477256 (patch) | |
| tree | a79eed0824565a7c662e3258e85181f4bd5db406 /view/theme | |
| parent | e81f31c41cff89722d3bb4e6ebb5ee830c9094d6 (diff) | |
| parent | c61da303dd7b1d082b03f7acbe7618b406cc941a (diff) | |
| download | volse-hubzilla-d749c1d9c63150f26140e6abab4e50507d477256.tar.gz volse-hubzilla-d749c1d9c63150f26140e6abab4e50507d477256.tar.bz2 volse-hubzilla-d749c1d9c63150f26140e6abab4e50507d477256.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fe4c93e66..eeec051b5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1847,11 +1847,11 @@ img.mail-list-sender-photo { } #profile-jot-text::-webkit-input-placeholder { - font-size:1.5em; + font-size:19px; } #profile-jot-text::-moz-placeholder { - font-size:1.5em; + font-size:19px; } #profile-jot-text:focus::-webkit-input-placeholder { @@ -1988,6 +1988,7 @@ img.mail-list-sender-photo { .comment-edit-text-empty { color: gray; + font-size: 11px; } .comment-edit-text-full { @@ -2266,7 +2267,7 @@ blockquote { .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active { background-color: $editbuttons_bghover; - border-color: $editbuttons_bordercolour; + border-color: $editbuttons_bordercolourhover; color: $input_colourhover; text-decoration: $input_decohover; } @@ -2275,9 +2276,6 @@ blockquote { text-decoration: none; } -.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active { - margin-right: 1px; -} @media screen and (max-width: 767px) { aside#region_1 { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 881ddcf4f..950b43198 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -167,6 +167,8 @@ if(! $a->install) { $editbuttons_bgcolour = "transparent"; if (! $editbuttons_bordercolour) $editbuttons_bordercolour = "#ccc"; + if (! $editbuttons_bordercolourhover) + $editbuttons_bordercolourhover = "#adadad"; if (! $editbuttons_colour) $editbuttons_colour = "#333"; if (! $editbuttons_bghover) @@ -322,6 +324,7 @@ $options = array ( '$notif_itemhovercolour' => $notif_itemhovercolour, '$editbuttons_bgcolour' => $editbuttons_bgcolour, '$editbuttons_bordercolour' => $editbuttons_bordercolour, +'$editbuttons_bordercolourhover' => $editbuttons_bordercolourhover, '$editbuttons_colour' => $editbuttons_colour, '$editbuttons_bghover' => $editbuttons_bghover, '$dropdown_bgcolour' => $dropdown_bgcolour, |