Skip to content

Commit ed84f78

Browse files
Ana678Ana678
committed
resulvendo problemas de design
1 parent 7826e33 commit ed84f78

File tree

4 files changed

+71
-8
lines changed

4 files changed

+71
-8
lines changed

‎jds

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
commit 7826e33de6b546c1066c4d088dd2e7afeed145c3 (HEAD -> master)
2+
Merge: 8fe9526 0fc14ed
3+
Author: Ana Carolina <[email protected]>
4+
Date: Fri Feb 26 15:33:08 2021 -0300
5+
6+
Merge https://github.com/Ana678/iroki
7+
8+
commit 8fe9526f51f11eb5f0af611e51c1a2c09d990e58
9+
Author: Ana Carolina <[email protected]>
10+
Date: Fri Feb 26 15:29:45 2021 -0300
11+
12+
resolver problema
13+
14+
commit c3e83589e946f68155e90138a31c6607fdbd383b
15+
Author: Ana Carolina <[email protected]>
16+
Date: Fri Feb 26 15:16:54 2021 -0300
17+
18+
adicionar template
19+
20+
commit 0fc14ed99523f3a4a287eb90b2a673751e9d1a93 (origin/master)
21+
Author: Ana678 <[email protected]>
22+
Date: Wed Feb 17 21:44:36 2021 -0300
23+
24+
Rename procfile to Procfile
25+
26+
commit 3f4a83de867c089040d55c094c6b92b6458cea83
27+
Author: Ana Carolina <[email protected]>
28+
Date: Wed Feb 17 21:35:26 2021 -0300
29+
30+
procfile adicionado
31+
32+
commit a52841c68aa9f4eda988cbe7359f7e0395929dbe
33+
Author: Ana Carolina <[email protected]>
34+
Date: Wed Feb 17 21:32:26 2021 -0300
35+
36+
procfile adicionado
37+
38+
commit 157c715f802d5e6756d69c6b454a2f0a51fd8931
39+
Author: Ana Carolina <[email protected]>
40+
Date: Wed Feb 17 16:39:27 2021 -0300
41+
42+
primeiro commit

‎public/assets/css/untitled.css

+5
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,8 @@ body, html {
6363
margin-left: -15px;
6464
}
6565

