aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/css/core-forms.styl6
-rw-r--r--client/css/post-list-view.styl2
-rw-r--r--client/css/post-upload.styl4
-rw-r--r--client/css/tag-input-control.styl3
-rw-r--r--client/css/tag-list-view.styl2
-rw-r--r--client/css/user-list-view.styl2
-rw-r--r--client/html/login.tpl52
-rw-r--r--client/html/password_reset.tpl22
-rw-r--r--client/html/post_merge.tpl2
-rw-r--r--client/html/tag_delete.tpl2
-rw-r--r--client/html/tag_edit.tpl2
-rw-r--r--client/html/tag_merge.tpl2
-rw-r--r--client/html/tags_header.tpl13
-rw-r--r--client/html/user_delete.tpl21
-rw-r--r--client/html/user_registration.tpl66
-rw-r--r--client/html/users_header.tpl13
16 files changed, 107 insertions, 107 deletions
diff --git a/client/css/core-forms.styl b/client/css/core-forms.styl
index 5fe44e4..8323d16 100644
--- a/client/css/core-forms.styl
+++ b/client/css/core-forms.styl
@@ -4,17 +4,15 @@ form
display: block
width: 20em
- ul
+ .input
list-style-type: none
- margin: 0 0 1em 0
+ margin: 0 0 2em 0
padding: 0
li
margin-top: 1.2em
label
display: block
padding: 0.3em 0
- .input
- margin-bottom: 2em
.input li:first-child label:not(.radio):not(.checkbox):not(.file-dropper),
.input li:first-child
padding-top: 0
diff --git a/client/css/post-list-view.styl b/client/css/post-list-view.styl
index b18fa64..4e797e0 100644
--- a/client/css/post-list-view.styl
+++ b/client/css/post-list-view.styl
@@ -106,7 +106,7 @@
text-align: left
label
- display: none
+ display: none !important
form
width: auto
margin-bottom: 0.75em
diff --git a/client/css/post-upload.styl b/client/css/post-upload.styl
index f315236..cd68431 100644
--- a/client/css/post-upload.styl
+++ b/client/css/post-upload.styl
@@ -39,6 +39,10 @@ $cancel-button-color = tomato
margin-top: 1em
.uploadables-container
+ list-style-type: none
+ margin: 0
+ padding: 0
+
li
margin: 0 0 1.2em 0
diff --git a/client/css/tag-input-control.styl b/client/css/tag-input-control.styl
index d4ee865..7e9d0fc 100644
--- a/client/css/tag-input-control.styl
+++ b/client/css/tag-input-control.styl
@@ -87,7 +87,8 @@ div.tag-input
ul.compact-tags
width: 100%
- margin-top: 0.5em
+ margin: 0.5em 0 0 0
+ padding: 0
li
margin: 0
width: 100%
diff --git a/client/css/tag-list-view.styl b/client/css/tag-list-view.styl
index 410eb3d..8ae7bcb 100644
--- a/client/css/tag-list-view.styl
+++ b/client/css/tag-list-view.styl
@@ -41,7 +41,7 @@
.tag-list-header
label
- display: none
+ display: none !important
text-align: left
form
width: auto
diff --git a/client/css/user-list-view.styl b/client/css/user-list-view.styl
index 1f3ada3..3d49d94 100644
--- a/client/css/user-list-view.styl
+++ b/client/css/user-list-view.styl
@@ -28,7 +28,7 @@
.user-list-header
label
- display: none
+ display: none !important
text-align: left
form
width: auto
diff --git a/client/html/login.tpl b/client/html/login.tpl
index ec63e6c..cc2a680 100644
--- a/client/html/login.tpl
+++ b/client/html/login.tpl
@@ -1,33 +1,33 @@
<div class='content-wrapper' id='login'>
<h1>Log in</h1>
<form>
- <div class='input'>
- <ul>
- <li>
- <%= ctx.makeTextInput({
- text: 'User name',
- name: 'name',
- required: true,
- pattern: ctx.userNamePattern,
- }) %>
- </li>
- <li>
- <%= ctx.makePasswordInput({
- text: 'Password',
- name: 'password',
- required: true,
- pattern: ctx.passwordPattern,
- }) %>
- </li>
- <li>
- <%= ctx.makeCheckbox({
- text: 'Remember me',
- name: 'remember-user',
- }) %>
- </li>
- </ul>
- </div>
+ <ul class='input'>
+ <li>
+ <%= ctx.makeTextInput({
+ text: 'User name',
+ name: 'name',
+ required: true,
+ pattern: ctx.userNamePattern,
+ }) %>
+ </li>
+ <li>
+ <%= ctx.makePasswordInput({
+ text: 'Password',
+ name: 'password',
+ required: true,
+ pattern: ctx.passwordPattern,
+ }) %>
+ </li>
+ <li>
+ <%= ctx.makeCheckbox({
+ text: 'Remember me',
+ name: 'remember-user',
+ }) %>
+ </li>
+ </ul>
+
<div class='messages'></div>
+
<div class='buttons'>
<input type='submit' value='Log in'/>
<% if (ctx.canSendMails) { %>
diff --git a/client/html/password_reset.tpl b/client/html/password_reset.tpl
index a4ccc7e..b50b48e 100644
--- a/client/html/password_reset.tpl
+++ b/client/html/password_reset.tpl
@@ -1,20 +1,20 @@
<div class='content-wrapper' id='password-reset'>
<h1>Password reset</h1>
<form autocomplete='off'>
- <div class='input'>
- <ul>
- <li>
- <%= ctx.makeTextInput({
- text: 'User name or e-mail address',
- name: 'user-name',
- required: true,
- }) %>
- </li>
- </ul>
- </div>
+ <ul class='input'>
+ <li>
+ <%= ctx.makeTextInput({
+ text: 'User name or e-mail address',
+ name: 'user-name',
+ required: true,
+ }) %>
+ </li>
+ </ul>
+
<p><small>Proceeding will send an e-mail that contains a password reset
link. Clicking it is going to generate a new password for your account.
It is recommended to change that password to something else.</small></p>
+
<div class='messages'></div>
<div class='buttons'>
<input type='submit' value='Proceed'/>
diff --git a/client/html/post_merge.tpl b/client/html/post_merge.tpl
index 59b3f49..9a59ba8 100644
--- a/client/html/post_merge.tpl
+++ b/client/html/post_merge.tpl
@@ -1,6 +1,6 @@
<div class='post-merge'>
<form>
- <ul>
+ <ul class='input'>
<li class='post-mirror'>
<div class='left-post-container'></div>
<div class='right-post-container'></div>
diff --git a/client/html/tag_delete.tpl b/client/html/tag_delete.tpl
index 82736fc..7dbfc1e 100644
--- a/client/html/tag_delete.tpl
+++ b/client/html/tag_delete.tpl
@@ -2,7 +2,7 @@
<form>
<p>This tag has <a href='/posts/query=<%- encodeURIComponent(ctx.tag.names[0]) %>'><%- ctx.tag.postCount %> usage(s)</a>.</p>
- <ul>
+ <ul class='input'>
<li>
<%= ctx.makeCheckbox({
name: 'confirm-deletion',
diff --git a/client/html/tag_edit.tpl b/client/html/tag_edit.tpl
index 0c89691..a58c529 100644
--- a/client/html/tag_edit.tpl
+++ b/client/html/tag_edit.tpl
@@ -1,6 +1,6 @@
<div class='content-wrapper tag-edit'>
<form>
- <ul>
+ <ul class='input'>
<li class='names'>
<% if (ctx.canEditNames) { %>
<%= ctx.makeTextInput({
diff --git a/client/html/tag_merge.tpl b/client/html/tag_merge.tpl
index ea1a7ec..90d8aa6 100644
--- a/client/html/tag_merge.tpl
+++ b/client/html/tag_merge.tpl
@@ -1,6 +1,6 @@
<div class='tag-merge'>
<form>
- <ul>
+ <ul class='input'>
<li class='target'>
<%= ctx.makeTextInput({required: true, text: 'Target tag', pattern: ctx.tagNamePattern}) %>
</li>
diff --git a/client/html/tags_header.tpl b/client/html/tags_header.tpl
index a3d4641..ed64127 100644
--- a/client/html/tags_header.tpl
+++ b/client/html/tags_header.tpl
@@ -1,12 +1,11 @@
<div class='tag-list-header'>
<form class='horizontal'>
- <div class='input'>
- <ul>
- <li>
- <%= ctx.makeTextInput({text: 'Search query', id: 'search-text', name: 'search-text', value: ctx.parameters.query}) %>
- </li>
- </ul>
- </div>
+ <ul class='input'>
+ <li>
+ <%= ctx.makeTextInput({text: 'Search query', id: 'search-text', name: 'search-text', value: ctx.parameters.query}) %>
+ </li>
+ </ul>
+
<div class='buttons'>
<input type='submit' value='Search'/>
<a class='button append' href='/help/search/tags'>Syntax help</a>
diff --git a/client/html/user_delete.tpl b/client/html/user_delete.tpl
index 9704492..6d57630 100644
--- a/client/html/user_delete.tpl
+++ b/client/html/user_delete.tpl
@@ -1,16 +1,15 @@
<div id='user-delete'>
<form>
- <div class='input'>
- <ul>
- <li>
- <%= ctx.makeCheckbox({
- name: 'confirm-deletion',
- text: 'I confirm that I want to delete this account.',
- required: true,
- }) %>
- </li>
- </ul>
- </div>
+ <ul class='input'>
+ <li>
+ <%= ctx.makeCheckbox({
+ name: 'confirm-deletion',
+ text: 'I confirm that I want to delete this account.',
+ required: true,
+ }) %>
+ </li>
+ </ul>
+
<div class='messages'></div>
<div class='buttons'>
<input type='submit' value='Delete account'/>
diff --git a/client/html/user_registration.tpl b/client/html/user_registration.tpl
index 5832118..e0e0f81 100644
--- a/client/html/user_registration.tpl
+++ b/client/html/user_registration.tpl
@@ -4,44 +4,44 @@
<input class='anticomplete' type='text' name='fakeuser'/>
<input class='anticomplete' type='password' name='fakepass'/>
- <div class='input'>
- <ul>
- <li>
- <%= ctx.makeTextInput({
- text: 'User name',
- name: 'name',
- placeholder: 'letters, digits, _, -',
- required: true,
- pattern: ctx.userNamePattern,
- }) %>
- </li>
- <li>
- <%= ctx.makePasswordInput({
- text: 'Password',
- name: 'password',
- placeholder: '5+ characters',
- required: true,
- pattern: ctx.passwordPattern,
- }) %>
- </li>
- <li>
- <%= ctx.makeEmailInput({
- text: 'Email',
- name: 'email',
- placeholder: 'optional',
- }) %>
- <p class='hint'>
- Used for password reminder and to show a <a href='http://gravatar.com/'>Gravatar</a>.
- Leave blank for random Gravatar.
- </p>
- </li>
- </ul>
- </div>
+ <ul class='input'>
+ <li>
+ <%= ctx.makeTextInput({
+ text: 'User name',
+ name: 'name',
+ placeholder: 'letters, digits, _, -',
+ required: true,
+ pattern: ctx.userNamePattern,
+ }) %>
+ </li>
+ <li>
+ <%= ctx.makePasswordInput({
+ text: 'Password',
+ name: 'password',
+ placeholder: '5+ characters',
+ required: true,
+ pattern: ctx.passwordPattern,
+ }) %>
+ </li>
+ <li>
+ <%= ctx.makeEmailInput({
+ text: 'Email',
+ name: 'email',
+ placeholder: 'optional',
+ }) %>
+ <p class='hint'>
+ Used for password reminder and to show a <a href='http://gravatar.com/'>Gravatar</a>.
+ Leave blank for random Gravatar.
+ </p>
+ </li>
+ </ul>
+
<div class='messages'></div>
<div class='buttons'>
<input type='submit' value='Create an account'/>
</div>
</form>
+
<div class='info'>
<p>Registered users can:</p>
<ul>
diff --git a/client/html/users_header.tpl b/client/html/users_header.tpl
index 5b7d38b..6cefe55 100644
--- a/client/html/users_header.tpl
+++ b/client/html/users_header.tpl
@@ -1,12 +1,11 @@
<div class='user-list-header'>
<form class='horizontal'>
- <div class='input'>
- <ul>
- <li>
- <%= ctx.makeTextInput({text: 'Search query', id: 'search-text', name: 'search-text', value: ctx.parameters.query}) %>
- </li>
- </ul>
- </div>
+ <ul class='input'>
+ <li>
+ <%= ctx.makeTextInput({text: 'Search query', id: 'search-text', name: 'search-text', value: ctx.parameters.query}) %>
+ </li>
+ </ul>
+
<div class='buttons'>
<input type='submit' value='Search'/>
<a class='append' href='/help/search/users'>Syntax help</a>

© 2015 - 2026 Jakob L. Kreuze