Commit 8708b685 authored by JC Brand's avatar JC Brand

Include CSS from pure.css and update styles and markup a bit.

parent 857a2e4c
This diff is collapsed.
...@@ -38,17 +38,18 @@ ...@@ -38,17 +38,18 @@
<a class="chatbox-btn close-chatbox-button icon-close"></a> <a class="chatbox-btn close-chatbox-button icon-close"></a>
</div> </div>
<div class="controlbox-panes"> <div class="controlbox-panes">
<div id="login-dialog" class="controlbox-pane"><form id="converse-login" method="post"> <div id="login-dialog" class="controlbox-pane">
<form class="pure-form pure-form-stacked" id="converse-login" method="post">
<label>XMPP Username:</label> <label>XMPP Username:</label>
<input type="username" name="jid" placeholder="user@server"> <input type="text" name="jid" placeholder="user@server">
<label>Password:</label> <label>Password:</label>
<input type="password" name="password" placeholder="password"> <input type="password" name="password" placeholder="password">
<input class="submit" type="submit" value="Log In"> <input class="pure-button submit" type="submit" value="Log In">
<span class="conn-feedback"></span> <span class="conn-feedback"></span>
</form> </form>
</div> </div>
<div id="register" class="controlbox-pane" style="display: none;"> <div id="register" class="controlbox-pane" style="display: none;">
<form id="converse-register"> <form id="converse-register" class="pure-form">
<span class="reg-feedback"></span> <span class="reg-feedback"></span>
<label>Your XMPP provider's domain name:</label> <label>Your XMPP provider's domain name:</label>
<input type="text" name="domain" placeholder=" e.g. conversejs.org"> <input type="text" name="domain" placeholder=" e.g. conversejs.org">
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
Tip: A list of public XMPP providers is available Tip: A list of public XMPP providers is available
<a href="https://xmpp.net/directory.php" class="url" target="_blank">here</a>. <a href="https://xmpp.net/directory.php" class="url" target="_blank">here</a>.
</p> </p>
<input class="submit" type="submit" value="Fetch registration form"> <input class="pure-button submit" type="submit" value="Fetch registration form">
</form> </form>
</div> </div>
</div> </div>
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
span { span {
display: inline-block; display: inline-block;
&.chat-msg-author { &.chat-msg-author {
max-width: 100px; max-width: 100%;
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
float: left; float: left;
......
...@@ -75,15 +75,6 @@ ...@@ -75,15 +75,6 @@
#converse-register, #converse-login { #converse-register, #converse-login {
margin: 2em 1em 1em 1em; margin: 2em 1em 1em 1em;
background: white; background: white;
.login-submit, .submit {
height: 30px;
padding: 0px;
font-size: $font-size;
}
.submit {
margin: 1em 0;
}
.login-anon { .login-anon {
height: auto; height: auto;
white-space: normal; white-space: normal;
...@@ -101,8 +92,7 @@ ...@@ -101,8 +92,7 @@
input { input {
width: 100%; width: 100%;
height: 30px; height: 30px;
margin: 5px 0 10px 0; margin: 1em 0;
padding-left: 0.5em;
} }
} }
#users { #users {
......
#conversejs { #conversejs {
@import "pure/base";
@import "pure/grids";
@import "pure/forms";
@import "pure/buttons";
@import "pure/menus";
@include box-sizing(border-box); @include box-sizing(border-box);
*, *:before, *:after { *, *:before, *:after {
@include box-sizing(border-box); @include box-sizing(border-box);
......
<form id="converse-login" method="post"> <form class="pure-form pure-form-stacked" id="converse-login" method="post">
{[ if (auto_login) { ]} {[ if (auto_login) { ]}
<span class="spinner login-submit"/> <span class="spinner login-submit"/>
{[ } ]} {[ } ]}
{[ if (!auto_login) { ]} {[ if (!auto_login) { ]}
{[ if (authentication == LOGIN) { ]} {[ if (authentication == LOGIN) { ]}
<label>{{label_username}}</label> <label>{{label_username}}</label>
<input name="jid" placeholder="{{placeholder_username}}"> <input type="text" name="jid" placeholder="{{placeholder_username}}">
<label>{{label_password}}</label> <label>{{label_password}}</label>
<input type="password" name="password" placeholder="{{placeholder_password}}"> <input type="password" name="password" placeholder="{{placeholder_password}}">
<input class="submit" type="submit" value="{{label_login}}"> <input class="submit" type="submit" value="{{label_login}}">
<span class="conn-feedback"></span> <span class="conn-feedback"></span>
{[ } ]} {[ } ]}
{[ if (authentication == ANONYMOUS) { ]} {[ if (authentication == ANONYMOUS) { ]}
<input type="submit" class="submit login-anon" value="{{label_anon_login}}"/> <input type="pure-button submit" class="submit login-anon" value="{{label_anon_login}}"/>
{[ } ]} {[ } ]}
{[ if (authentication == PREBIND) { ]} {[ if (authentication == PREBIND) { ]}
<p>Disconnected.</p> <p>Disconnected.</p>
......
<form id="converse-register"> <form id="converse-register" class="pure-form">
<span class="reg-feedback"></span> <span class="reg-feedback"></span>
<label>{{label_domain}}</label> <label>{{label_domain}}</label>
<input type="text" name="domain" placeholder="{{domain_placeholder}}"> <input type="text" name="domain" placeholder="{{domain_placeholder}}">
<p class="form-help">{{help_providers}} <a href="{{href_providers}}" class="url" target="_blank">{{help_providers_link}}</a>.</p> <p class="form-help">{{help_providers}} <a href="{{href_providers}}" class="url" target="_blank">{{help_providers_link}}</a>.</p>
<input class="submit" type="submit" value="{{label_register}}"> <input class="pure-button submit" type="submit" value="{{label_register}}">
</form> </form>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment