moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2024-11-22 09:12:19 -05:00
Code Issues Releases Wiki Activity

Fix: Sound notifications button

Browse Source
This commit is contained in:
Sébastien Hut 2015-02-23 17:10:52 +01:00 committed by Sébastien Hut
parent 5745de5e15
commit c0f7e12ba8
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientapp/templates.js
View File

@ -512,7 +512,7 @@ exports.pages.groupchat = function anonymous(locals) {
exports.pages.main = function anonymous(locals) { exports.pages.main = function anonymous(locals) {
var buf = []; var buf = [];
with (locals || {}) { with (locals || {}) {
buf.push('<section class="page main"><h1 id="title">Settings</h1><div id="avatarChanger"><h4>Change Avatar</h4><div class="uploadRegion"><p>Drag and drop a new avatar here</p><img/><form><input id="uploader" type="file"/></form></div></div><div><h4>Desktop Integration</h4><button class="enableAlerts">Enable alerts</button><button class="primary installFirefox">Install app</button><button class="soundNotifs">Sound Notification</button></div><div><button class="logout">Logout</button></div></section>'); buf.push('<section class="page main"><h1 id="title">Settings</h1><div id="avatarChanger"><h4>Change Avatar</h4><div class="uploadRegion"><p>Drag and drop a new avatar here</p><img/><form><input id="uploader" type="file"/></form></div></div><div><h4>Desktop Integration</h4><button class="enableAlerts">Enable alerts</button><button class="primary installFirefox">Install app</button><button class="soundNotifs">sound notifications</button></div><div><button class="logout">Logout</button></div></section>');
} }
return buf.join(""); return buf.join("");
}; };

2
clientapp/templates/pages/main.jade
View File

@ -14,7 +14,7 @@ section.page.main
h4 Desktop Integration h4 Desktop Integration
button.enableAlerts Enable alerts button.enableAlerts Enable alerts
button.primary.installFirefox Install app button.primary.installFirefox Install app
button.soundNotifs Sound Notification button.soundNotifs sound notifications
div div
button.logout Logout button.logout Logout

6
public/css/otalk.css
View File

@ -1545,6 +1545,12 @@ button.secondary:hover:not(:disabled) {
.main > div .soundNotifs { .main > div .soundNotifs {
margin-left: 5px; margin-left: 5px;
} }
.main > div .soundNotifs.primary:before {
content: 'Disable ';
}
.main > div .soundNotifs.secondary:before {
content: 'Enable ';
}
.uploadRegion { .uploadRegion {
padding: 15px; padding: 15px;
-moz-border-radius: 3px; -moz-border-radius: 3px;

8
public/css/pages/settings.styl
View File

@ -26,6 +26,14 @@
.installFirefox, .soundNotifs .installFirefox, .soundNotifs
margin-left: 5px margin-left: 5px
.soundNotifs
&.primary
&:before
content: 'Disable '
&.secondary
&:before
content: 'Enable '
.uploadRegion .uploadRegion
padding: 15px padding: 15px
roundall(3px) roundall(3px)