From 2feabdc65bc5b815a124779aa474fdbd7eeb24c9 Mon Sep 17 00:00:00 2001 From: Oleksandr Zhurbenko Date: Thu, 10 Sep 2015 14:50:38 -0700 Subject: [PATCH] Fixed a bug with whiteboard's width in case when poll controllers appeared --- bigbluebutton-html5/app/client/globals.coffee | 2 +- bigbluebutton-html5/app/client/stylesheets/whiteboard.less | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bigbluebutton-html5/app/client/globals.coffee b/bigbluebutton-html5/app/client/globals.coffee index 0e699edd9c..11b12216b0 100755 --- a/bigbluebutton-html5/app/client/globals.coffee +++ b/bigbluebutton-html5/app/client/globals.coffee @@ -184,7 +184,7 @@ Handlebars.registerHelper "getPollQuestions", -> if polls? and polls isnt undefined number = polls.poll_info.poll.answers.length widthStyle = "width: calc(75%/" + number + ");" - marginStyle = "margin-left: calc(25%/" + (number*2) + ");" + "margin-right: calc(23%/" + (number*2) + ");" + marginStyle = "margin-left: calc(25%/" + (number*2) + ");" + "margin-right: calc(25%/" + (number*2) + ");" buttonStyle = widthStyle + marginStyle for answer in polls.poll_info.poll.answers answer.style = buttonStyle diff --git a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less index 42940d1996..04bccec05b 100755 --- a/bigbluebutton-html5/app/client/stylesheets/whiteboard.less +++ b/bigbluebutton-html5/app/client/stylesheets/whiteboard.less @@ -84,6 +84,7 @@ align-items: center; -webkit-align-items: center; -ms-align-items: center; + border-bottom: 1px solid extract(@lightGrey, 3); } } @@ -101,7 +102,6 @@ text-align: center; padding-top:10px; padding-bottom:10px; - border-top: 1px solid extract(@lightGrey, 3); font-size: 0; /* to remove default 4px gaps between the buttons caused by display: inline-block */ } @@ -111,8 +111,9 @@ font-weight: bold; border: 1px solid extract(@lightGrey, 3); height: 100%; - padding-left: 0rem !important; /*overwriting the default foundation padding */ - padding-right: 0rem !important; /*overwriting the default foundation padding */ + padding-left: 0; /*overwriting the default foundation padding */ + padding-right: 0; /*overwriting the default foundation padding */ + margin-bottom: 0; /*overwriting the default foundation margin */ max-width: calc(~'100%/6'); /* the actual width and margins are calculated in the code */ /* truncating the text inside the buttons */ overflow: hidden;