Skip to content

Commit 49601f7

Browse files
zorteaadrianozorteaadriano
committed
fix: finalizando ajustes do menu, footer, listagem e margens dos textos
1 parent 3cc58f4 commit 49601f7

File tree

8 files changed

+46
-58
lines changed

8 files changed

+46
-58
lines changed

‎public/css/theme.css

+20-22
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ h1 b {
3939
/*--------------------------------------------------------------
4040
# Sections
4141
--------------------------------------------------------------*/
42-
section {
43-
padding: 60px 0;
44-
overflow: hidden;
45-
}
42+
4643

4744
.section-header {
4845
text-align: center;
@@ -191,12 +188,13 @@ section {
191188
.header {
192189
transition: all 0.5s;
193190
z-index: 997;
194-
padding: 20px 0;
191+
width: 100%;
192+
padding-top:0px;
195193
}
196194

197195
.header.header-scrolled {
198196
background: #fff;
199-
padding: 15px 0;
197+
padding: 10px 0;
200198
box-shadow: 0px 2px 20px rgba(1, 41, 112, 0.1);
201199
}
202200

@@ -459,7 +457,7 @@ section {
459457
}
460458

461459
section.hero-slim {
462-
height: 50vh;
460+
height: 400px;
463461
padding-bottom: 10px;
464462
}
465463

@@ -546,20 +544,6 @@ section.hero-slim {
546544
}
547545
}
548546

549-
@media (max-width: 991px) {
550-
.hero {
551-
height: auto;
552-
padding: 120px 0 60px 0;
553-
}
554-
.hero .hero-img {
555-
text-align: center;
556-
margin-top: 80px;
557-
}
558-
.hero .hero-img img {
559-
width: 80%;
560-
}
561-
}
562-
563547
@media (max-width: 768px) {
564548
.hero {
565549
text-align: center;
@@ -571,7 +555,8 @@ section.hero-slim {
571555
font-size: 24px;
572556
}
573557
.hero .hero-img img {
574-
width: 100%;
558+
width: 50vw;
559+
margin-bottom: 20px;
575560
}
576561
}
577562

@@ -1984,6 +1969,10 @@ section.hero-slim {
19841969
.footer .footer-top {
19851970
background-position: center bottom;
19861971
}
1972+
1973+
.section .hero-slim {
1974+
height:600px;
1975+
}
19871976
}
19881977

19891978
.footer .footer-top .footer-info {
@@ -2146,3 +2135,12 @@ section.hero-slim {
21462135
row-gap: 0;
21472136
grid-auto-flow: row;
21482137
}
2138+
2139+
.custom-text-wrap-table{
2140+
min-width:400px;
2141+
max-height: 200px;
2142+
}
2143+
2144+
.custom-container{
2145+
margin-top: 150px;
2146+
}

‎resources/js/practice-form.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,8 @@ var PracticeForms = {
199199

200200
var str = '<div class="font-bold text-center mt-10">' + questionId + (result.questions[questionId] == undefined ? ' <p class="badge badge-pill badge-error p-2 pt-1 pb-1 border border-warning">Desativada</p>' : '') + '</div>';
201201

202-
$(selector).append(str + '<div id="' + id + '" class="mb-4"></div>');
202+
$(selector).append(str + '<div id="' + id + '" class="mb-4">' + this.renderNoRepliesYet() + '</div>');
203+
203204

204205
var chart = new ApexCharts(document.querySelector('#' + id), options);
205206
chart.render();

‎resources/views/home.blade.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@extends('layouts.base')
22
@section('content')
33

4-
<section id="hero" class="hero hero-slim d-flex align-items-center">
4+
<section id="hero" class="hero hero-slim d-flex align-items-center overflow-visible mt-20">
55
<div class="container">
6-
<div class="row">
7-
<div class="col-5 hero-img" data-aos="zoom-out" data-aos-delay="200">
8-
<img src="{{ asset('img/undraw.co/my_answer.svg') }}" class="w-96 h-auto mx-auto" alt="">
6+
<div class="row d-md-flex d-block">
7+
<div class="col-md-5 col-sm-8 ml-auto mr-auto hero-img" data-aos="zoom-out" data-aos-delay="200">
8+
<img src="{{ asset('img/undraw.co/my_answer.svg') }}" class="sm:w-50 w-96 h-auto mx-auto" alt="">
99
</div>
10-
<div class="col-7 d-flex flex-column justify-content-center">
10+
<div class="col-7 d-flex flex-column justify-content-center ml-auto mr-auto">
1111
<h1 data-aos="fade-up">Olá, tudo certo?</h1>
1212
<h2 data-aos="fade-up" data-aos-delay="400">Vamos criar algo incrível hoje 🚀</h2>
1313

@@ -24,7 +24,7 @@
2424
</div>
2525
</section>
2626

27-
<div class="container">
27+
<div class="container mt-20">
2828
@if (count($forms) > 0)
2929
<header class="section-header">
3030
<h2>Suas criações</h2>
@@ -48,7 +48,7 @@
4848
<td>
4949
<a href="{{ route('form.edit', [$form->id]) }}" class="btn btn-light-custom">Ver</a>
5050
</td>
51-
<td class="text-wrap">
51+
<td class="text-wrap custom-text-wrap-table">
5252
{{ $form->title ?? 'Questionário '.$form->id }}
5353
</td>
5454
<td>

‎resources/views/index.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</div>
5050
</section>
5151

52-
<section class="text-gray-600 body-font">
52+
<section class="text-gray-600 body-font md:mt-20 mt-10">
5353
<div class="container mx-auto flex px-2 pb-5 md:flex-row flex-col items-center">
5454
<div class="lg:flex-grow lg:pl-24 md:pl-16 flex flex-col md:items-start self-center items-center text-center" data-aos="zoom-out" data-aos-delay="200">
5555
<h1 data-aos="fade-up" class="m-auto title-font sm:text-4xl text-3xl mb-4 font-light text-gray-900">

‎resources/views/layouts/base.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@include('layouts.header')
4444
@yield('wideTopContent')
4545

46-
<div class="pt-16 container-lg">
46+
<div class="container pt-20">
4747
@yield('content')
4848
</div>
4949

‎resources/views/layouts/footer.blade.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- ======= Footer ======= -->
2-
<footer id="footer" class="footer mt-12">
3-
<div class="footer-top bg-gray-200">
2+
<footer id="footer" class="footer mt-12 d-block">
3+
<div class="footer-top bg-gray-200 w-100 float-left">
44
<div class="container">
55
<div class="row gy-4">
66
<div class="col-lg-5 col-md-12 footer-contact text-center text-md-start">
@@ -63,7 +63,7 @@
6363
</div>
6464
</div>
6565
</div>
66-
<div class="bg-gray-100">
66+
<div class="bg-gray-100 w-100 float-left">
6767
<div class="container py-6 mx-auto flex items-center sm:flex-row flex-col">
6868
<p class="text-sm text-gray-400">
6969
Feito com ❤️ pela

‎resources/views/layouts/header.blade.php

+10-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<header id="header" class="header fixed-top">
2-
<div class="container-lg d-flex align-items-center justify-content-between">
2+
<div class="container ml-0 mr-0 md:mr-auto md:ml-auto d-flex justify-content-between">
33
<a href="{{ route('index') }}" class="logo d-flex align-items-center">
44
<img src="{{ asset('img/forms-icon.png') }}" alt="">
55
<span>Forms</span>
@@ -33,8 +33,8 @@
3333
@endadmin
3434

3535

36-
<li class="ml-8 mr-2 text-right d-flex">
37-
<div class="d-none d-sm-block">
36+
<li class="ml-8 mr-2 text-right d-flex align-items-center">
37+
<div class="d-none d-md-block h-full">
3838
<p class="font-semibold">{{ auth()->user()->first_name }}</p>
3939
<p class="text-xs font-extralight -mt-1 text-gray-400">{{ auth()->user()->username }}</p>
4040
</div>
@@ -62,30 +62,17 @@
6262
</ul>
6363
</nav>
6464

65-
<nav class="lg:invisible absolute left-2 w-full bg-white pb-4">
66-
<div class="float-left mt-10 w-100">
67-
<div class="ml-10 mt-10 float-left">
68-
<a href="{{ route('index') }}" class="logo d-sm-flex align-items-center">
69-
<img src="{{ asset('img/forms-icon.png') }}" alt="" class="mb-2">
65+
<nav class="lg:invisible absolute w-full bg-white pb-4 pt-4">
66+
<div class="d-flex justify-content-between">
67+
<div class="float-left">
68+
<a href="{{ route('index') }}" class="logo d-flex align-items-center">
69+
<img src="{{ asset('img/forms-icon.png') }}" alt="">
7070
<span>Forms</span>
7171
</a>
7272
</div>
73-
@auth
74-
<div class="float-right mt-10 mr-10 d-flex">
75-
<div class="text-right d-none d-sm-block">
76-
<p class="font-semibold">{{ auth()->user()->first_name }}</p>
77-
<p class="font-extralight text-gray-400">{{ auth()->user()->username }}</p>
78-
</div>
79-
<div class="avatar m-auto d-none d-md-block d-lg-none">
80-
<div class="rounded-full w-10 h-10 m-1">
81-
<img src="https://cc.uffs.edu.br/avatar/iduffs/{{ auth()->user()->uid }}" />
82-
</div>
83-
</div>
84-
</div>
85-
@endauth
86-
<li class="dropdown mr-5 mt-10 float-right">
73+
<li class="dropdown mr-5">
8774
<div style="background-color: #264653" tabindex="0" class="btn btn-primary"><i class="bi bi-chevron-down"></i></div>
88-
<ul class="shadow menu dropdown-content bg-base-100 rounded-box w-52 float-right right-0">
75+
<ul class="shadow menu dropdown-content bg-base-100 rounded-box w-52 float-right right-0 mt-2">
8976

9077
@auth
9178
@if (@$layout_header_simplified == false)

‎resources/views/livewire/form/edit.blade.php

+2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@
9696
</div>
9797

9898
<div x-show="tab === 'replies'" class="row p-2 pt-4" id="replies">
99+
@if(count($form->replies))
99100
<div class="w-100"><a href="{{ route('form.report', [$form->id ,$form->hash]) }}" class="btn btn-light-custom float-right">Baixar respostas</a></div>
101+
@endif
100102
<div class="row">
101103
<div class="col-12 no-replies-yet"></div>
102104
</div>

0 commit comments

Comments
 (0)