diff --git a/bigbluebutton-html5/imports/ui/components/poll/component.jsx b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
index 42dcc5e6f303fa33bbc23a4e6b50b42de0ce94e1..a122c026f0f36bf76a736a4eb8f0073803f47a36 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/poll/component.jsx
@@ -3,7 +3,6 @@ import { Link } from 'react-router';
import Button from '/imports/ui/components/button/component';
import Icon from '/imports/ui/components/icon/component';
import LiveResultContainer from './live-result/container';
-import { findDOMNode } from 'react-dom';
import { defineMessages, injectIntl } from 'react-intl';
import _ from 'lodash';
import { styles } from './styles.scss';
@@ -217,7 +216,10 @@ class Poll extends Component {
onClick={() => {
stopPoll();
this.inputEditor = [];
- this.setState({ isPolling: false, customPollValues: this.inputEditor });
+ this.setState({
+ isPolling: false,
+ customPollValues: this.inputEditor,
+ }, document.activeElement.blur());
}}
label={intl.formatMessage(intlMessages.backLabel)}
color="default"
@@ -268,7 +270,6 @@ class Poll extends Component {
onClick={() => {
if (this.state.isPolling) {
stopPoll();
- this.setState({ isPolling: false });
}
}}
>
diff --git a/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss b/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss
index 205a2c97c00376b52f86c679c58a0395299f9eb0..84485b2c7b21f759e62682f672c639d7c1bd5e17 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss
@@ -1,7 +1,9 @@
@import "/imports/ui/stylesheets/variables/_all";
$sm-margin: 0.3125rem;
-$element-width: 17%;
+$element-width: 17%;
+$user-line-height: 1.75rem;
+$stats-border-color: #d4d9df;
.main {
display: flex;
@@ -11,7 +13,7 @@ $element-width: 17%;
.center {
position: relative;
- flex:1 1 auto;
+ flex: 1 1 auto;
}
.left,
@@ -25,7 +27,7 @@ $element-width: 17%;
.left,
.right {
- flex:0 0 auto;
+ flex: 0 0 auto;
position: relative;
min-width: $element-width;
}
@@ -34,7 +36,7 @@ $element-width: 17%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- border-right: $border-size solid $color-text;
+ font-weight: bold;
}
.right {
@@ -50,8 +52,9 @@ $element-width: 17%;
.stats {
display: flex;
flex-direction: column;
- border: $border-size solid $color-gray-lighter;
+ border: 1px solid $stats-border-color;
border-radius: $border-size-large;
+ padding: $md-padding-x;
> div {
display: flex;
@@ -78,7 +81,7 @@ $element-width: 17%;
.usersHeading,
.responseHeading {
- font-weight: 600;
+ font-weight: $headings-font-weight;
}
.usersHeading,
@@ -86,9 +89,11 @@ $element-width: 17%;
.item,
.itemR {
width: 50%;
+ line-height: $user-line-height;
}
.item,
.itemR {
+ line-height: $user-line-height;
color: $color-text;
}
diff --git a/bigbluebutton-html5/imports/ui/components/poll/styles.scss b/bigbluebutton-html5/imports/ui/components/poll/styles.scss
index 46ca93e3da65c61a68aae66ed0d1b1229fd642ec..ad562d64b6b34c3702dd4e0bffe1ed86f3870a88 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/poll/styles.scss
@@ -61,7 +61,7 @@ $poll-blue: #1A73D4;
}
> pollBtn:nth-child(even) {
- grid-column: 2;
+ grid-column: $column-amount;
}
}
@@ -134,10 +134,9 @@ $poll-blue: #1A73D4;
margin: 0;
color: $color-text;
background: $color-white;
- font-size: $font-size-base;
+ font-size: $font-size-small;
border: 1px solid $color-gray-lighter;
border-radius: $border-radius;
- box-shadow: 0 0 0 $border-size $color-gray-lighter;
padding: $sm-padding-y * 1 $sm-padding-x * 0.25;
padding-left: $lg-padding-y;
}
diff --git a/bigbluebutton-html5/imports/ui/components/polling/component.jsx b/bigbluebutton-html5/imports/ui/components/polling/component.jsx
index 24aa8e612d73df275e1bbeecffd06dd37d92a874..c460e65b4b7f3cbf06ca276e49bc67a859b8862a 100644
--- a/bigbluebutton-html5/imports/ui/components/polling/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/polling/component.jsx
@@ -29,21 +29,19 @@ const Polling = ({ intl, poll, handleVote }) => (
key={pollAnswer.id}
className={styles.pollButtonWrapper}
>
- <Tooltip
- key={pollAnswer.id}
- title={pollAnswer.key}
- >
- <Button
- className={styles.pollingButton}
- color="primary"
- size="md"
- label={pollAnswer.key}
- key={pollAnswer.key}
- onClick={() => handleVote(poll.pollId, pollAnswer)}
- aria-labelledby={`pollAnswerLabel${pollAnswer.key}`}
- aria-describedby={`pollAnswerDesc${pollAnswer.key}`}
- />
- </Tooltip>
+
+
+ <Button
+ className={styles.pollingButton}
+ color="primary"
+ size="md"
+ label={pollAnswer.key}
+ key={pollAnswer.key}
+ onClick={() => handleVote(poll.pollId, pollAnswer)}
+ aria-labelledby={`pollAnswerLabel${pollAnswer.key}`}
+ aria-describedby={`pollAnswerDesc${pollAnswer.key}`}
+ />
+
<div
className={styles.hidden}
id={`pollAnswerLabel${pollAnswer.key}`}
diff --git a/bigbluebutton-html5/imports/ui/components/polling/styles.scss b/bigbluebutton-html5/imports/ui/components/polling/styles.scss
index 5fa334e96a4f229d390df1dd7c7e98fe624f0fcb..7f6f64f7080302be0228abe5bdcaecd2fe35d30e 100644
--- a/bigbluebutton-html5/imports/ui/components/polling/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/polling/styles.scss
@@ -1,5 +1,8 @@
@import "../../stylesheets/variables/_all";
+$poll-width: 18rem;
+$col-amount: 2;
+
// pollingAnswer position offsets
$xs-portrait-offset: 8.75em;
$xs-landscape-offset: 4.75em;
@@ -7,38 +10,38 @@ $s-portrait-offset: 11.75em;
$s-landscape-offset: 1.75em;
.pollingContainer {
- width: 15rem;
+ width: $poll-width;
position: absolute;
z-index: 2;
- border:1px solid #EAEDEF;
- border-radius:4px;
- box-shadow: rgba(67, 90, 111, 0.416) 0px 0px 1px, rgba(67, 90, 111, 0.3) 0px 16px 24px -8px;
+ border: 1px solid $color-off-white;
+ border-radius: $border-radius;
+ box-shadow: $color-gray-dark 0px 0px $lg-padding-y;
align-items: center;
text-align: center;
font-weight: 600;
padding: $md-padding-y;
background-color: $color-white;
- bottom: .725em;
- right: .725em;
+ bottom: $sm-padding-x;
+ right: $sm-padding-x;
}
.pollingTitle {
color: $color-text;
white-space: nowrap;
- padding-bottom: 10px;
- padding-top: 7px;
+ padding-bottom: $md-padding-y;
+ padding-top: $md-padding-y;
}
.pollingAnswers {
display: grid;
- grid-template-columns: repeat(2, 1fr);
+ grid-template-columns: repeat($col-amount, 1fr);
> pollButtonWrapper:nth-child(odd) {
grid-column: 1;
}
> pollButtonWrapper:nth-child(even) {
- grid-column: 2;
+ grid-column: $col-amount;
}
z-index: 1;
@@ -61,8 +64,7 @@ $s-landscape-offset: 1.75em;
.pollButtonWrapper {
text-align: center;
- padding: 5px;
-
+ padding: $sm-padding-y;
}
.pollingButton {
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
index 231a8df908535c2dda4b5a337925b877241b70c1..19ac118b3939da6d5e507817de2dd0f5da04652f 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx
@@ -76,6 +76,7 @@ class UserContent extends React.PureComponent {
roving,
}}
/>
+
<UserParticipants
{...{
users,