cadey
/
Shuo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added server password to 'Connect' window

This commit is contained in:
Mattias Erming 2014-09-12 18:03:16 -07:00
parent cabf766fba
commit d01f4b37a1
4 changed files with 103 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
client/css/bootstrap.css vendored
View File

@ -835,7 +835,7 @@ address {
.col-xs-offset-0 { .col-xs-offset-0 {
margin-left: 0%; margin-left: 0%;
} }
@media (min-width: 768px) { @media (min-width: 480px) {
.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
float: left; float: left;
} }
@ -1199,7 +1199,7 @@ tbody.collapse.in {
.visible-lg-inline-block { .visible-lg-inline-block {
display: none !important; display: none !important;
} }
@media (max-width: 767px) { @media (max-width: 479px) {
.visible-xs { .visible-xs {
display: block !important; display: block !important;
} }
@ -1214,131 +1214,26 @@ tbody.collapse.in {
display: table-cell !important; display: table-cell !important;
} }
} }
@media (max-width: 767px) { @media (max-width: 479px) {
.visible-xs-block { .visible-xs-block {
display: block !important; display: block !important;
} }
} }
@media (max-width: 767px) { @media (max-width: 479px) {
.visible-xs-inline { .visible-xs-inline {
display: inline !important; display: inline !important;
} }
} }
@media (max-width: 767px) { @media (max-width: 479px) {
.visible-xs-inline-block { .visible-xs-inline-block {
display: inline-block !important; display: inline-block !important;
} }
} }
@media (min-width: 768px) and (max-width: 991px) { @media (max-width: 479px) {
.visible-sm {
display: block !important;
}
table.visible-sm {
display: table;
}
tr.visible-sm {
display: table-row !important;
}
th.visible-sm,
td.visible-sm {
display: table-cell !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
.visible-sm-block {
display: block !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
.visible-sm-inline {
display: inline !important;
}
}
@media (min-width: 768px) and (max-width: 991px) {
.visible-sm-inline-block {
display: inline-block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
.visible-md {
display: block !important;
}
table.visible-md {
display: table;
}
tr.visible-md {
display: table-row !important;
}
th.visible-md,
td.visible-md {
display: table-cell !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
.visible-md-block {
display: block !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
.visible-md-inline {
display: inline !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
.visible-md-inline-block {
display: inline-block !important;
}
}
@media (min-width: 1200px) {
.visible-lg {
display: block !important;
}
table.visible-lg {
display: table;
}
tr.visible-lg {
display: table-row !important;
}
th.visible-lg,
td.visible-lg {
display: table-cell !important;
}
}
@media (min-width: 1200px) {
.visible-lg-block {
display: block !important;
}
}
@media (min-width: 1200px) {
.visible-lg-inline {
display: inline !important;
}
}
@media (min-width: 1200px) {
.visible-lg-inline-block {
display: inline-block !important;
}
}
@media (max-width: 767px) {
.hidden-xs { .hidden-xs {
display: none !important; display: none !important;
} }
} }
@media (min-width: 768px) and (max-width: 991px) {
.hidden-sm {
display: none !important;
}
}
@media (min-width: 992px) and (max-width: 1199px) {
.hidden-md {
display: none !important;
}
}
@media (min-width: 1200px) {
.hidden-lg {
display: none !important;
}
}
.visible-print { .visible-print {
display: none !important; display: none !important;
} }

75
client/css/style.css
View File

@ -1,4 +1,5 @@
@import url('//fonts.googleapis.com/css?family=Lato:400,700'); @import url('//fonts.googleapis.com/css?family=Lato:400,700');
@import url('//fonts.googleapis.com/css?family=Open+Sans:300,400,700');
@font-face { @font-face {
font-family: "FontAwesome"; font-family: "FontAwesome";
src: url("fonts/fontawesome.svg") format("svg"), url("fonts/fontawesome.woff") format("woff"); src: url("fonts/fontawesome.svg") format("svg"), url("fonts/fontawesome.woff") format("woff");
@ -75,7 +76,7 @@ button {
} }
.container { .container {
margin: 80px auto; margin: 80px auto;
max-width: 420px; max-width: 480px;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@ -316,12 +317,16 @@ button {
top: 0px; top: 0px;
width: 100%; width: 100%;
} }
#windows label {
font-size: 14px;
}
#windows .input { #windows .input {
border: 1px solid #cdd3da; border: 1px solid #cdd3da;
border-radius: 2px; border-radius: 2px;
color: #222; color: #222;
font-size: 14px; font-size: 14px;
margin: 2px 0; margin: 2px 0;
margin-bottom: 10px;
outline: 0; outline: 0;
padding: 8px 10px; padding: 8px 10px;
transition: border-color .2s; transition: border-color .2s;
@ -354,6 +359,7 @@ button {
top: 0; top: 0;
} }
#windows .window { #windows .window {
bottom: -44px !important;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
@ -370,37 +376,39 @@ button {
#windows .active { #windows .active {
display: block; display: block;
} }
#windows .window .lt { #windows .header {
margin-top: 4px;
margin-left: 8px;
}
#chat {
bottom: 0;
font: 13px Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
left: 0;
position: absolute;
right: 0;
top: 0;
}
#chat button:hover {
opacity: .6;
}
#chat .header {
border-bottom: 1px solid #e7e7e7; border-bottom: 1px solid #e7e7e7;
line-height: 50px; line-height: 50px;
height: 48px; height: 48px;
padding: 0 20px; padding: 0 20px;
} }
#chat .header .title { #windows .header .title {
font: 16px Lato; font: 16px Lato;
} }
#chat .header .topic { #windows .header .topic {
/* Hidden for now */ /* Hidden for now */
display: none; display: none;
color: #777; color: #777;
margin-left: 8px; margin-left: 8px;
text-transform: capitalize; text-transform: capitalize;
} }
#windows .window .header {
display: none;
}
#chat {
bottom: 0;
left: 0;
position: absolute;
right: 0;
top: 0;
}
#chat,
#windows .header {
font: 13px Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
}
#chat button:hover {
opacity: .6;
}
#chat .chat, #chat .chat,
#chat .sidebar { #chat .sidebar {
top: 58px; top: 58px;
@ -591,22 +599,25 @@ button {
color: #e74c3c; color: #e74c3c;
margin-top: 1em; margin-top: 1em;
} }
#sign-in .container {
margin-top: 120px;
}
#connect label { #connect label {
display: block; display: block;
margin-top: 10px; margin-top: 11px;
} }
#connect .title { #connect .title {
margin-bottom: 10px; margin-bottom: 10px;
} }
#connect .port:before { #connect .port:before {
content: ":"; content: ":";
margin: 28px 0 0 -17px; margin: 9px 0 0 -17px;
position: absolute; position: absolute;
} }
#connect .tls { #connect .tls {
float: left; float: left;
font-size: 14px; font-size: 14px;
padding: 10px 2px; margin-top: 6px;
} }
#connect .tls input { #connect .tls input {
float: left; float: left;
@ -614,7 +625,7 @@ button {
} }
#connect .btn { #connect .btn {
float: left; float: left;
margin-top: 25px; margin-top: 30px;
} }
#settings .title { #settings .title {
margin-bottom: -10px; margin-bottom: -10px;
@ -655,7 +666,7 @@ button {
left: 0; left: 0;
position: absolute; position: absolute;
right: 0px; right: 0px;
z-index: 1; /*z-index: 1;*/
} }
#form input { #form input {
border: 1px solid #cfdae1; border: 1px solid #cfdae1;
@ -682,6 +693,9 @@ button {
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.container {
margin-top: 60px !important;
}
#viewport.lt { #viewport.lt {
-webkit-transform: translate3d(220px, 0, 0); -webkit-transform: translate3d(220px, 0, 0);
transform: translate3d(220px, 0, 0); transform: translate3d(220px, 0, 0);
@ -707,6 +721,9 @@ button {
#viewport .channel .rt { #viewport .channel .rt {
display: block; display: block;
} }
#windows .window .header {
display: block;
}
#chat .sidebar { #chat .sidebar {
right: -180px; right: -180px;
transition: all .4s; transition: all .4s;
@ -720,9 +737,15 @@ button {
} }
} }
@media (max-width: 480px) { @media (max-width: 479px) {
.container { .container {
margin: 40px 0; margin: 40px 0 !important;
}
#connect .tls {
margin: 20px 0;
}
#windows .input {
margin-bottom: 2px;
} }
#chat .messages { #chat .messages {
display: block; display: block;

