Move "About The Lounge" section from Settings to Help window

This commit is contained in:
Jérémie Astori 2017-02-28 02:21:26 -05:00
parent 0f9b12f2b8
commit c1fc185643
2 changed files with 21 additions and 29 deletions

View File

@ -1289,15 +1289,10 @@ kbd {
margin: 4px 10px 0 0; margin: 4px 10px 0 0;
} }
#settings .about,
#settings #play { #settings #play {
color: #7f8c8d; color: #7f8c8d;
} }
#settings .about small {
margin-left: 2px;
}
#settings #play { #settings #play {
font-size: 14px; font-size: 14px;
transition: opacity .2s; transition: opacity .2s;
@ -1307,12 +1302,6 @@ kbd {
opacity: .8; opacity: .8;
} }
#settings .about {
font-size: 14px;
padding-top: 2px;
line-height: 1.8;
}
#settings #change-password .error, #settings #change-password .error,
#settings #change-password .success { #settings #change-password .success {
margin-bottom: 1em; margin-bottom: 1em;
@ -1352,6 +1341,11 @@ kbd {
margin-bottom: 0; margin-bottom: 0;
} }
#help .about {
font-size: 14px;
line-height: 1.8;
}
#form { #form {
background: #eee; background: #eee;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;

View File

@ -357,24 +357,6 @@
<div class="col-sm-12"> <div class="col-sm-12">
<textarea class="input" name="userStyles" id="user-specified-css-input" placeholder="You can override any style with CSS here"></textarea> <textarea class="input" name="userStyles" id="user-specified-css-input" placeholder="You can override any style with CSS here"></textarea>
</div> </div>
<div class="col-sm-12">
<h2>About The Lounge</h2>
</div>
<div class="col-sm-12">
<p class="about">
<% if (gitCommit) { %>
The Lounge is running from source
(<a href="https://github.com/thelounge/lounge/tree/<%= gitCommit %>" target="_blank"><code><%= gitCommit %></code></a>).<br>
<% } else { %>
The Lounge is in version <strong><%= version %></strong>
(<a href="https://github.com/thelounge/lounge/releases/tag/v<%= version %>" target="_blank">See release notes</a>).<br>
<% } %>
<a href="https://thelounge.github.io/" target="_blank">Website</a><br>
<a href="https://thelounge.github.io/docs/" target="_blank">Documentation</a><br>
<a href="https://github.com/thelounge/lounge/issues/new" target="_blank">Report a bug</a>
</p>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -707,6 +689,22 @@
</p> </p>
</div> </div>
</div> </div>
<h2>About The Lounge</h2>
<p class="about">
<% if (gitCommit) { %>
The Lounge is running from source
(<a href="https://github.com/thelounge/lounge/tree/<%= gitCommit %>" target="_blank"><code><%= gitCommit %></code></a>).<br>
<% } else { %>
The Lounge is in version <strong><%= version %></strong>
(<a href="https://github.com/thelounge/lounge/releases/tag/v<%= version %>" target="_blank">See release notes</a>).<br>
<% } %>
<a href="https://thelounge.github.io/" target="_blank">Website</a><br>
<a href="https://thelounge.github.io/docs/" target="_blank">Documentation</a><br>
<a href="https://github.com/thelounge/lounge/issues/new" target="_blank">Report a bug</a>
</p>
</div> </div>
</div> </div>
</div> </div>