diff options
| author | marijus <mario@mariovavti.com> | 2014-05-26 22:34:43 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-05-26 22:34:43 +0200 |
| commit | 83ffad4b9dac914d9d4a5a9365ee23fb8f9d8483 (patch) | |
| tree | 44a9f88cd4b506b04d7aeea81bdfeeb86938e73d | |
| parent | 88bedec56c4c08988b6536e0e312ecfd883001bf (diff) | |
| download | volse-hubzilla-83ffad4b9dac914d9d4a5a9365ee23fb8f9d8483.tar.gz volse-hubzilla-83ffad4b9dac914d9d4a5a9365ee23fb8f9d8483.tar.bz2 volse-hubzilla-83ffad4b9dac914d9d4a5a9365ee23fb8f9d8483.zip | |
fix one more bootstrap override regression
| -rw-r--r-- | view/theme/redbasic/css/style.css | 5 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rwxr-xr-x | view/tpl/comment_item.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 21f594132..eeec051b5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2267,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; } @@ -2276,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..14893d86d 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) diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 0b89bb16a..13c827b77 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -54,7 +54,7 @@ </div> <div class="btn-group pull-right" id="comment-edit-submit-wrapper-{{$id}}"> {{if $preview}} - <button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs btn-preview" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> + <button id="comment-edit-submit-{{$id}}" class="btn btn-default btn-xs" onclick="preview_comment({{$id}}); return false;" title="{{$preview}}"> <i class="icon-eye-open comment-icon" ></i> </button> {{/if}} diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 2fd24d5ff..c4fdba0f5 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -81,7 +81,7 @@ </button> {{/if}} {{if $preview}} - <button class="btn btn-default btn-sm btn-preview" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} |