Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Frontend-MECRED
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
MECRED
Frontend-MECRED
Commits
cce591c9
Commit
cce591c9
authored
2 months ago
by
Richard Fernando Heise Ferreira
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-304/correction-on-the-about-page' into 'develop'
Issue
#304
: FIX Correction of the slides on the about page See merge request
!284
parents
ef728a92
50eb321f
No related branches found
No related tags found
1 merge request
!284
Issue #304: FIX Correction of the slides on the about page
Pipeline
#42044
passed
2 months ago
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/components/About.js
+3
-8
3 additions, 8 deletions
src/app/components/About.js
src/app/components/Title.js
+2
-2
2 additions, 2 deletions
src/app/components/Title.js
src/app/components/needLoginModal.js
+2
-2
2 additions, 2 deletions
src/app/components/needLoginModal.js
with
7 additions
and
12 deletions
src/app/components/About.js
+
3
−
8
View file @
cce591c9
...
@@ -354,7 +354,7 @@ export default function AboutComponent() {
...
@@ -354,7 +354,7 @@ export default function AboutComponent() {
return
(
return
(
<
a
href
=
{
link
}
className
=
"
block
"
>
<
a
href
=
{
link
}
className
=
"
block
"
>
<
div
className
=
"
flex mt-2 flex-row items-center w-full
"
>
<
div
className
=
"
flex mt-2 flex-row items-center w-full
"
>
<
div
className
=
"
relative border border-white w-[calc(20vw+8px)] max-xl:w-[248px]
h-[550px
] max-xl:h-[420px] max-md:h-[332px] overflow-hidden rounded-lg
"
>
<
div
className
=
"
relative border border-white
2xl:
w-[calc(20vw+8px)] max-xl:w-[248px]
xl:w-[calc(18vw+23px)] h-[32vw
] max-xl:h-[420px] max-md:h-[332px] overflow-hidden rounded-lg
"
>
<
Image
<
Image
className
=
"
object-cover object-[60%_75%]
"
className
=
"
object-cover object-[60%_75%]
"
alt
=
{
name
}
alt
=
{
name
}
...
@@ -362,7 +362,7 @@ export default function AboutComponent() {
...
@@ -362,7 +362,7 @@ export default function AboutComponent() {
fill
fill
/>
/>
<
div
className
=
"
absolute bottom-0 left-0 w-full h-1/3 bg-gradient-to-t from-black to-transparent
"
>
<
div
className
=
"
absolute bottom-0 left-0 w-full h-1/3 bg-gradient-to-t from-black to-transparent
"
>
<
span
className
=
"
absolute bottom-0 left-0 w-full bg-transparent bg-opacity-60 font-bold text-white text-xl max-l
g
:text-base pl-4 pb-8 max-md:pb-6
"
>
<
span
className
=
"
absolute bottom-0 left-0 w-full bg-transparent bg-opacity-60 font-bold text-white text-xl max-
x
l:text-base pl-4 pb-8 max-md:pb-6
"
>
{
description
}
{
description
}
<
/span
>
<
/span
>
<
/div
>
<
/div
>
...
@@ -429,12 +429,7 @@ export default function AboutComponent() {
...
@@ -429,12 +429,7 @@ export default function AboutComponent() {
<
div
className
=
"
flex col-span-2
"
>
<
div
className
=
"
flex col-span-2
"
>
<
div
className
=
"
flex flex-col px-3 w-full
"
>
<
div
className
=
"
flex flex-col px-3 w-full
"
>
<
Slides
/>
<
Slides
/>
<
div
className
=
"
flex flex-col w-full text-center items-center rounded-lg bg-white-HC-dark outline outline-1 outline-ice-HC-white
"
>
<
div
className
=
"
flex flex-col text-center items-center rounded-lg bg-white-HC-dark outline outline-1 outline-ice-HC-white
"
>
<
div
>
<
Title
/>
<
/div
>
<
/div
>
<
div
className
=
"
flex flex-col mt-12 text-center items-center rounded-lg bg-white-HC-dark outline outline-1 outline-ice-HC-white
"
>
<
MecredStats
/>
<
MecredStats
/>
<
/div
>
<
/div
>
<
div
className
=
"
flex flex-col text-center items-center mt-12 rounded-lg bg-white-HC-dark max-sm:hidden outline outline-1 outline-ice-HC-white
"
>
<
div
className
=
"
flex flex-col text-center items-center mt-12 rounded-lg bg-white-HC-dark max-sm:hidden outline outline-1 outline-ice-HC-white
"
>
...
...
This diff is collapsed.
Click to expand it.
src/app/components/Title.js
+
2
−
2
View file @
cce591c9
...
@@ -4,8 +4,8 @@ export default function Title() {
...
@@ -4,8 +4,8 @@ export default function Title() {
<
h1
className
=
"
text-3xl max-lg:text-xl font-bold text-darkGray-HC-white my-10 text-center
"
>
<
h1
className
=
"
text-3xl max-lg:text-xl font-bold text-darkGray-HC-white my-10 text-center
"
>
MEC
RED
-
A
Rede
Social
da
Educação
MEC
RED
-
A
Rede
Social
da
Educação
<
/h1
>
<
/h1
>
<
h1
className
=
"
text-xl
lg:px-44
max-lg:text-base text-darkGray-HC-white
text-balance
mb-5 justify-center text-center
"
>
<
h1
className
=
"
text-xl max-lg:text-base text-darkGray-HC-white mb-5 justify-center text-center
max-w-4xl mx-auto
"
>
Aqui
você
pode
se
conectar
com
pessoas
interessadas
na
área
da
educação
,
Aqui
você
pode
se
conectar
com
pessoas
interessadas
na
área
da
educação
,
<
br
/>
acessar
e
compartilhar
recursos
Educacionais
Digitais
(
REDs
)
!
acessar
e
compartilhar
recursos
Educacionais
Digitais
(
REDs
)
!
<
/h1
>
<
/h1
>
<
/div
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
src/app/components/needLoginModal.js
+
2
−
2
View file @
cce591c9
...
@@ -19,7 +19,7 @@ export default function NeedLoginModal({ open, setOpen }) {
...
@@ -19,7 +19,7 @@ export default function NeedLoginModal({ open, setOpen }) {
}}
}}
>
>
<
div
>
<
div
>
<
div
className
=
"
flex flex-col rounded-lg bg-white-HC-dark p-3
"
>
<
div
className
=
"
flex flex-col rounded-lg bg-white-HC-dark p-3
outline outline-1 outline-ice-HC-white
"
>
<
div
className
=
"
text-xl text-darkGray-HC-white font-bold
"
>
Entrar
<
/div
>
<
div
className
=
"
text-xl text-darkGray-HC-white font-bold
"
>
Entrar
<
/div
>
<
div
className
=
"
p-3
"
>
<
div
className
=
"
p-3
"
>
<
div
className
=
"
text-base text-darkGray-HC-white
"
>
<
div
className
=
"
text-base text-darkGray-HC-white
"
>
...
@@ -28,7 +28,7 @@ export default function NeedLoginModal({ open, setOpen }) {
...
@@ -28,7 +28,7 @@ export default function NeedLoginModal({ open, setOpen }) {
<
div
className
=
"
flex flex-wrap justify-center gap-1 items-stretch
"
>
<
div
className
=
"
flex flex-wrap justify-center gap-1 items-stretch
"
>
<
Button
<
Button
variant
=
"
contained
"
variant
=
"
contained
"
className
=
"
bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark disabled:bg-red mt-3 text-white-HC-dark-underline hover:text-
turquoise-HC-whit
e shadow-none rounded normal-case text-base font-bold flex-shrink-0 flex-grow outline outline-1 outline-ice-HC-white
"
className
=
"
bg-turquoise-HC-white hover:bg-darkTurquoise-HC-dark disabled:bg-red
-HC-white
mt-3 text-white-HC-dark-underline hover:text-
white-HC-underlin
e shadow-none rounded normal-case text-base font-bold flex-shrink-0 flex-grow outline outline-1 outline-ice-HC-white
"
onClick
=
{
loginBarrier
}
onClick
=
{
loginBarrier
}
>
>
Ir
para
página
de
Login
Ir
para
página
de
Login
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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