Skip to content

Commit

Permalink
Merge branch 'Javascript'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoaoVitorDomingos committed Nov 9, 2024
2 parents 9bf610b + 34e1001 commit d0ddce7
Show file tree
Hide file tree
Showing 21 changed files with 2,673 additions and 221 deletions.
114 changes: 114 additions & 0 deletions css/impressoes.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
@charset "UTF-8";

@media print {
header, main, footer {
display: none;
}

/* Configurações Gerais */
#container_impressao {
display: block;
}

#container_impressao > h1, #container_impressao > #container_bo_pre_aluno > div > h1 {
text-align: center;
text-decoration: underline;
font-size: 3em;
margin-bottom: 50px;
}

table.tabela_impressao {
width: 90%;
}

table.tabela_impressao > thead > tr > th {
text-align: center;
vertical-align: middle;
background-color: rgb(189, 184, 184);
}

table.tabela_impressao > tbody > tr > td {
text-align: center;
vertical-align: middle;
}

table.tabela_impressao > tbody > tr > td.td_aluno {
text-align: start;
width: 20%;
}

/* Boletim Sala */
.boletim_sala > #presenca_sala, .boletim_sala > #container_bo_pre_aluno, .boletim_sala > #imprimir_tab {
display: none;
}

.boletim_sala > table#boletim_sala td.reprovado {
background-color: rgb(228, 63, 63);
color: white;
font-weight: bold;
}

.boletim_sala > table#boletim_sala td.exame {
background-color: rgb(238, 238, 74);
color: black;
font-weight: bold;
}

.boletim_sala > table#boletim_sala td.abaixo {
background-color: rgb(255, 203, 203);
}

/* Presença Sala */
.presenca_sala > #boletim_sala, .presenca_sala > #container_bo_pre_aluno, .presenca_sala > #imprimir_tab {
display: none;
}

#presenca_sala > .tabela_impressao {
page-break-after: always;
}


/* Boletim e Presença Aluno */
.bo_pre_aluno > #boletim_sala, .bo_pre_aluno > #presenca_sala, .bo_pre_aluno > #imprimir_tab, section.bo_pre_aluno > h1 {
display: none;
}

#container_bo_pre_aluno > .bo_pre_aluno {
page-break-after: always;
width: 90%;
}

#container_bo_pre_aluno > .bo_pre_aluno > .info_pessoais {
justify-content: space-evenly;
}

#container_bo_pre_aluno > .bo_pre_aluno > .info_pessoais > .bo_pre_foto {
border: 1px solid black;
box-shadow: 1px 0px 3px 0px rgba(0, 0, 0, 0.329);
width: 200px;
height: 200px;

/* background-image: url(../imgs/foto-alunos/Masculino/foto-aluno5.jpg); */
background-position: center center;
background-repeat: no-repeat;
background-size: cover;
border-radius: 3px;
}

#container_bo_pre_aluno > .bo_pre_aluno > .info_pessoais > .bo_pre_dados {
font-size: 1.3em;
}

#container_bo_pre_aluno > .bo_pre_aluno > .info_pessoais > .bo_pre_dados > .dado_nome, #container_bo_pre_aluno > .bo_pre_aluno > .info_pessoais > .bo_pre_dados > p > span {
font-weight: bold;
}

#container_bo_pre_aluno > .bo_pre_aluno > .info_escolar > .tab1 {
max-width: 50%;
}

/* Imprimir Tabela */
.imprimir_tab > #boletim_sala, .imprimir_tab > #presenca_sala, .imprimir_tab > #container_bo_pre_aluno {
display: none;
}
}
33 changes: 31 additions & 2 deletions css/modais.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,23 @@
box-shadow: 2px 2px 4px 0px rgba(238, 55, 55, 0.466);
}

.container-tabela-modal {
overflow-y: auto;
padding-bottom: 5px;
max-height: 250px;

opacity: 1;
visibility: visible;
transition: opacity 0.3s ease, visibility 0.3s ease, max-height 0.3s ease;
}

.esconder {
visibility: hidden;
opacity: 0;
max-height: 0;
padding-bottom: 0;
}

/* Modal - Editar Back */
#editar_back form fieldset {
margin-bottom: 30px;
Expand Down Expand Up @@ -99,7 +116,7 @@
border: 2px solid black;
border-radius: 3px;
width: 140px;
height: 158px;
height: 200px;
background-image: url(../imgs/foto-alunos/foto-aluno1.jpg);
background-position: center center;
background-size: cover;
Expand All @@ -117,15 +134,23 @@

