From f6ee43c8837df4d82312ef7443504902f620f10c Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 26 May 2014 11:32:58 +0200 Subject: Collapsed textareas are like buttons. They should not grow/shrink in size if app font-size changes. --- view/css/conversation.css | 2 +- view/theme/redbasic/css/style.css | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index 3fc82154b..1a614d2f0 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -16,7 +16,7 @@ } #profile-jot-text { - height: 3.4em; + height: 40px; padding: 8px; width: 100%; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index fe4c93e66..21f594132 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 { -- cgit v1.2.3 From 88bedec56c4c08988b6536e0e312ecfd883001bf Mon Sep 17 00:00:00 2001 From: 23n Date: Mon, 26 May 2014 18:50:54 +0200 Subject: divide autodate from item.app --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index fe54ac377..0915172fb 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,7 +26,7 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
- {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
-- cgit v1.2.3 From 83ffad4b9dac914d9d4a5a9365ee23fb8f9d8483 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 26 May 2014 22:34:43 +0200 Subject: fix one more bootstrap override regression --- view/theme/redbasic/css/style.css | 5 +---- view/theme/redbasic/php/style.php | 2 ++ view/tpl/comment_item.tpl | 2 +- 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 @@
{{if $preview}} - {{/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 @@ {{/if}} {{if $preview}} - {{/if}} -- cgit v1.2.3 From c61da303dd7b1d082b03f7acbe7618b406cc941a Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 26 May 2014 22:40:33 +0200 Subject: fix one more bootstrap override regression - addendum --- view/theme/redbasic/php/style.php | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 14893d86d..950b43198 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -324,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, -- cgit v1.2.3