66+
@media (max-width: 750px) {
67+
.masthead {
68+
background-image: linear-gradient(180deg,#b7cdc9 10%,#68aea1);
69+
}
70+
}

‎resources/views/index.blade.php

+19-6
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,27 @@
1515
</head>
1616

1717
<body>
18-
<nav class="navbar navbar-light navbar-expand-md fixed-top" id="mainNav" style="background: rgba(0,0,0,0);border-color: rgba(0,0,0,0);margin: 20px;margin-top: 30px;">
19-
<div class="container"><a class="navbar-brand js-scroll-trigger" href="#" style="color: #42424c;font-family: Poppins, sans-serif;"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" class="bi bi-intersect" style="font-size: 35px;">
18+
<nav class="navbar navbar-light navbar-expand-md fixed-top" id="mainNav" style="background: rgba(0,0,0,0);border-color: rgba(0,0,0,0);">
19+
<div class="row d-flex" style="padding-right: 0;padding-left: 0; flex-wrap: wrap; width: 100%;margin-right: auto; margin-left: auto; align-items:center;justify-content: space-between;max-width: 1140px;">
20+
<a class="navbar-brand js-scroll-trigger" href="#" style="color: #42424c;font-family: Poppins, sans-serif;">
21+
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" class="bi bi-intersect" style="font-size: 35px;">
2022
<path fill-rule="evenodd" d="M0 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v2h2a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2v-2H2a2 2 0 0 1-2-2V2zm5 10v2a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-2v5a2 2 0 0 1-2 2H5zm6-8H6a2 2 0 0 0-2 2v5H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h8a1 1 0 0 1 1 1v2z"></path>
21-
</svg>&nbsp;iroki</a><a class="navbar-brand js-scroll-trigger" href="#" style="color: rgb(35,39,41);font-size: 23px;"></a><button data-toggle="collapse" class="navbar-toggler navbar-toggler-right" data-target="#navbarResponsive" type="button" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation" value="Menu" style="border-color: rgb(66,66,76);padding: 4px 8px;"><i class="fa fa-bars" style="color: rgb(66,66,76);"></i></button>
23+
</svg>&nbsp;iroki
24+
</a>
25+
<a class="navbar-brand js-scroll-trigger" href="#" style="color: rgb(35,39,41);font-size: 23px;"></a>
26+
<button data-toggle="collapse" class="navbar-toggler navbar-toggler-right" data-target="#navbarResponsive" type="button" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation" value="Menu" style="border-color: rgb(66,66,76);padding: 4px 8px;">
27+
<i class="fa fa-bars" style="color: rgb(66,66,76);"></i>
28+
</button>
29+
2230
<div class="collapse navbar-collapse" id="navbarResponsive">
2331
<ul class="navbar-nav ml-auto">
24-
<li class="nav-item nav-link js-scroll-trigger"><a class="nav-link js-scroll-trigger" href="cadastro" style="color: #42424c;font-size: 19px;font-family: Poppins, sans-serif;">cadastro</a></li>
25-
<li class="nav-item nav-link js-scroll-trigger" style="border-left-color: #42424c;"><a class="nav-link js-scroll-trigger" href="login" style="color: #42424c;border-radius: 0;font-family: Poppins, sans-serif;border-style: none;border-top-style: none;border-top-color: rgb(52,58,64);border-right-style: solid;border-right-color: #42424c;border-bottom-style: solid;border-bottom-color: #42424c;border-left-style: none;border-left-color: #42424c;"><strong>log in</strong></a></li>
32+
<li class="nav-item nav-link js-scroll-trigger">
33+
<a class="nav-link js-scroll-trigger" href="cadastro" style="color: #42424c;font-size: 19px;font-family: Poppins, sans-serif;">cadastro</a>
34+
</li>
35+
<li class="nav-item nav-link js-scroll-trigger" style="border-left-color: #42424c;">
36+
<a class="nav-link js-scroll-trigger" href="login" style="color: #42424c;border-radius: 0;font-family: Poppins, sans-serif;border-style: none;border-top-style: none;border-top-color: rgb(52,58,64);border-right-style: solid;border-right-color: #42424c;border-bottom-style: solid;border-bottom-color: #42424c;border-left-style: none;border-left-color: #42424c;"><strong>log in</strong>
37+
</a>
38+
</li>
2639
</ul>
2740
</div>
2841
</div>
@@ -32,7 +45,7 @@
3245
<div class="row">
3346
<div class="col"></div>
3447
<div class="col-lg-6 offset-lg-5 mx-auto">
35-
<p class="text-right intro-text" style="color: #42424c;font-size: 30px;font-family: Poppins, sans-serif;font-weight: 700;line-height: 1.4;"><strong>Decida entre o que você precisa e o que pode comprar.</strong></p>
48+
<p class="text-right intro-text" style="color: #42424c;font-size: 30px;font-family: Poppins, sans-serif;font-weight: 700;line-height: 1.4;"><strong>Decida entre o que você quer e o que pode comprar.</strong></p>
3649
<p class="text-right intro-text" style="font-family: Poppins, sans-serif;font-size: 20px;color: #42424c;">A solução perfeita para você que deseja organizar sua lista de compras para o final do mês.</p><a class="btn btn-link float-right btn-circle" role="button" href="login.html" style="color: #42424c;padding-top: 3px;padding-bottom: 3px;margin-right: 20%;border-top-color: rgb(52,58,64);border-right-color: rgb(52,58,64);border-bottom-color: rgb(52,58,64);border-left-color: #42424c;font-family: Poppins, sans-serif;" align="right"><i class="fa fa-angle-double-right animated" style="color: #42424c;"></i></a>
3750
</div>
3851
</div>

‎resources/views/recepcao.blade.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,14 @@
124124
<div class="form-group"><label for="city"><strong>Título</strong><br></label><input class="form-control" type="text" id="city-1" placeholder="Los Angeles" name="city" style="width: 100%;"></div>
125125
</form>
126126
</div>
127-
<div class="modal-footer justify-content-center"><button class="btn btn-warning" data-dismiss="modal" style="border-color: #e75c25;background: #e75c25;" type="button">Voltar</button><button class="btn btn-warning" data-dismiss="modal" style="background: #e75c25;border-color: #e75c25;" type="button">Salvar</button></div>
127+
<div class="modal-footer justify-content-center">
128+
<button class="btn btn-warning" data-dismiss="modal" style="border-color: #e75c25;background: #e75c25;" type="button">Voltar</button>
129+
<button class="btn btn-warning" data-dismiss="modal" style="background: #e75c25;border-color: #e75c25;" type="button">Salvar</button>
130+
</div>
128131
</div>
129132
</div>
130133
</div>
131-
<a class="btn btn-primary btn-sm d-none float-right d-sm-inline-block" role="button" style="color: rgb(57,42,42);border-radius: 100%;margin-top: -5px;width: 31px;background: #e75c25;border-color: #e75c25;" data-toggle="modal" data-target="#exampleModal-1"><i class="icon ion-android-add fa-sm" style="color: rgb(255,255,255);"></i></a>
134+
<a class="btn btn-primary btn-sm float-right d-sm-inline-block" role="button" style="color: rgb(57,42,42);border-radius: 100%;margin-top: -5px;width: 31px;background: #e75c25;border-color: #e75c25;" data-toggle="modal" data-target="#exampleModal-1"><i class="icon ion-android-add fa-sm" style="color: rgb(255,255,255);"></i></a>
132135
</div>
133136
<h6 class="text-primary font-weight-bold m-0" style="color: #e75c25! important;">Lista de Afazeres</h6>
134137
</div>

0 commit comments

Comments
 (0)