Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
gencay tekin
jitsi-meet
Commits
8c9c1a29
Unverified
Commit
8c9c1a29
authored
2 years ago
by
Shahab
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
refactor(prejoin) use jss instead of sass in DeviceStatus (#11116)
parent
c25fb702
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
css/premeeting/_device-status.scss
+0
-38
css/premeeting/_device-status.scss
css/premeeting/_main.scss
+0
-1
css/premeeting/_main.scss
react/features/prejoin/components/preview/DeviceStatus.js
+41
-1
react/features/prejoin/components/preview/DeviceStatus.js
with
41 additions
and
40 deletions
css/premeeting/_device-status.scss
deleted
100644 → 0
+
0
−
38
View file @
c25fb702
.device
{
&
-status
{
align-items
:
center
;
color
:
#fff
;
display
:
flex
;
font-size
:
14px
;
line-height
:
20px
;
padding
:
6px
;
text-align
:
center
;
&
-error
{
align-items
:
flex-start
;
background-color
:
#F8AE1A
;
border-radius
:
6px
;
color
:
#040404
;
padding
:
12px
16px
;
text-align
:
left
;
}
span
{
margin-left
:
16px
;
}
}
&
-icon
{
background-position
:
center
;
background-repeat
:
no-repeat
;
display
:
inline-block
;
height
:
16px
;
width
:
16px
;
&
--ok
{
svg
path
{
fill
:
#189b55
;
}
}
}
}
This diff is collapsed.
Click to expand it.
css/premeeting/_main.scss
+
0
−
1
View file @
8c9c1a29
@import
'connection-status'
;
@import
'device-status'
;
@import
'lobby'
;
@import
'premeeting-screens'
;
@import
'prejoin'
;
...
...
This diff is collapsed.
Click to expand it.
react/features/prejoin/components/preview/DeviceStatus.js
+
41
−
1
View file @
8c9c1a29
// @flow
import
{
makeStyles
}
from
'
@material-ui/styles
'
;
import
clsx
from
'
clsx
'
;
import
React
from
'
react
'
;
import
{
translate
}
from
'
../../../base/i18n
'
;
...
...
@@ -29,6 +31,43 @@ export type Props = {
t
:
Function
};
const
useStyles
=
makeStyles
(
theme
=>
{
return
{
deviceStatus
:
{
alignItems
:
'
center
'
,
color
:
'
#fff
'
,
display
:
'
flex
'
,
fontSize
:
'
14px
'
,
lineHeight
:
'
20px
'
,
padding
:
'
6px
'
,
textAlign
:
'
center
'
,
'
& span
'
:
{
marginLeft
:
theme
.
spacing
(
3
)
},
'
&.device-status-error
'
:
{
alignItems
:
'
flex-start
'
,
backgroundColor
:
theme
.
palette
.
warning01
,
borderRadius
:
'
6px
'
,
color
:
theme
.
palette
.
uiBackground
,
padding
:
'
12px 16px
'
,
textAlign
:
'
left
'
},
'
& .device-icon
'
:
{
backgroundPosition
:
'
center
'
,
backgroundRepeat
:
'
no-repeat
'
,
display
:
'
inline-block
'
,
height
:
'
16px
'
,
width
:
'
16px
'
},
'
& .device-icon--ok svg path
'
:
{
fill
:
'
#189B55
'
}
}
};
});
const
iconMap
=
{
warning
:
{
src
:
IconExclamationTriangle
,
...
...
@@ -47,9 +86,10 @@ const iconMap = {
* @returns {ReactElement}
*/
function
DeviceStatus
({
deviceStatusType
,
deviceStatusText
,
t
}:
Props
)
{
const
classes
=
useStyles
();
const
{
src
,
className
}
=
iconMap
[
deviceStatusType
];
const
hasError
=
deviceStatusType
===
'
warning
'
;
const
containerClassName
=
`
device
-s
tatus
${
hasError
?
'
device-status-error
'
:
''
}
`
;
const
containerClassName
=
clsx
(
classes
.
device
S
tatus
,
{
'
device-status-error
'
:
hasError
})
;
return
(
<
div
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets