diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index aa914222c17c329a70659d5192f0a28e011bda0b..4123616f4ab7f2c0d4436a08dae349decbac4fab 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -313,7 +313,6 @@ class App extends Component {
}
render() {
-
const {
params, userListIsOpen, customStyle, customStyleUrl,
} = this.props;
@@ -339,7 +338,7 @@ class App extends Component {
<ModalContainer />
<AudioContainer />
<ToastContainer />
- <ChatAlertContainer currentChatID={params.chatID} />
+ <ChatAlertContainer currentChatID={params} />
{ customStyleUrl ? <link rel="stylesheet" type="text/css" href={customStyleUrl} /> : null }
{ customStyle ? <link rel="stylesheet" type="text/css" href={`data:text/css;charset=UTF-8,${encodeURIComponent(customStyle)}`} /> : null }
</main>
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 3ac4060600a2d84abed5be9b76883c9fd600562d..ad7a8acf052df71820d85eafb4e42349e7711073 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss
@@ -9,8 +9,8 @@ $user-line-height: 1.75rem;
.btn {
width: 100%;
- margin-top: $sm-padding-y;
- margin-bottom: $sm-padding-y;
+ margin-top: var(--sm-padding-y);
+ margin-bottom: var(--sm-padding-y);
}
.main {
@@ -27,10 +27,10 @@ $user-line-height: 1.75rem;
.left,
.right,
.center {
- padding: $sm-padding-y;
+ padding: var(--sm-padding-y);
margin-top: $sm-margin;
margin-bottom: $sm-margin;
- color: $color-text;
+ color: var(--color-text);
}
.left,
@@ -55,15 +55,15 @@ $user-line-height: 1.75rem;
.container,
.stats {
- margin-bottom: $sm-padding-x;
+ margin-bottom: var(--sm-padding-x);
}
.stats {
display: flex;
flex-direction: column;
border: 1px solid $stats-border-color;
- border-radius: $border-size-large;
- padding: $md-padding-x;
+ border-radius: var(--border-size-large);
+ padding: var(--md-padding-x);
> div {
display: flex;
@@ -90,7 +90,7 @@ $user-line-height: 1.75rem;
.usersHeading,
.responseHeading {
- font-weight: $headings-font-weight;
+ font-weight: var(--headings-font-weight);
}
.usersHeading,
@@ -104,5 +104,5 @@ $user-line-height: 1.75rem;
.item,
.itemR {
line-height: $user-line-height;
- color: $color-text;
+ color: var(--color-text);
}
diff --git a/bigbluebutton-html5/imports/ui/components/poll/styles.scss b/bigbluebutton-html5/imports/ui/components/poll/styles.scss
index 162ee366cc95848b6c44fc63efbd3758992dbbf4..1ec84ec7a72b0061728b51ba564f3da15ec455b6 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/poll/styles.scss
@@ -36,18 +36,18 @@ $poll-blue: #1A73D4;
> input {
width: 100%;
- margin-top: $sm-padding-y;
- margin-bottom: $sm-padding-y;
+ margin-top: var(--sm-padding-y);
+ margin-bottom: var(--sm-padding-y);
}
> input:first-child {
- margin-top: $md-padding-y;
+ margin-top: var(--md-padding-y);
}
> Button {
width: 100%;
- margin-top: $sm-padding-y;
- margin-bottom: $sm-padding-y;
+ margin-top: var(--sm-padding-y);
+ margin-bottom: var(--sm-padding-y);
}
}
@@ -56,7 +56,7 @@ $poll-blue: #1A73D4;
flex-direction: row;
align-items: center;
justify-content: space-between;
- margin-bottom: $md-padding-y;
+ margin-bottom: var(--md-padding-y);
> a {
text-decoration: none;
@@ -64,10 +64,10 @@ $poll-blue: #1A73D4;
}
.instructions {
- margin-top: $lg-padding-x;
- margin-bottom: $lg-padding-x;
+ margin-top: var(--lg-padding-x);
+ margin-bottom: var(--lg-padding-x);
- color: $color-text;
+ color: var(--color-text);
}
.grid {
@@ -84,17 +84,17 @@ $poll-blue: #1A73D4;
}
.pollBtn:nth-child(even) {
- margin-left: $sm-padding-y;
+ margin-left: var(--sm-padding-y);
}
.pollBtn:nth-child(odd) {
- margin-right: $sm-padding-y;
+ margin-right: var(--sm-padding-y);
}
.customBtn:hover,
.pollBtn:hover {
box-shadow: 0 0 0 1px $poll-blue;
- background-color: $color-white;
+ background-color: var(--color-white);
color: $poll-blue;
> span {
@@ -105,14 +105,14 @@ $poll-blue: #1A73D4;
.customBtn,
.pollBtn {
- margin-top: $sm-padding-y;
- margin-bottom: $sm-padding-y;
- background-color: $color-white;
- box-shadow: 0 0 0 1px $color-gray-light;
- color: $color-gray-light;
+ margin-top: var(--sm-padding-y);
+ margin-bottom: var(--sm-padding-y);
+ background-color: var(--color-white);
+ box-shadow: 0 0 0 1px var(--color-gray-light);
+ color: var(--color-gray-light);
> span {
- color: $color-gray-light;
+ color: var(--color-gray-light);
}
> span:hover {
@@ -127,7 +127,7 @@ $poll-blue: #1A73D4;
box-shadow: 0 0 0 1px $poll-blue;
}
- background-color: $color-white;
+ background-color: var(--color-white);
box-shadow: 0 0 0 1px $poll-blue;
> span {
@@ -137,7 +137,7 @@ $poll-blue: #1A73D4;
.customBtn:focus,
.pollBtn:focus {
- background-color: $color-white;
+ background-color: var(--color-white);
box-shadow: 0 0 0 1px $poll-blue;
> span {
@@ -146,15 +146,15 @@ $poll-blue: #1A73D4;
}
.input {
- @include inputFocus($color-blue-light);
+ @include inputFocus(var(--color-blue-light));
outline: 0;
margin: 0;
- color: $color-text;
- background: $color-white;
- font-size: $font-size-small;
- border: 1px solid $color-gray-lighter;
- border-radius: $border-radius;
- padding: $sm-padding-y * 1 $sm-padding-x * 0.25;
- padding-left: $lg-padding-y;
+ color: var(--color-text);
+ background: var(--color-white);
+ font-size: var(--font-size-small);
+ border: 1px solid var(--color-gray-lighter);
+ border-radius: var(--border-radius);
+ //padding: var(--sm-padding-y) * 1 var(--sm-padding-x) * 0.25;
+ padding-left: var(--lg-padding-y);
}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-polls/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-polls/styles.scss
index 08dff0f9c497be01d788ca1ef0a243ad59a88393..8d2a89157dfb7d7956d2d04c488222578955b34d 100644
--- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-polls/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-polls/styles.scss
@@ -1,8 +1,8 @@
@import "../../styles.scss";
@import "/imports/ui/stylesheets/variables/_all";
-$list-item-bg-hover: darken($color-off-white, 7%);
-$item-focus-border: $color-blue-lighter;
+$list-item-bg-hover: darken(#F3F6F9, 7%);
+$item-focus-border: #92BCEA;
.smallTitle {
font-size: 0.85rem;
@@ -34,8 +34,8 @@ $item-focus-border: $color-blue-lighter;
padding-left: 12px;
text-decoration: none;
width: 100%;
- color: $color-gray-dark;
- background-color: $color-off-white;
+ color: var(--color-gray-dark);
+ background-color: var(--color-off-white);
> i {
display: flex;
@@ -58,7 +58,7 @@ $item-focus-border: $color-blue-lighter;
&:active {
background-color: $list-item-bg-hover;
- box-shadow: inset 0 0 0 $border-size $item-focus-border, inset 1px 0 0 1px $item-focus-border;
+ box-shadow: inset 0 0 0 var(--border-size) $item-focus-border, inset 1px 0 0 1px $item-focus-border;
outline: none;
}
}