69
client/index.html
View File

@ -35,7 +35,9 @@
<div id="windows"> <div id="windows">
<div id="chat"></div> <div id="chat"></div>
<div id="sign-in" class="window"> <div id="sign-in" class="window">
<div class="header">
<button class="lt"></button> <button class="lt"></button>
</div>
<form class="container" action=""> <form class="container" action="">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
@ -65,53 +67,66 @@
</form> </form>
</div> </div>
<div id="connect" class="window"> <div id="connect" class="window">
<div class="header">
<button class="lt"></button> <button class="lt"></button>
</div>
<form class="container" action=""> <form class="container" action="">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-sm-12">
<h1 class="title">Connect</h1> <h1 class="title">Connect</h1>
</div> </div>
<div class="col-xs-8"> <div class="col-sm-12">
<label> <h2>Network settings</h2>
Server </div>
<div class="col-sm-3">
<label>Server</label>
</div>
<div class="col-sm-6 col-xs-8">
<input class="input" name="host" value="irc.freenode.org"> <input class="input" name="host" value="irc.freenode.org">
</label>
</div> </div>
<div class="col-xs-4"> <div class="col-sm-3 col-xs-4">
<label class="port"> <div class="port">
Port
<input class="input" name="port" value="6697"> <input class="input" name="port" value="6697">
</label>
</div> </div>
<div class="col-xs-12"> </div>
<div class="clearfix"></div>
<div class="col-sm-3">
<label>Password</label>
</div>
<div class="col-sm-9">
<input class="input" type="password" name="password">
</div>
<div class="col-sm-3"></div>
<div class="col-sm-9">
<label class="tls"> <label class="tls">
<input type="checkbox" name="tls" checked="checked"> <input type="checkbox" name="tls" checked="checked">
Enable TLS/SSL Enable TLS/SSL
</label> </label>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="col-xs-12"> <div class="col-sm-12">
<h2>User Preferences</h2> <h2>User preferences</h2>
</div> </div>
<div class="col-xs-5"> <div class="col-sm-3">
<label> <label>Nick</label>
Nick </div>
<div class="col-sm-9">
<input class="input" name="nick" value="shout-user"> <input class="input" name="nick" value="shout-user">
</label>
</div> </div>
<div class="col-xs-7"> <div class="col-sm-3">
<label> <label>Real Name</label>
Real Name </div>
<div class="col-sm-9">
<input class="input" name="realname" class="input" value="Shout User"> <input class="input" name="realname" class="input" value="Shout User">
</label>
</div> </div>
<div class="col-xs-12"> <div class="col-sm-3">
<label> <label>Channels</label>
Channels
<input class="input" name="join" class="input" value="#shout-irc">
</label>
</div> </div>
<div class="col-xs-12"> <div class="col-sm-9">
<input class="input" name="join" class="input" value="#foo, #shout-irc">
</div>
<div class="col-sm-3 clearfix"></div>
<div class="col-sm-9">
<button type="submit" class="btn"> <button type="submit" class="btn">
Connect Connect
</button> </button>
@ -120,7 +135,9 @@
</form> </form>
</div> </div>
<div id="settings" class="window"> <div id="settings" class="window">
<div class="header">
<button class="lt"></button> <button class="lt"></button>
</div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "shout", "name": "shout",
"description": "A web IRC client", "description": "A web IRC client",
"version": "0.25.3", "version": "0.26.0",
"author": "Mattias Erming", "author": "Mattias Erming",
"preferGlobal": true, "preferGlobal": true,
"bin": { "bin": {