Merge pull request #685 from gthacoder/meteor-client-hamburger-buttons

HTML5 client: hamburger buttons.
This commit is contained in:
Chad Pilkey 2015-07-02 19:00:07 -04:00
commit aafbbd2948
4 changed files with 23 additions and 12 deletions

View File

@ -1,8 +1,6 @@
<template name="header">
<nav id="navbar" class="myNavbar gradientBar top-bar" role="navigation">
<button class="btn toggleUserlistButton navbarButton sl-hamburger sl-ham-la-cw sl-portrait-mobile sl-portrait-keyboard">
<span></span>
</button>
{{> makeButton btn_class="btn toggleUserlistButton navbarButton sl-hamburger sl-ham-la-cw sl-portrait-mobile sl-portrait-keyboard" rel="tooltip" title="Toggle Userlist" span=true}}
{{#if amIInAudio}}
{{#if amIListenOnlyAudio}}

View File

@ -118,6 +118,17 @@
}
}
.toggleUserlistButton, .toggleMenuButton {
span {
@media @landscape, @desktop-portrait {
width: 30px;
margin-left: auto;
margin-right: auto;
height: 8%;
}
}
}
// changing mute/unmute icons on hover:
.muteIcon .ion-ios-mic-outline:hover:before {
content: "\f45f";

View File

@ -46,12 +46,12 @@
<div class="bar bottomBar">
<a href="#" class="closeSettings close-reveal-modal"><u>Cancel</u></a>
{{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip" title="Save Changes" text="Save"}}
{{> makeButton id="saveSettings" btn_class="settingsButton" rel="tooltip" title="Save Changes" label="Save"}}
</div>
</template>
<template name="logoutModal">
<p>Are you sure you want to logout?</p>
{{> makeButton id="yes" btn_class="logoutButton" rel="tooltip" title="Logout" text="Yes"}}
{{> makeButton id="no" btn_class="logoutButton" rel="tooltip" title="Logout" text="No"}}
{{> makeButton id="yes" btn_class="logoutButton" rel="tooltip" title="Logout" label="Yes"}}
{{> makeButton id="no" btn_class="logoutButton" rel="tooltip" title="Logout" label="No"}}
</template>

View File

@ -1,11 +1,13 @@
<template name="makeButton">
<button type="submit" id="{{id}}" class="btn {{btn_class}}" {{isDisabled}} rel="{{rel}}" data-placement="{{data_placement}}" title="{{title}}" style="{{style}}">
{{#if text}}
<span>{{text}}</span>
{{else}}
{{#if i_class}}
<i class="{{i_class}}"></i><span>{{label}}</span>
{{/if}}
{{#if i_class}}
<i class="{{i_class}}"></i>
{{/if}}
{{#if label}}
<span>{{label}}</span>
{{/if}}
{{#if span}}
<span></span>
{{/if}}
</button>
</template>