diff options
| author | friendica <info@friendica.com> | 2014-08-13 16:54:59 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-13 16:54:59 -0700 |
| commit | 4156c68d0d433e804787cdd7ff52235d51b53ba2 (patch) | |
| tree | eae3a51dc94beefabb95fea5df455dfa80255f43 /view | |
| parent | eb38f3f47460bfb00af3dcae815720b2970a31eb (diff) | |
| parent | 4a938db39841d91d294b1cb1c193f12cae5f9492 (diff) | |
| download | volse-hubzilla-4156c68d0d433e804787cdd7ff52235d51b53ba2.tar.gz volse-hubzilla-4156c68d0d433e804787cdd7ff52235d51b53ba2.tar.bz2 volse-hubzilla-4156c68d0d433e804787cdd7ff52235d51b53ba2.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 4653ede89..a6540ffba 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -182,10 +182,11 @@ .comment-edit-text-empty, .comment-edit-text-full { float: left; width: 100%; - padding: 8px; } .comment-edit-text-empty { + padding: 0px 8px; + line-height: 28px; height: 30px; overflow: hidden; resize: none; @@ -193,6 +194,7 @@ } .comment-edit-text-full { + padding: 8px; height: 150px; overflow: auto; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8aecd484c..df9485dee 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2087,7 +2087,7 @@ img.mail-list-sender-photo { .comment-edit-text-empty { color: gray; - font-size: 11px; + font-size: 12px; } .comment-edit-text-full { diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index d64731ee3..703b08547 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> -<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1" /> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" /> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index a2038b930..6eda6a6ec 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -6,6 +6,9 @@ {{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}} +{{if $expert}} +{{include file="field_checkbox.tpl" field=$user_scalable}} +{{/if}} {{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$itemspage}} {{include file="field_checkbox.tpl" field=$nosmile}} |