Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodlenet
MoodleNet Frontend
Commits
d7c989d1
Commit
d7c989d1
authored
Jun 09, 2020
by
aleclofabbro
Browse files
Merge branch 'fix/dblquoted_background_url' into develop
parents
eb24170f
4d5aa2a2
Changes
15
Hide whitespace changes
Inline
Side-by-side
src/ui/elements/Logo/index.tsx
View file @
d7c989d1
...
...
@@ -28,7 +28,7 @@ const Header = styled.div`
`
;
const
Logo
=
styled
.
div
`
background: url(
${
logo_large_url
}
);
background: url(
"
${
logo_large_url
}
"
);
width: 300px;
display: inline-block;
height: 100px;
...
...
src/ui/modules/AddResource/UploadResource.tsx
View file @
d7c989d1
...
...
@@ -260,15 +260,15 @@ const Label = styled.label`
`
;
const
LicenseLabel0
=
styled
(
Label
)
`
background-image: url(
${
LicenseIcon0
}
);
background-image: url(
"
${
LicenseIcon0
}
"
);
`
;
const
LicenseLabel1
=
styled
(
Label
)
`
background-image: url(
${
LicenseIcon1
}
);
background-image: url(
"
${
LicenseIcon1
}
"
);
`
;
const
LicenseLabel2
=
styled
(
Label
)
`
background-image: url(
${
LicenseIcon2
}
);
background-image: url(
"
${
LicenseIcon2
}
"
);
`
;
const
RadioButton
=
styled
.
input
`
...
...
src/ui/modules/CreateCollectionPanel/index.tsx
View file @
d7c989d1
...
...
@@ -64,7 +64,7 @@ export const CreateCollectionPanel: React.FC<Props> = ({ cancel, formik }) => {
filePattern
=
"image/*"
/>
</
Box
>
{
/* <Background style={{ backgroundImage: `url(${c.icon})` }} /> */
}
{
/* <Background style={{ backgroundImage: `url(
"
${c.icon}
"
)` }} /> */
}
<
HeroInfo
>
<
Title
fontSize
=
{
5
}
fontWeight
=
{
'
bold
'
}
>
<
CollectionContainerForm
>
...
...
src/ui/modules/CreateCommunityPanel/index.tsx
View file @
d7c989d1
...
...
@@ -63,7 +63,7 @@ export const CreateCommunityPanel: React.FC<Props> = ({ cancel, formik }) => {
filePattern
=
"image/*"
/>
</
Box
>
{
/* <Background style={{ backgroundImage: `url(${c.icon})` }} /> */
}
{
/* <Background style={{ backgroundImage: `url(
"
${c.icon}
"
)` }} /> */
}
<
HeroInfo
>
<
Title
fontSize
=
{
5
}
fontWeight
=
{
'
bold
'
}
>
<
CollectionContainerForm
>
...
...
src/ui/modules/DropzoneModal/index.tsx
View file @
d7c989d1
...
...
@@ -93,9 +93,9 @@ const DropzoneArea: React.FC<Props> = ({
</
WrapperIcon
>
<
Img
style
=
{
{
backgroundImage
:
`url(
${
backgroundImage
:
`url(
"
${
currentFile
?
currentFile
.
localUrl
:
fileUrl
}
)`
}
"
)`
}
}
/>
</
Thumb
>
...
...
@@ -119,7 +119,9 @@ const DropzoneArea: React.FC<Props> = ({
/>
</
WrapperIcon
>
<
Img
style
=
{
{
backgroundImage
:
`url(
${
currentFile
.
localUrl
}
)`
}
}
style
=
{
{
backgroundImage
:
`url("
${
currentFile
.
localUrl
}
")`
}
}
/>
</
Thumb
>
<
FileName
>
{
currentFile
&&
currentFile
.
file
.
name
}
</
FileName
>
...
...
src/ui/modules/EditCollectionPanel/index.tsx
View file @
d7c989d1
...
...
@@ -58,7 +58,7 @@ export const EditCollectionPanel: React.FC<Props> = ({ cancel, formik }) => {
filePattern
=
"image/*"
/>
</
Box
>
{
/* <Background style={{ backgroundImage: `url(${c.icon})` }} /> */
}
{
/* <Background style={{ backgroundImage: `url(
"
${c.icon}
"
)` }} /> */
}
<
HeroInfo
>
<
Title
fontSize
=
{
5
}
fontWeight
=
{
'
bold
'
}
>
<
CollectionContainerForm
>
...
...
src/ui/modules/EditCommunityPanel/index.tsx
View file @
d7c989d1
...
...
@@ -58,7 +58,7 @@ export const EditCommunityPanel: React.FC<Props> = ({ cancel, formik }) => {
filePattern
=
"image/*"
/>
</
Box
>
{
/* <Background style={{ backgroundImage: `url(${c.icon})` }} /> */
}
{
/* <Background style={{ backgroundImage: `url(
"
${c.icon}
"
)` }} /> */
}
<
HeroInfo
>
<
Title
fontSize
=
{
5
}
fontWeight
=
{
'
bold
'
}
>
<
CollectionContainerForm
>
...
...
src/ui/modules/FeaturedCollections/preview.tsx
View file @
d7c989d1
...
...
@@ -35,7 +35,7 @@ const CollectionSmall: React.FC<CollectionProps> = ({
<
Link
to
=
{
`/collections/
${
collection
.
id
}
`
}
>
<
Img
style
=
{
{
backgroundImage
:
`url(
${
collection
.
icon
||
PlaceholderImg
}
)`
backgroundImage
:
`url(
"
${
collection
.
icon
||
PlaceholderImg
}
"
)`
}
}
/>
<
Infos
>
...
...
src/ui/modules/FeaturedCommunities/preview.tsx
View file @
d7c989d1
...
...
@@ -35,7 +35,7 @@ const CommunitySmall: React.FC<CommunityProps> = ({
<
Link
to
=
{
`/communities/
${
community
.
id
}
`
}
>
<
Img
style
=
{
{
backgroundImage
:
`url(
${
community
.
icon
||
PlaceholderImg
}
)`
backgroundImage
:
`url(
"
${
community
.
icon
||
PlaceholderImg
}
"
)`
}
}
/>
<
Infos
>
...
...
src/ui/modules/HeroCollection/index.tsx
View file @
d7c989d1
...
...
@@ -61,7 +61,7 @@ export const HeroCollection: FC<Props> = ({ collection: c }) => {
<
HeroCont
>
<
Hero
>
<
Box
sx
=
{
{
position
:
'
relative
'
}
}
>
<
Background
style
=
{
{
backgroundImage
:
`url(
${
c
.
icon
}
)`
}
}
/>
<
Background
style
=
{
{
backgroundImage
:
`url(
"
${
c
.
icon
}
"
)`
}
}
/>
<
Right
>
<
Link
to
=
{
`/communities/
${
c
.
communityId
}
`
}
>
<
LinkImg
>
...
...
src/ui/modules/HeroCommunity/index.tsx
View file @
d7c989d1
...
...
@@ -59,7 +59,7 @@ export const HeroCommunity: FC<Props> = ({ community: c }) => {
<
Background
id
=
"header"
style
=
{
{
backgroundImage
:
`url(
${
c
.
icon
}
)`
backgroundImage
:
`url(
"
${
c
.
icon
}
"
)`
}
}
/>
<
HeroInfo
>
...
...
src/ui/modules/HeroUser/index.tsx
View file @
d7c989d1
...
...
@@ -58,7 +58,7 @@ export const HeroUser: FC<Props> = props => {
<
WrapperHero
>
<
Img
style
=
{
{
backgroundImage
:
`url(
${
props
.
icon
}
)`
backgroundImage
:
`url(
"
${
props
.
icon
}
"
)`
}
}
/>
</
WrapperHero
>
...
...
@@ -220,8 +220,8 @@ const HeroBg = styled.div<{ src: string }>`
height: 250px;
margin: -4px;
background:
${
props
=>
props
.
theme
.
colors
.
light
}
;
background-image: url(
${
props
=>
props
.
src
?
props
.
src
:
props
.
theme
.
colors
.
light
}
);
background-image: url(
"
${
props
=>
props
.
src
?
props
.
src
:
props
.
theme
.
colors
.
light
}
"
);
background-position: center center;
background-repeat: no-repeat;
background-size: cover;
...
...
src/ui/modules/Previews/Thread.tsx
View file @
d7c989d1
...
...
@@ -78,7 +78,7 @@ const Member = styled(Box)<{ src: string }>`
max-width: 28px !important;
max-height: 28px !important;
border-radius: 28px !important;
background: url(
${
props
=>
props
.
src
}
);
background: url(
"
${
props
=>
props
.
src
}
"
);
background-repeat: no-repeat;
background-position: cover;
width: 28px;
...
...
src/ui/modules/ShareLink/fetched.tsx
View file @
d7c989d1
...
...
@@ -56,7 +56,7 @@ export const Fetched: React.FC<Props> = ({ cancel, formik }) => {
filePattern
=
"image/*"
/>
</
Box
>
{
/* <Background style={{ backgroundImage: `url(${c.icon})` }} /> */
}
{
/* <Background style={{ backgroundImage: `url(
"
${c.icon}
"
)` }} /> */
}
<
HeroInfo
>
<
Title
fontSize
=
{
5
}
fontWeight
=
{
'
bold
'
}
>
<
CollectionContainerForm
>
...
...
src/ui/pages/login/index.tsx
View file @
d7c989d1
...
...
@@ -133,7 +133,7 @@ export const Login: React.FC<Props> = ({ formik }) => {
export
default
Login
;
const
Background
=
styled
(
Box
)
`
background: url(
${
instance_bg_img
}
);
background: url(
"
${
instance_bg_img
}
"
);
background-size: cover;
background-position: center center;
background-repeat: no-repeat;
...
...
@@ -142,7 +142,6 @@ const Background = styled(Box)`
border-top-left-radius: 4px;
border-top-right-radius: 4px;
`
;
// FIX ME add background: url(${instance_bg_img}); after add image to constants
const
Infos
=
styled
(
Box
)
``
;
...
...
Write
Preview
Supports
Markdown
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!
Cancel
Please
register
or
sign in
to comment