mirror of
https://github.com/thelounge/thelounge.git
synced 2024-05-28 11:22:34 +02:00
Minor changes
This commit is contained in:
Mattias Erming
parent
03a79a1312
commit
cb1effa375
|
|
@ -277,7 +277,7 @@ button {
|
||||||
}
|
}
|
||||||
#windows .input {
|
#windows .input {
|
||||||
border: 1px solid #cdd3da;
|
border: 1px solid #cdd3da;
|
||||||
border-radius: 3px;
|
border-radius: 2px;
|
||||||
color: #222;
|
color: #222;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
margin: 2px 0;
|
margin: 2px 0;
|
||||||
|
|
@ -481,13 +481,6 @@ button {
|
||||||
#chat .highlight .from {
|
#chat .highlight .from {
|
||||||
color: #f00;
|
color: #f00;
|
||||||
}
|
}
|
||||||
#chat.hide-join .join,
|
|
||||||
#chat.hide-nick .nick,
|
|
||||||
#chat.hide-part .nick,
|
|
||||||
#chat.hide-mode .mode,
|
|
||||||
#chat.hide-quit .quit {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
#chat .notice .type {
|
#chat .notice .type {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
@ -593,6 +586,9 @@ button {
|
||||||
#settings #play {
|
#settings #play {
|
||||||
color: #7f8c8d;
|
color: #7f8c8d;
|
||||||
}
|
}
|
||||||
|
#settings .about small {
|
||||||
|
margin-left: 2px;
|
||||||
|
}
|
||||||
#settings #play:hover {
|
#settings #play:hover {
|
||||||
opacity: .8;
|
opacity: .8;
|
||||||
}
|
}
|
||||||
|
|
@ -646,7 +642,8 @@ button {
|
||||||
transform: translate3d(220px, 0, 0);
|
transform: translate3d(220px, 0, 0);
|
||||||
}
|
}
|
||||||
#viewport.rt #chat .sidebar {
|
#viewport.rt #chat .sidebar {
|
||||||
right: 0px;
|
-webkit-transform: translate3d(-180px, 0, 0);
|
||||||
|
transform: translate3d(-180px, 0, 0);
|
||||||
}
|
}
|
||||||
#sidebar {
|
#sidebar {
|
||||||
left: -220px;
|
left: -220px;
|
||||||
|
|
@ -667,7 +664,11 @@ button {
|
||||||
}
|
}
|
||||||
#chat .sidebar {
|
#chat .sidebar {
|
||||||
right: -180px;
|
right: -180px;
|
||||||
transition: .2s right;
|
transition: all .4s;
|
||||||
|
-webkit-transform: translateZ(0);
|
||||||
|
transform: translateZ(0);
|
||||||
|
-webkit-perspective: 1000;
|
||||||
|
perspective: 1000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,272 +1,237 @@
|
||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, user-scalable=no, minimal-ui">
|
<meta name="viewport" content="width=device-width, user-scalable=no, minimal-ui">
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
|
|
||||||
<title>Shout</title>
|
<title>Shout</title>
|
||||||
|
|
||||||
<link rel="stylesheet" href="css/bootstrap.css">
|
<link rel="stylesheet" href="css/bootstrap.css">
|
||||||
<link rel="stylesheet" href="css/style.css">
|
<link rel="stylesheet" href="css/style.css">
|
||||||
<link id="theme" rel="stylesheet" href="<%=theme%>">
|
<link id="theme" rel="stylesheet" href="<%=theme%>">
|
||||||
|
|
||||||
<link rel="shortcut icon" href="/img/favicon.png">
|
<link rel="shortcut icon" href="/img/favicon.png">
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body class="<%= public ? "public" : "" %>">
|
<body class="<%= public ? "public" : "" %>">
|
||||||
|
|
||||||
<div id="wrap">
|
<div id="wrap">
|
||||||
<div id="viewport">
|
<div id="viewport">
|
||||||
<aside id="sidebar">
|
<aside id="sidebar">
|
||||||
<div class="networks"></div>
|
<div class="networks"></div>
|
||||||
<div class="empty">
|
<div class="empty">
|
||||||
You're not connected to any networks yet.
|
You're not connected to any networks yet.
|
||||||
</div>
|
</div>
|
||||||
<footer id="footer">
|
<footer id="footer">
|
||||||
<button class="icon sign-in" data-target="#sign-in" data-title="Sign in" data-placement="top" title="Sign in to Shout"></button>
|
<button class="icon sign-in" data-target="#sign-in" data-title="Sign in" data-placement="top" title="Sign in to Shout"></button>
|
||||||
<button class="icon connect" data-target="#connect" data-title="Connect" data-placement="top" title="Connect to network"></button>
|
<button class="icon connect" data-target="#connect" data-title="Connect" data-placement="top" title="Connect to network"></button>
|
||||||
<button class="icon settings" data-target="#settings" data-title="Settings" data-placement="top" title="Client settings"></button>
|
<button class="icon settings" data-target="#settings" data-title="Settings" data-placement="top" title="Client settings"></button>
|
||||||
<button id="sign-out" class="icon sign-out" data-placement="top" title="Sign out"></button>
|
<button id="sign-out" class="icon sign-out" data-placement="top" title="Sign out"></button>
|
||||||
</footer>
|
</footer>
|
||||||
</aside>
|
</aside>
|
||||||
<div id="main">
|
<div id="main">
|
||||||
<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">
|
||||||
<form class="container" action="">
|
<form class="container" action="">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<h1 class="title">Sign in</h1>
|
<h1 class="title">Sign in</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<label>
|
<label>
|
||||||
Username
|
Username
|
||||||
<input class="input" name="user">
|
<input class="input" name="user">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<label class="port">
|
<label class="port">
|
||||||
Password
|
Password
|
||||||
<input class="input" type="password" name="password">
|
<input class="input" type="password" name="password">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12 error" style="display: none;">
|
<div class="col-xs-12 error" style="display: none;">
|
||||||
Authentication failed.
|
Authentication failed.
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<button type="submit" class="btn">
|
<button type="submit" class="btn">
|
||||||
Sign in
|
Sign in
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div id="connect" class="window">
|
<div id="connect" class="window">
|
||||||
<form class="container" action="">
|
<form class="container" action="">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<h1 class="title">Connect</h1>
|
<h1 class="title">Connect</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-8">
|
<div class="col-xs-8">
|
||||||
<label>
|
<label>
|
||||||
Server
|
Server
|
||||||
<input class="input" name="host" value="irc.freenode.org">
|
<input class="input" name="host" value="irc.freenode.org">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-4">
|
<div class="col-xs-4">
|
||||||
<label class="port">
|
<label class="port">
|
||||||
Port
|
Port
|
||||||
<input class="input" name="port" value="6667">
|
<input class="input" name="port" value="6667">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-5">
|
<div class="col-xs-5">
|
||||||
<label>
|
<label>
|
||||||
Nick
|
Nick
|
||||||
<input class="input" name="nick" value="shout-user">
|
<input class="input" name="nick" value="shout-user">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-7">
|
<div class="col-xs-7">
|
||||||
<label>
|
<label>
|
||||||
Real Name
|
Real Name
|
||||||
<input class="input" name="realname" class="input" value="Shout User">
|
<input class="input" name="realname" class="input" value="Shout User">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<label>
|
<label>
|
||||||
Channels
|
Channels
|
||||||
<input class="input" name="join" class="input" value="#shout-irc">
|
<input class="input" name="join" class="input" value="#shout-irc">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
<button type="submit" class="btn">
|
<button type="submit" class="btn">
|
||||||
Connect
|
Connect
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div id="settings" class="window">
|
<div id="settings" class="window">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<h1 class="title">Settings</h1>
|
<h1 class="title">Settings</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<h2>Messages</h2>
|
<h2>Sound</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-12">
|
||||||
<label class="opt">
|
<label class="opt">
|
||||||
<input type="checkbox" name="join">
|
<input type="checkbox" name="notification">
|
||||||
Show joins
|
Enable notification sound
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-12">
|
||||||
<label class="opt">
|
<div class="opt">
|
||||||
<input type="checkbox" name="nick">
|
<button id="play">Play sound</button>
|
||||||
Show nick changes
|
</div>
|
||||||
</label>
|
</div>
|
||||||
</div>
|
<div class="col-sm-12">
|
||||||
<div class="col-sm-6">
|
<h2>About Shout</h2>
|
||||||
<label class="opt">
|
</div>
|
||||||
<input type="checkbox" name="part">
|
<div class="col-sm-12">
|
||||||
Show parts
|
<p class="about">
|
||||||
</label>
|
You're currently running version <small><%=version%></small><br>
|
||||||
</div>
|
<a href="http://github.com/erming/shout" target="_blank">Check for updates</a>
|
||||||
<div class="col-sm-6">
|
</p>
|
||||||
<label class="opt">
|
</div>
|
||||||
<input type="checkbox" name="mode">
|
</div>
|
||||||
Show mode
|
</div>
|
||||||
</label>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<form id="form" action="">
|
||||||
<label class="opt">
|
<div class="inner">
|
||||||
<input type="checkbox" name="quit">
|
<input id="submit" tabindex="-1" type="submit">
|
||||||
Show quits
|
<input id="input" class="mousetrap">
|
||||||
</label>
|
</div>
|
||||||
</div>
|
</form>
|
||||||
<div class="col-sm-12">
|
</div>
|
||||||
<h2>Sound</h2>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12">
|
|
||||||
<label class="opt">
|
<div id="templates">
|
||||||
<input type="checkbox" name="notification">
|
<script type="text/html" class="networks">
|
||||||
Enable notification sound
|
{{#each networks}}
|
||||||
</label>
|
<section id="network-{{id}}" class="network">
|
||||||
</div>
|
{{partial "channels"}}
|
||||||
<div class="col-sm-12">
|
</section>
|
||||||
<div class="opt">
|
{{/each}}
|
||||||
<button id="play">Play sound</button>
|
</script>
|
||||||
</div>
|
|
||||||
</div>
|
<script type="text/html" class="channels">
|
||||||
<div class="col-sm-12">
|
{{#each channels}}
|
||||||
<h2>About Shout</h2>
|
<button data-id="{{id}}" data-target="#chan-{{id}}" data-title="{{name}}" class="chan {{type}}">
|
||||||
</div>
|
<span class="badge"></span>
|
||||||
<div class="col-sm-12">
|
<span class="close"></span>
|
||||||
<p class="about">
|
{{name}}
|
||||||
You're currently running
|
</button>
|
||||||
<strong class="version">Shout <%=version%></strong>
|
{{/each}}
|
||||||
<br>
|
</script>
|
||||||
Click <a href="http://github.com/erming/shout" target="_blank">here</a> for updates.
|
|
||||||
</p>
|
<script type="text/html" class="chat">
|
||||||
</div>
|
{{#each channels}}
|
||||||
</div>
|
<div id="chan-{{id}}" data-id="{{id}}" data-type="{{type}}" class="chan {{type}}">
|
||||||
</div>
|
<div class="header">
|
||||||
</div>
|
<button class="lt"></button>
|
||||||
</div>
|
<button class="rt"></button>
|
||||||
<form id="form" action="">
|
<span class="title">{{name}}</span>
|
||||||
<div class="inner">
|
<span class="topic">{{type}} </span>
|
||||||
<input id="submit" tabindex="-1" type="submit">
|
</div>
|
||||||
<input id="input" class="mousetrap">
|
<div class="chat">
|
||||||
</div>
|
{{#equal 100 messages.length}}
|
||||||
</form>
|
<button class="show-more" data-id="{{id}}">
|
||||||
</div>
|
Show more
|
||||||
</div>
|
</button>
|
||||||
</div>
|
{{/equal}}
|
||||||
|
<div class="messages">
|
||||||
<div id="templates">
|
{{partial "messages"}}
|
||||||
<script type="text/html" class="networks">
|
</div>
|
||||||
{{#each networks}}
|
</div>
|
||||||
<section id="network-{{id}}" class="network">
|
<aside class="sidebar">
|
||||||
{{partial "channels"}}
|
<div class="users">
|
||||||
</section>
|
{{partial "users"}}
|
||||||
{{/each}}
|
</div>
|
||||||
</script>
|
</aside>
|
||||||
|
</div>
|
||||||
<script type="text/html" class="channels">
|
{{/each}}
|
||||||
{{#each channels}}
|
</script>
|
||||||
<button data-id="{{id}}" data-target="#chan-{{id}}" data-title="{{name}}" class="chan {{type}}">
|
|
||||||
<span class="badge"></span>
|
<script type="text/html" class="users">
|
||||||
<span class="close"></span>
|
{{#if users.length}}
|
||||||
{{name}}
|
<div class="count">
|
||||||
</button>
|
<input class="search" placeholder="{{users.length}} users">
|
||||||
{{/each}}
|
</div>
|
||||||
</script>
|
{{/if}}
|
||||||
|
<div class="names">
|
||||||
<script type="text/html" class="chat">
|
{{#each users}}
|
||||||
{{#each channels}}
|
<button class="user">{{mode}}{{name}}</button>
|
||||||
<div id="chan-{{id}}" data-id="{{id}}" data-type="{{type}}" class="chan {{type}}">
|
{{/each}}
|
||||||
<div class="header">
|
</div>
|
||||||
<button class="lt"></button>
|
</script>
|
||||||
<button class="rt"></button>
|
|
||||||
<span class="title">{{name}}</span>
|
<script type="text/html" class="messages">
|
||||||
<span class="topic">{{type}} </span>
|
{{#each messages}}
|
||||||
</div>
|
<div class="msg {{type}}">
|
||||||
<div class="chat">
|
<span class="time">
|
||||||
{{#equal 100 messages.length}}
|
{{tz time}}
|
||||||
<button class="show-more" data-id="{{id}}">
|
</span>
|
||||||
Show more
|
<span class="from">
|
||||||
</button>
|
{{#if from}}
|
||||||
{{/equal}}
|
<button class="user">{{from}}</button>
|
||||||
<div class="messages">
|
{{/if}}
|
||||||
{{partial "messages"}}
|
</span>
|
||||||
</div>
|
<span class="text">
|
||||||
</div>
|
<em class="type">{{type}}</em>
|
||||||
<aside class="sidebar">
|
{{{uri text}}}
|
||||||
<div class="users">
|
</span>
|
||||||
{{partial "users"}}
|
</div>
|
||||||
</div>
|
{{/each}}
|
||||||
</aside>
|
</script>
|
||||||
</div>
|
</div>
|
||||||
{{/each}}
|
|
||||||
</script>
|
<script src="js/libs.min.js"></script>
|
||||||
|
<script src="js/chat.js"></script>
|
||||||
<script type="text/html" class="users">
|
|
||||||
{{#if users.length}}
|
</body>
|
||||||
<div class="count">
|
</html>
|
||||||
<input class="search" placeholder="{{users.length}} users">
|
|
||||||
</div>
|
|
||||||
{{/if}}
|
|
||||||
<div class="names">
|
|
||||||
{{#each users}}
|
|
||||||
<button class="user">{{mode}}{{name}}</button>
|
|
||||||
{{/each}}
|
|
||||||
</div>
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script type="text/html" class="messages">
|
|
||||||
{{#each messages}}
|
|
||||||
<div class="msg {{type}}">
|
|
||||||
<span class="time">
|
|
||||||
{{tz time}}
|
|
||||||
</span>
|
|
||||||
<span class="from">
|
|
||||||
{{#if from}}
|
|
||||||
<button class="user">{{from}}</button>
|
|
||||||
{{/if}}
|
|
||||||
</span>
|
|
||||||
<span class="text">
|
|
||||||
<em class="type">{{type}}</em>
|
|
||||||
{{{uri text}}}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
{{/each}}
|
|
||||||
</script>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script src="js/libs.min.js"></script>
|
|
||||||
<script src="js/chat.js"></script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
|
||||||
|
|
@ -177,7 +177,10 @@ $(function() {
|
||||||
.prop("disabled", false)
|
.prop("disabled", false)
|
||||||
.end()
|
.end()
|
||||||
.find("input")
|
.find("input")
|
||||||
.val("");
|
.each(function() {
|
||||||
|
var self = $(this);
|
||||||
|
self.val(self.data("default"));
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.on("nick", function(data) {
|
socket.on("nick", function(data) {
|
||||||
|
|
@ -213,6 +216,13 @@ $(function() {
|
||||||
.html(render("users", data));
|
.html(render("users", data));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#connect")
|
||||||
|
.find("input")
|
||||||
|
.each(function() {
|
||||||
|
var self = $(this);
|
||||||
|
self.data("default", self.val());
|
||||||
|
});
|
||||||
|
|
||||||
$.cookie.json = true;
|
$.cookie.json = true;
|
||||||
var settings = $("#settings");
|
var settings = $("#settings");
|
||||||
var options = $.extend({
|
var options = $.extend({
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "shout",
|
"name": "shout",
|
||||||
"description": "A web IRC client",
|
"description": "A web IRC client",
|
||||||
"version": "0.9.8",
|
"version": "0.9.9",
|
||||||
"author": "Mattias Erming",
|
"author": "Mattias Erming",
|
||||||
"preferGlobal": true,
|
"preferGlobal": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue