Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PortalMEC-React
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
Harbor Registry
Model registry
Operate
Environments
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
PortalMEC
PortalMEC-React
Commits
77a5241c
Commit
77a5241c
authored
5 years ago
by
Lucas Eduardo Schoenfelder
Browse files
Options
Downloads
Patches
Plain Diff
checkbox color fixed
parent
1f8678ec
No related branches found
No related tags found
4 merge requests
!57
Merge of develop into master
,
!56
Fixed buttons reportar, seguir, compartilhar, guardar and entrar (in comments...
,
!18
Branch do lucas
,
!17
Branch do lucas
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/Components/Checkbox.js
+3
-6
3 additions, 6 deletions
src/Components/Checkbox.js
src/Components/ColaborarModal.js
+6
-3
6 additions, 3 deletions
src/Components/ColaborarModal.js
src/Components/Header.js
+2
-1
2 additions, 1 deletion
src/Components/Header.js
with
11 additions
and
10 deletions
src/Components/Checkbox.js
+
3
−
6
View file @
77a5241c
...
...
@@ -25,10 +25,9 @@ const StyledFormControlLabel = styled(FormControlLabel)`
.label {
font-size : 12px !important;
}
`
const
StyledCheckbox
=
styled
(
Checkbox
)
`
color : #00bcd4 !important;
.MuiCheckbox-colorSecondary.Mui-checked {
color : #00bcd4 !important;
}
`
export
default
function
LabeledCheckbox
(
props
)
{
...
...
@@ -37,10 +36,8 @@ export default function LabeledCheckbox(props) {
<
StyledFormControlLabel
control
=
{
<
Checkbox
disabled
=
{
props
.
disabledCheckbox
}
value
=
{
props
.
checked
}
onChange
=
{
props
.
handleChange
}
style
=
{
{
color
:
props
.
disabledCheckbox
?
"
#000
"
:
"
#00bcd4
"
}}
/
>
}
label
=
{
<
span
style
=
{{
fontSize
:
'
12px
'
}}
>
{
props
.
label
}
<
/span>
}
...
...
This diff is collapsed.
Click to expand it.
src/Components/ColaborarModal.js
+
6
−
3
View file @
77a5241c
import
React
,
{
useContext
}
from
'
react
'
;
import
React
,
{
useContext
,
useState
}
from
'
react
'
;
import
Modal
from
'
@material-ui/core/Modal
'
;
import
Fade
from
'
@material-ui/core/Fade
'
;
import
styled
from
'
styled-components
'
...
...
@@ -9,7 +9,7 @@ import CloseIcon from '@material-ui/icons/Close';
import
LabeledCheckbox
from
"
../Components/Checkbox.js
"
const
StyledDivContainer
=
styled
.
div
`
background-color : rgb(255,255,255);
;
background-color : rgb(255,255,255);
border-radius : 4px;
border-shadow : #000;
color : rgb(102,102,102);
...
...
@@ -77,6 +77,8 @@ const Styledspan = styled.span`
export
default
function
ColaborarModal
(
props
)
{
const
{
state
,
dispatch
}
=
useContext
(
Store
)
const
[
checkbox
,
controlCheckbox
]
=
useState
(
false
)
const
handleCheckbox
=
()
=>
controlCheckbox
(
!
checkbox
)
return
(
<
StyledModal
...
...
@@ -94,6 +96,7 @@ export default function ColaborarModal (props) {
>
<
Fade
in
=
{
props
.
open
}
>
<
StyledDivContainer
>
<
span
style
=
{{
width
:
"
32px
"
}}
/
>
<
StyledDivHeader
>
<
StyledH2
>
Você
é
professor
(
a
),
da
educação
básica
,
e
gostaria
de
colaborar
com
a
Plataforma
?
...
...
@@ -126,7 +129,7 @@ export default function ColaborarModal (props) {
<
/StyledButtonsDiv
>
<
/div
>
<
div
style
=
{{
display
:
"
flex
"
,
alignItems
:
"
flex-start
"
}}
>
<
LabeledCheckbox
label
=
{
<
Styledspan
>
Não
perguntar
novamente
<
/Styledspan>} /
>
<
LabeledCheckbox
label
=
{
<
Styledspan
>
Não
perguntar
novamente
<
/Styledspan>}
checked={checkbox} handleChange={handleCheckbox}
/
>
<
/div
>
<
/StyledDivContentInformation
>
<
/StyledDivDialogContent
>
...
...
This diff is collapsed.
Click to expand it.
src/Components/Header.js
+
2
−
1
View file @
77a5241c
...
...
@@ -42,6 +42,7 @@ export default function Header(props){
const
[
signUpOpen
,
setSignUp
]
=
useState
(
false
)
const
[
loginOpen
,
setLogin
]
=
useState
(
false
)
const
[
successfulLoginOpen
,
handleSuccessfulLogin
]
=
useState
(
false
)
const
[
modalColaborar
,
setModalColaborar
]
=
useState
(
true
)
const
toggleSnackbar
=
(
event
,
reason
)
=>
{
if
(
reason
===
'
clickaway
'
)
{
...
...
@@ -80,7 +81,7 @@ export default function Header(props){
}
<
SignUpModal
open
=
{
signUpOpen
}
handleClose
=
{
handleSignUp
}
openLogin
=
{
handleLogin
}
/
>
<
LoginModal
open
=
{
loginOpen
}
handleClose
=
{
handleLogin
}
openSignUp
=
{
handleSignUp
}
openSnackbar
=
{()
=>
{
handleSuccessfulLogin
(
true
)}}
/
>
{
/*
<ColaborarModal open={
state.
modalColaborar
PlataformaOpen
} handleClose={
handleKyloren
} />
*/
}
<
ColaborarModal
open
=
{
modalColaborar
}
handleClose
=
{
()
=>
{
setModalColaborar
(
!
modalColaborar
)}
}
/
>
<
/
>
)
...
...
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