BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug with whiteboard's width in case when poll controllers appeared

Browse Source
This commit is contained in:
Oleksandr Zhurbenko 2015-09-10 14:50:38 -07:00
parent f9b2cdb01c
commit 2feabdc65b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-html5/app/client/globals.coffee
View File

@ -184,7 +184,7 @@ Handlebars.registerHelper "getPollQuestions", ->
if polls? and polls isnt undefined if polls? and polls isnt undefined
number = polls.poll_info.poll.answers.length number = polls.poll_info.poll.answers.length
widthStyle = "width: calc(75%/" + number + ");" 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 buttonStyle = widthStyle + marginStyle
for answer in polls.poll_info.poll.answers for answer in polls.poll_info.poll.answers
answer.style = buttonStyle answer.style = buttonStyle

7
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
View File

@ -84,6 +84,7 @@
align-items: center; align-items: center;
-webkit-align-items: center; -webkit-align-items: center;
-ms-align-items: center; -ms-align-items: center;
border-bottom: 1px solid extract(@lightGrey, 3);
} }
} }
@ -101,7 +102,6 @@
text-align: center; text-align: center;
padding-top:10px; padding-top:10px;
padding-bottom: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 */ font-size: 0; /* to remove default 4px gaps between the buttons caused by display: inline-block */
} }
@ -111,8 +111,9 @@
font-weight: bold; font-weight: bold;
border: 1px solid extract(@lightGrey, 3); border: 1px solid extract(@lightGrey, 3);
height: 100%; height: 100%;
padding-left: 0rem !important; /*overwriting the default foundation padding */ padding-left: 0; /*overwriting the default foundation padding */
padding-right: 0rem !important; /*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 */ max-width: calc(~'100%/6'); /* the actual width and margins are calculated in the code */
/* truncating the text inside the buttons */ /* truncating the text inside the buttons */
overflow: hidden; overflow: hidden;