Skip to content

Commit ad9dbfe

Browse files
damoraisdamorais
authored
Merge branch 'master' into correcao-pagina-04
2 parents 7645e51 + 8ab4f9c commit ad9dbfe

16 files changed

Lines changed: 1312 additions & 8 deletions

‎.vscode/settings.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{
2+
}

‎css/estilo_layout.css‎

Lines changed: 126 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ header {
3737
display: block;
3838
}
3939

40+
#conteudo {
41+
height: 1000px;
42+
}
43+
4044
#entre-em-contato {
4145
margin-top: 20px;
4246
background-color: rgb(238, 238, 238);
@@ -56,8 +60,24 @@ footer {
5660
height: 150px;
5761
}
5862

59-
.aumenta-margem h2 {
6063

64+
.imagem-principal{
65+
66+
margin-top: 30px;
67+
margin-bottom: 30px;
68+
}
69+
70+
.texto-principal p{
71+
font-family: verdana;
72+
text-align: justify;
73+
}
74+
75+
.texto-principal{
76+
margin-bottom: 30px;
77+
}
78+
79+
80+
.aumenta-margem h2 {
6181
margin-top: 20px;
6282
margin-bottom: 20px;
6383
}
@@ -71,28 +91,97 @@ footer {
7191
border-bottom: 1px solid black;
7292
}
7393

94+
main h2 {
95+
font-size: 1.1rem;
96+
font-weight: bold;
97+
}
7498

75-
.borda-bottom h2 {
99+
main p {
100+
font-size: .9rem;
101+
}
76102

77-
border-bottom: 1px solid black;
103+
.aumenta-margem-top {
104+
margin-top: 20px;
78105
}
79106

80-
main h2 {
81-
font-size: 1.1rem;
82-
font-weight: bold;
107+
.aumenta-margem-bottom {
108+
margin-bottom: 20px;
109+
}
110+
111+
#botao-ver-noticia a {
112+
background-color: rgb(62, 62, 62);
83113
}
84114

85115

116+
@media (max-width:1209px) and (min-width:576px) {
117+
118+
.altera-font-size p {
119+
font-size: .7rem;
120+
}
121+
122+
.altera-font-size h2 {
123+
font-size: .8rem;
124+
}
125+
126+
.altera-font-size a {
127+
font-size: .7rem;
128+
}
129+
130+
.aumenta-margem-left-right {
131+
margin-left: -7px;
132+
margin-right: -7px;
133+
}
134+
135+
.aumenta-margem-left {
136+
margin-left: -14px;
137+
138+
}
139+
140+
.aumenta-margem-right {
141+
margin-right: -14px;
142+
}
143+
}
144+
145+
146+
@media (max-width:575px) {
147+
148+
.altera-font-size p {
149+
font-size: .7rem;
150+
}
151+
152+
.altera-font-size h2 {
153+
font-size: .8rem;
154+
}
155+
156+
.altera-font-size a {
157+
font-size: .7rem;
158+
}
159+
160+
.aumenta-margem-left-right {
161+
margin-left: -7px;
162+
margin-right: -7px;
163+
}
164+
165+
.aumenta-margem-left {
166+
margin-left: -14px;
167+
168+
}
169+
170+
.aumenta-margem-right {
171+
margin-right: -14px;
172+
}
173+
174+
}
86175
main h3 {
87176
font-size: .9rem;
88-
89177
}
90178

91179
.formatacao-titulo h3 {
92180
font-size: 1rem;
93181
}
94182

95-
.botao-publicacao {
183+
#botao-publicacao, .botao-publicacao, .botao-publicacao:hover{
184+
96185
background-color: rgb(62, 62, 62);
97186
}
98187

@@ -102,6 +191,22 @@ main h3 {
102191
}
103192

104193

194+
.preenchimento li{
195+
background-color: #eee;
196+
}
197+
198+
.preenchimento a{
199+
color: black;
200+
}
201+
202+
.preenchimento a:hover {
203+
text-decoration: none;
204+
}
205+
206+
.negrito{
207+
font-weight: bold;
208+
}
209+
105210
.formatacao-link a h3 {
106211
color: black;
107212
font-weight: bold;
@@ -144,4 +249,17 @@ main h3 {
144249

145250
.formatacao-link a:hover{
146251
text-decoration: none;
252+
}
253+
.texto-imagem {
254+
text-align: center;
255+
}
256+
257+
.img-recursiva {
258+
width:100%;
259+
height: auto;
260+
}
261+
262+
.img-contato {
263+
width: 90px;
264+
height: 90px;
147265
}

‎images/github-icon.png‎

9.75 KB
Loading

‎images/icone-centro.png‎

14.6 KB
Loading

‎images/icone2.png‎

1.43 KB
Loading

‎images/icone3.png‎

162 Bytes
Loading

‎images/icone4.png‎

162 Bytes
Loading

‎images/imagemNoticia.png‎

3.53 KB
Loading

‎pages/artigos-detalhe.html‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<!doctype html>
2+
<html lang="pt-br">
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7+
<link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
8+
<link rel="stylesheet" href="../css/estilo_layout.css">
9+
<title>Artigo 01</title>
10+
</head>
11+
12+
<body>
13+
<header>
14+
<div class="container">
15+
<nav class="navbar navbar-expand-md navbar-light bg-light">
16+
<a class="navbar-brand " href="#">
17+
>IFSP
18+
<span>CODELAB</span>
19+
</a>
20+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown"
21+
aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Alterna navegação">
22+
<span class="navbar-toggler-icon"></span>
23+
</button>
24+
<div class="collapse navbar-collapse" id="navbarNavDropdown">
25+
<ul class="navbar-nav ml-auto ">
26+
<li class="nav-item dropdown">
27+
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button"
28+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
29+
O laboratório
30+
</a>
31+
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
32+
<a class="dropdown-item" href="#">Missão, Visão e Valores</a>
33+
<a class="dropdown-item" href="#">Publicações</a>
34+
<a class="dropdown-item" href="#">Equipe</a>
35+
</div>
36+
</li>
37+
<li class="nav-item">
38+
<a class="nav-link" href="#">Projetos</a>
39+
</li>
40+
<li class="nav-item">
41+
<a class="nav-link" href="#">Parcerias</a>
42+
</li>
43+
<li class="nav-item">
44+
<a class="nav-link" href="#">Notícias</a>
45+
</li>
46+
<li class="nav-item">
47+
<a class="nav-link" href="#">Artigos</a>
48+
</li>
49+
<li class="nav-item">
50+
<a class="nav-link" href="#">Contatos</a>
51+
</li>
52+
</ul>
53+
<!--fim lista -->
54+
</div>
55+
<!--Fim de dropdown-->
56+
</nav>
57+
</div>
58+
<!--Fim de container -->
59+
</header>
60+
<article>
61+
<!--Sub-titulo-->
62+
<div class="titulo-pagina">
63+
<div class="container">
64+
<div class="row">
65+
<div class="col-md-12 p-4">
66+
<h1>Artigo 01</h1>
67+
</div>
68+
</div>
69+
</div>
70+
</div>
71+
<!--Fim do Sub-titulo-->
72+
<!--Conteudo-->
73+
<div class="container-fluid">
74+
<div class="row">
75+
<div class="col p-3">
76+
<img src="../images/icone-centro.png" class="rounded mx-auto d-block img-recursiva">
77+
</div>
78+
</div>
79+
<div class="container">
80+
<div class="row">
81+
<div class="col">
82+
<time class="data" datetime="2017-02-14"></time>
83+
<p class="negrito">12/01/2019</p>
84+
</div>
85+
</div>
86+
<div class="row">
87+
<div class="col preenchimento">
88+
<p>Lorem ipsum dolor, sit amet consectetur adipisicing elit.
89+
Deserunt repellat eveniet tentur, in dicta omnis nemo modi vel
90+
illum libero iusto quos deleniti sunt eligendi, animi velit maxime est.</p>
91+
</div>
92+
</div>
93+
</div>
94+
</div>
95+
</div>
96+
</article>
97+
<aside id="entre-em-contato">
98+
<div class="container">
99+
<div class="row p-4">
100+
<div class="col-sm">
101+
<p>
102+
<b>Faça parte da equipe do IFSP CodeLab</b>
103+
</p>
104+
</div>
105+
<div class="col-sm ">
106+
<button id="botao-entre-em-contato" type="button" class="btn btn-primary float-right">Entre em
107+
contato</button>
108+
</div>
109+
</div>
110+
</div>
111+
</aside>
112+
<footer>
113+
<div class="container">
114+
<div class="row">
115+
</div>
116+
</div>
117+
</footer>
118+
<script src="../bootstrap/js/jquery-3.3.1.slim.min.js"></script>
119+
<script src="../bootstrap/js/popper.min.js"></script>
120+
<script src="../bootstrap/js/bootstrap.min.js"></script>
121+
</body>
122+
123+
</html>

0 commit comments

Comments
 (0)