Merge pull request #548 from OZhurbenko/meteor-ui

Mobile View's changes
This commit is contained in:
Fred Dixon 2015-03-10 01:25:02 -04:00
commit 4f023dd91c
4 changed files with 7 additions and 14 deletions

View File

@ -57,10 +57,6 @@
@getTimeOfJoining = ->
Meteor.Users.findOne(userId: getInSession "userId")?.user?.time_of_joining
@getPresentationFilename = ->
currentPresentation = Meteor.Presentations.findOne({"presentation.current": true})
currentPresentation?.presentation?.name
Handlebars.registerHelper "colourToHex", (value) =>
@window.colourToHex(value)
@ -104,7 +100,7 @@ Handlebars.registerHelper "getUsersInMeeting", ->
raised.concat lowered
Handlebars.registerHelper "getWhiteboardTitle", ->
"Whiteboard: " + (getPresentationFilename() or "Loading...")
"Presentation"
Handlebars.registerHelper "isCurrentUser", (userId) ->
userId is BBB.getCurrentUser()?.userId

View File

@ -35,6 +35,7 @@
list-style: none;
margin: 0px;
padding: 0px;
@media @desktop-portrait, @landscape {
li {
margin: 0px;
@ -48,6 +49,7 @@
}
}
}
}
#chatbody {
@ -63,11 +65,6 @@
}
}
.chatGreeting {
color: blue;
margin-top: 5px;
}
.chatNameSelector {
clear:right;
float:left;
@ -114,7 +111,7 @@
float: left;
@media @desktop-portrait, @mobile-portrait, @mobile-portrait-with-keyboard {
.dropdownMessage {
font-size: 2.5vw !important;
font-size: 3vw;
font-style: italic;
}
}

View File

@ -255,9 +255,9 @@ Template.optionsFontSize.events
if selectedFontSize
setInSession "messageFontSize", selectedFontSize
else if isPortraitMobile()
setInSession "messageFontSize", 20
setInSession "messageFontSize", Meteor.config.app.mobileFont
else
setInSession "messageFontSize", 12
setInSession "messageFontSize", Meteor.config.app.desktopFont
Template.optionsFontSize.helpers
getFontsizes: -> (size for size in [8..30] by 2)

View File

@ -100,7 +100,7 @@
<template name="optionsFontSize">
<div class="dropdown">
<span class="dropdownMessage" {{messageFontSize}}>Chat Message Font Size: </span>
<span class="dropdownMessage">Chat Message Font Size: </span>
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown">
Font Size ({{getInSession "messageFontSize"}})
<span class="caret"></span>