diff --git a/bigbluebutton-html5/imports/ui/components/poll/live-result/container.jsx b/bigbluebutton-html5/imports/ui/components/poll/live-result/container.jsx index 3ebb95dcd03fa68c30ef297278d77e987646fb94..c3e5e8a06756c9c38eaebee0f1d2a4791a3bac64 100644 --- a/bigbluebutton-html5/imports/ui/components/poll/live-result/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/container.jsx @@ -8,18 +8,17 @@ import { createContainer } from 'meteor/react-meteor-data'; const LiveResultContainer = ({ ...props }) => <LiveResult {...props} />; export default createContainer(() => { + Meteor.subscribe('results', Auth.meetingID); + const getUser = userId => Users.findOne({ userId }); const currentUser = Users.findOne({ userId: Auth.userID }); const currentPoll = Polls.findOne({ meetingId: Auth.meetingID }); - const subs = Meteor.subscribe('results', Auth.meetingID); - return { getUser, currentUser, currentPoll, - loading: !subs.ready(), }; }, LiveResultContainer); 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 e6390b71d9ffd257d9c70eb85a031d28f82b478e..472569af0c517fdcdb65fb999d5218a012ce2eab 100644 --- a/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss @@ -1,5 +1,8 @@ @import "/imports/ui/stylesheets/variables/_all"; +$sm-margin: 0.3125rem; +$element-width: 17%; + .main { display: flex; justify-content: space-between; @@ -14,41 +17,40 @@ .left, .right, .center { - padding: .375rem; - margin-top: 5px; - margin-bottom: 5px; + padding: $sm-padding-y; + margin-top: $sm-margin; + margin-bottom: $sm-margin; } .left, .right { - position: relative; flex:0 0 auto; + position: relative; + min-width: $element-width; } .left { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - min-width: 19%; - border-right: 2px solid $color-text; + border-right: $border-size solid $color-text; } .right { text-align: right; - min-width: 17%; - max-width: 17%; + max-width: $element-width; } .container, .stats { - margin-bottom: 15px; + margin-bottom: $sm-padding-x; } .stats { display: flex; flex-direction: column; - border: 2px solid $color-text; - border-radius: 3px; + border: $border-size solid $color-text; + border-radius: $border-size-large; > div { display: flex; @@ -56,7 +58,7 @@ > div:nth-child(even) { position: relative; - width: 60%; + width: 50%; text-align: center; } @@ -88,4 +90,5 @@ .item, .itemR { color: $color-text; - } \ No newline at end of file + } + \ No newline at end of file