#aluno_vejaMais .modal-conteudo .tabelas-aluno table:first-of-type {
text-align: center;
width: 20%;
width: 90%;
margin: 0 auto 20px auto;
}

#aluno_vejaMais .modal-conteudo .tabelas-aluno table:first-of-type > thead th {
vertical-align: middle;
}

#aluno_vejaMais .modal-conteudo .tabelas-aluno table:last-of-type {
width: 90%;
margin: 0 auto;
}

#aluno_vejaMais td.nota_editar:hover {
cursor: pointer;
}

/* Modal - Lançar Notas */
#lancar_notas .modal-conteudo form {
justify-content: center;
Expand All @@ -149,6 +174,10 @@
}

/* Modal - Tabela */
.modal-conteudo table {
margin: 0;
}

.modal-conteudo table thead > tr > th {
background-color: rgb(189, 184, 184);
text-align: center;
Expand Down
46 changes: 31 additions & 15 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
color: var(--azul);
}

.form-desativado {
opacity: 0.5;
}


/* Atividade */
.atividade {
Expand All @@ -58,6 +62,8 @@
color: white;
padding: 20px;
text-align: end;

transition: all 0.5s ease;
}

.atividade span:hover {
Expand All @@ -69,6 +75,7 @@
text-align: center;
font-weight: bold;
margin-top: -30px;
margin-right: 3px;
}

.atividade p:first-of-type {
Expand Down Expand Up @@ -118,6 +125,8 @@ div.grid-view > div.atividade > hr {
height: 60px;
padding: 5px;
margin-bottom: 20px;

transition: height 0.3s ease;
}

.line-view .atividade:hover {
Expand Down Expand Up @@ -151,33 +160,33 @@ div.grid-view > div.atividade > hr {
color: white;
}

div.line-view > div.atividade p, div.line-view > div.atividade hr {
.closed p, .closed hr {
display: none;
}

/* Line View - Opened */
.opened .atividade {
.line-view > .opened {
height: 250px;
}

div.opened > div.atividade p, div.opened > div.atividade hr {
.opened > p, .opened > hr {
display: block;
}

div.opened > div.atividade hr {
.line-view > div.opened > hr {
opacity: 1;
width: 88%;
border: 1px solid white;
margin: 5px auto 20px auto;
}

div.opened > div.atividade p:first-of-type {
.line-view > div.opened > p:first-of-type {
height: 70px;
width: 88%;
margin: 0 auto 30px auto;
}

div.opened > div.atividade p.botao {
.line-view > div.opened > p.botao {
width: 15%;
margin: 0 auto auto;
}
Expand Down Expand Up @@ -246,7 +255,7 @@ menu button {
display: inline;
padding: 5px 15px;
border-radius: 10px;
/* background-color: black; */
background-color: black;
font-weight: bold;
color: white;
}
Expand All @@ -262,11 +271,15 @@ menu button {
color: var(--verde-claro);
}

.container-tabela {
width: 65%;
max-height: 700px;
margin: 70px auto 50px auto;
overflow-y: auto;
}

.tabela {
width: 65%;
margin-top: 70px;
margin-bottom: 50px;
margin: 0;
text-align: center;
}

Expand Down Expand Up @@ -397,19 +410,22 @@ section#atividades section#atividades_topo div.topo_botoes p:first-of-type {
}

/* Container Sessões */
section#atividades div.container-sessões section {
width: 60%;
section#atividades div.container-sessoes section {
margin-bottom: 130px;
}

section#atividades div.container-sessões section div.topo h2 {
section#atividades div.container-sessoes section div.topo h2 {
margin-bottom: -15px;
}

section#atividades div.container-sessões section div.topo div.container-span span {
section#atividades div.container-sessoes section div.topo div.container-span span {
font-size: 2em;
}

section#atividades div.container-sessões section div.topo hr {
section#atividades div.container-sessoes section div.topo hr {
margin-bottom: 20px;
}

#container_impressao {
display: none;
}
Binary file added imgs/backs/aula_back.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Binary file added imgs/foto-alunos/Feminino/foto-aluno6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added imgs/foto-alunos/Feminino/foto-aluno7.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Binary file added imgs/foto-alunos/Masculino/foto-aluno5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added imgs/foto-alunos/Masculino/foto-aluno8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d0ddce7

Please sign in to comment.