aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-25 13:27:42 -0700
committerredmatrix <git@macgirvin.com>2016-07-25 13:27:42 -0700
commitd786eca126f7fe19b97c5ca4dcdf55d15b2ec3c7 (patch)
tree86676e4890612fccffa1831d0b6a8ff3d62fb2bf
parent2fb49521379cdaf743e3e3eb717e5df6ef39a8a3 (diff)
parentda512cef64be9268536626f81c0af59613aa5cdd (diff)
downloadvolse-hubzilla-d786eca126f7fe19b97c5ca4dcdf55d15b2ec3c7.tar.gz
volse-hubzilla-d786eca126f7fe19b97c5ca4dcdf55d15b2ec3c7.tar.bz2
volse-hubzilla-d786eca126f7fe19b97c5ca4dcdf55d15b2ec3c7.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-rw-r--r--view/theme/redbasic/css/style.css1
-rw-r--r--view/tpl/cloud_actionspanel.tpl2
2 files changed, 2 insertions, 1 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6fde5e39e..ce69b6cff 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -106,6 +106,7 @@ input[type="submit"] {
input, optgroup, select, textarea {
color: #333;
+ resize: vertical;
}
pre code {
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index fba457fdc..acba965f2 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -18,7 +18,7 @@
<div class="clear"></div>
<label for="files-upload">{{$upload_header}}</label>
<div class="clear"></div>
- <input class="form-group pull-left" id="files-upload" type="file" name="file" style="width: 70%;">
+ <input class="form-group pull-left" id="files-upload" type="file" name="file">
<button class="btn btn-primary btn-sm pull-right" type="submit" value="{{$upload_submit}}">{{$upload_submit}}</button>
</form>
<div class="clear"></div>