aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorrr-2017-02-21 18:54:46 +0100
committerrr-2017-02-21 19:00:02 +0100
commitd00d282bff15d37cff7818d39663ad07b3cbee43 (patch)
treec4ed06cce7e9f82dd149829cdfb0105352962bcc /client
parent1e58899b03319c56682dbc562cbf5828b97bddf3 (diff)
client/posts: improve file dropper appearance
Diffstat (limited to 'client')
-rw-r--r--client/css/core-forms.styl19
-rw-r--r--client/css/post-main-view.styl2
-rw-r--r--client/html/file_dropper.tpl14
3 files changed, 18 insertions, 17 deletions
diff --git a/client/css/core-forms.styl b/client/css/core-forms.styl
index 5800226..a163718 100644
--- a/client/css/core-forms.styl
+++ b/client/css/core-forms.styl
@@ -245,11 +245,8 @@ input::-moz-focus-inner
* File dropper
*/
.file-dropper-holder
- display: flex
- flex-wrap: wrap
.file-dropper
display: block
- width: 100%
background: $window-color
border: 3px dashed #eee
padding: 0.3em 0.5em
@@ -258,14 +255,16 @@ input::-moz-focus-inner
cursor: pointer
overflow: hidden
word-wrap: break-word
- input
+ .url-holder
+ display: flex
margin-top: 0.5em
- margin-right: 0.5em
- width: auto
- flex: 1
- button
- margin-top: 0.5em
- width: 8em
+ input, button
+ min-width: 0 /* firefox being sassy */
+ width: auto !important /* don't inherit anything weird */
+ input
+ flex: 1
+ button
+ margin-left: 0.5em
input[type=file]:disabled+.file-dropper
cursor: default
diff --git a/client/css/post-main-view.styl b/client/css/post-main-view.styl
index b4d9b8f..cfebf59 100644
--- a/client/css/post-main-view.styl
+++ b/client/css/post-main-view.styl
@@ -138,7 +138,7 @@
margin: 0
padding: 0
- label
+ label:not(.file-dropper)
margin-bottom: 0.3em
display: block
diff --git a/client/html/file_dropper.tpl b/client/html/file_dropper.tpl
index 2ce0ff5..3da2f4f 100644
--- a/client/html/file_dropper.tpl
+++ b/client/html/file_dropper.tpl
@@ -14,11 +14,13 @@
<% } %>
</label>
<% if (ctx.allowUrls) { %>
- <input type='text' name='url' placeholder='Alternatively, paste an URL here.'/>
- <% if (ctx.lock) { %>
- <button>Confirm</button>
- <% } else { %>
- <button>Add URL</button>
- <% } %>
+ <div class='url-holder'>
+ <input type='text' name='url' placeholder='Alternatively, paste an URL here.'/>
+ <% if (ctx.lock) { %>
+ <button>Confirm</button>
+ <% } else { %>
+ <button>Add URL</button>
+ <% } %>
+ </div>
<% } %>
</div>

© 2015 - 2026 Jakob L. Kreuze