diff --git a/bigbluebutton-html5/imports/ui/components/captions/pad/component.jsx b/bigbluebutton-html5/imports/ui/components/captions/pad/component.jsx
index a8af07de30a22ca4030ff5ec32b026faf111a93d..cf9204fe23dcbb696b32cd031a66bb28e595ff16 100644
--- a/bigbluebutton-html5/imports/ui/components/captions/pad/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/captions/pad/component.jsx
@@ -46,6 +46,10 @@ const intlMessages = defineMessages({
id: 'app.captions.pad.dictationOffDesc',
description: 'Aria description for button that turns off speech recognition',
},
+ poweredBy: {
+ id: 'app.captions.pad.poweredBy',
+ description: 'Credit text line',
+ },
});
const propTypes = {
@@ -251,6 +255,15 @@ class Pad extends PureComponent {
src={url}
aria-describedby="padEscapeHint"
/>
+ <div className={styles.poweredBy}>
+ {intl.formatMessage(intlMessages.poweredBy)}
+ <a
+ href="https://www.etherpad.org"
+ target="_blank"
+ >
+ Etherpad
+ </a>
+ </div>
<span id="padEscapeHint" className={styles.hint} aria-hidden>
{intl.formatMessage(intlMessages.tip)}
</span>
diff --git a/bigbluebutton-html5/imports/ui/components/captions/pad/styles.scss b/bigbluebutton-html5/imports/ui/components/captions/pad/styles.scss
index 9bc5b5b84ffed9cf6fa7597f84bbc2d19efd3065..c29d7101d6c2cd68221fcf5a96a108f9e7169a40 100644
--- a/bigbluebutton-html5/imports/ui/components/captions/pad/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/captions/pad/styles.scss
@@ -19,34 +19,35 @@
.pad {
background-color: var(--color-white);
- padding: var(--md-padding-x);
+ padding:
+ var(--md-padding-x)
+ var(--md-padding-y)
+ var(--md-padding-x)
+ var(--md-padding-x);
+
display: flex;
flex-grow: 1;
flex-direction: column;
justify-content: space-around;
overflow: hidden;
height: 100vh;
- transform: translateZ(0);
+
+ :global(.browser-chrome) & {
+ transform: translateZ(0);
+ }
+
+ @include mq($small-only) {
+ transform: none !important;
+ }
}
.header {
+ position: relative;
+ top: var(--poll-header-offset);
display: flex;
flex-direction: row;
- align-items: left;
- flex-shrink: 0;
-
- a {
- @include elementFocus(var(--color-primary));
- padding-bottom: var(--sm-padding-y);
- padding-left: var(--sm-padding-y);
- text-decoration: none;
- display: block;
- }
-
- [class^="icon-bbb-"],
- [class*=" icon-bbb-"] {
- font-size: 85%;
- }
+ align-items: center;
+ justify-content: space-between;
}
.title {
@@ -54,9 +55,7 @@
flex: 1;
& > button, button:hover {
- margin-top: 0;
- padding-top: 0;
- border-top: 0;
+ max-width: var(--toast-content-width);
}
}
@@ -64,12 +63,27 @@
position: relative;
background-color: var(--color-white);
display: block;
- margin: 4px;
- margin-bottom: 2px;
- padding-left: 0px;
+ margin: var(--border-size-large);
+ margin-bottom: var(--border-size);
+ padding-left: 0;
+ padding-right: inherit;
+
+ [dir="rtl"] & {
+ padding-left: inherit;
+ padding-right: 0;
+ }
> i {
- color: black;
+ color: var(--color-gray-dark);
+ font-size: smaller;
+
+ [dir="rtl"] & {
+ -webkit-transform: scale(-1, 1);
+ -moz-transform: scale(-1, 1);
+ -ms-transform: scale(-1, 1);
+ -o-transform: scale(-1, 1);
+ transform: scale(-1, 1);
+ }
}
&:hover {
@@ -93,6 +107,13 @@
}
}
+.poweredBy {
+ color: var(--color-gray);
+ font-size: x-small;
+ text-align: end;
+ width: 100%;
+}
+
iframe {
display: flex;
flex-flow: column;
diff --git a/bigbluebutton-html5/imports/ui/components/note/component.jsx b/bigbluebutton-html5/imports/ui/components/note/component.jsx
index 6efa4df546c9a9ff7687eca596b5116b0bc265b9..e3ec3fa311a9d4cdb1fb262628a88ba9a532b6ec 100644
--- a/bigbluebutton-html5/imports/ui/components/note/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/note/component.jsx
@@ -20,6 +20,10 @@ const intlMessages = defineMessages({
id: 'app.note.tipLabel',
description: 'Label for tip on how to escape iframe',
},
+ poweredBy: {
+ id: 'app.note.poweredBy',
+ description: 'Credit text line',
+ },
});
const propTypes = {
@@ -66,6 +70,15 @@ const Note = (props) => {
src={url}
aria-describedby="sharedNotesEscapeHint"
/>
+ <div className={styles.poweredBy}>
+ {intl.formatMessage(intlMessages.poweredBy)}
+ <a
+ href="https://www.etherpad.org"
+ target="_blank"
+ >
+ Etherpad
+ </a>
+ </div>
<span id="sharedNotesEscapeHint" className={styles.hint} aria-hidden>
{intl.formatMessage(intlMessages.tipLabel)}
</span>
diff --git a/bigbluebutton-html5/imports/ui/components/note/styles.scss b/bigbluebutton-html5/imports/ui/components/note/styles.scss
index 7186bf114f0863b3167f03604a345af67c5b2bf3..8a3b58cf065bb347752026657e6162f49fd9c49c 100644
--- a/bigbluebutton-html5/imports/ui/components/note/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/note/styles.scss
@@ -3,37 +3,35 @@
.note {
background-color: var(--color-white);
- padding: var(--md-padding-x);
+ padding:
+ var(--md-padding-x)
+ var(--md-padding-y)
+ var(--md-padding-x)
+ var(--md-padding-x);
+
display: flex;
flex-grow: 1;
flex-direction: column;
justify-content: space-around;
overflow: hidden;
height: 100vh;
- transform: translateZ(0);
+
+ :global(.browser-chrome) & {
+ transform: translateZ(0);
+ }
+
+ @include mq($small-only) {
+ transform: none !important;
+ }
}
.header {
+ position: relative;
+ top: var(--poll-header-offset);
display: flex;
flex-direction: row;
- align-items: left;
- flex-shrink: 0;
-
- a {
- @include elementFocus(var(--color-primary));
- padding: 0 0 var(--sm-padding-y) var(--sm-padding-y);
- text-decoration: none;
- display: block;
-
- [dir="rtl"] & {
- padding: 0 var(--sm-padding-y) var(--sm-padding-y) 0;
- }
- }
-
- [class^="icon-bbb-"],
- [class*=" icon-bbb-"] {
- font-size: 85%;
- }
+ align-items: center;
+ justify-content: space-between;
}
.title {
@@ -41,9 +39,7 @@
flex: 1;
& > button, button:hover {
- margin-top: 0;
- padding-top: 0;
- border-top: 0;
+ max-width: var(--toast-content-width);
}
}
@@ -51,16 +47,27 @@
position: relative;
background-color: var(--color-white);
display: block;
- margin: 4px;
- margin-bottom: 2px;
- padding: inherit inherit inherit 0;
+ margin: var(--border-size-large);
+ margin-bottom: var(--border-size);
+ padding-left: 0;
+ padding-right: inherit;
[dir="rtl"] & {
- padding: inherit 0 inherit inherit;
+ padding-left: inherit;
+ padding-right: 0;
}
> i {
- color: black;
+ color: var(--color-gray-dark);
+ font-size: smaller;
+
+ [dir="rtl"] & {
+ -webkit-transform: scale(-1, 1);
+ -moz-transform: scale(-1, 1);
+ -ms-transform: scale(-1, 1);
+ -o-transform: scale(-1, 1);
+ transform: scale(-1, 1);
+ }
}
&:hover {
@@ -88,6 +95,13 @@
}
}
+.poweredBy {
+ color: var(--color-gray);
+ font-size: x-small;
+ text-align: end;
+ width: 100%;
+}
+
iframe {
display: flex;
flex-flow: column;
diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json
index 739ef555bbb0b99198a206066621cd84cd0e9493..d1ea1f2c3a64571f397e51d9d98431e472bfba6d 100755
--- a/bigbluebutton-html5/private/locales/en.json
+++ b/bigbluebutton-html5/private/locales/en.json
@@ -47,13 +47,15 @@
"app.captions.pad.dictationStop": "Stop dictation",
"app.captions.pad.dictationOnDesc": "Turns speech recognition on",
"app.captions.pad.dictationOffDesc": "Turns speech recognition off",
+ "app.captions.pad.poweredBy": "powered by ",
"app.note.title": "Shared Notes",
"app.note.label": "Note",
"app.note.hideNoteLabel": "Hide note",
+ "app.note.tipLabel": "Press Esc to focus editor toolbar",
+ "app.note.poweredBy": "powered by ",
"app.user.activityCheck": "User activity check",
"app.user.activityCheck.label": "Check if user is still in meeting ({0})",
"app.user.activityCheck.check": "Check",
- "app.note.tipLabel": "Press Esc to focus editor toolbar",
"app.userList.usersTitle": "Users",
"app.userList.participantsTitle": "Participants",
"app.userList.messagesTitle": "Messages",