diff options
| author | friendica <info@friendica.com> | 2014-04-18 16:14:13 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-18 16:14:13 -0700 |
| commit | b886647429c6b2f65e1a515adc5b2b739df63c27 (patch) | |
| tree | 5244b287928de79afa3ab454945fb5a2deaef8ec /view | |
| parent | ae1f9bf1c44cffa00b8aff566eef0f22bc26e720 (diff) | |
| parent | fdcb6052fca2a430bec31d31baa9781eba77b7cb (diff) | |
| download | volse-hubzilla-b886647429c6b2f65e1a515adc5b2b739df63c27.tar.gz volse-hubzilla-b886647429c6b2f65e1a515adc5b2b739df63c27.tar.bz2 volse-hubzilla-b886647429c6b2f65e1a515adc5b2b739df63c27.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/page_display.tpl | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c1bf257e1..1846c023b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1389,7 +1389,7 @@ brain is weird like that */ border:1px solid $acpopup_bordercolour; } .acpopupitem { - background-color:$acpopup_bgcolour; padding: 4px; + background-color:$acpopup_bgcolour; clear:left; } .acpopupitem.taggable { @@ -2292,8 +2292,12 @@ blockquote { text-decoration: $input_decohover; } -.btn-primary { - z-index: 10; +.btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active { + text-decoration: none; +} + +.btn-preview, .btn-preview:hover, .btn-preview:focus, .btn-preview:active { + margin-right: 1px; } @media screen and (max-width: 767px) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c4fdba0f5..2fd24d5ff 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" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-default btn-sm btn-preview" onclick="preview_post();return false;" title="{{$preview}}"> <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 9b6b182c8..d8175bdd2 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -2,7 +2,7 @@ <div class="generic-content-wrapper" id="page-content-wrapper" > <h3 class="page-title">{{$title}}</h3> - <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}{{if $zid}}?zid={{$zid}}{{/if}}">{{$author}}</a></div> + <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> </div> |