Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nova data dashboard #89

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Nova data dashboard #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
80ada37
primeiro commit
MariaSilvania Jul 13, 2018
f56f3c9
primeiro grafico
MariaSilvania Jul 13, 2018
90fcf05
modelo de menu
MariaSilvania Jul 13, 2018
804a395
Dados das Alunas
MariaSilvania Jul 15, 2018
93be3a9
Alterações nos dados das alunas
MariaSilvania Jul 15, 2018
b51af6a
Adicionando header no html
Jul 16, 2018
db57deb
adicionando graficos
MariaSilvania Jul 16, 2018
00a3f86
Atualizações do CSS
Jul 17, 2018
e9eba46
Pagina das Estudantes
MariaSilvania Jul 17, 2018
d95f01e
Alterações
MariaSilvania Jul 17, 2018
5fe9873
Merge branch 'nova-data-dashboard' of https://github.com/MariaSilvani…
MariaSilvania Jul 17, 2018
8d835b9
Menu funcionando
MariaSilvania Jul 17, 2018
092c9ef
Junção das paginas index e estudantes
MariaSilvania Jul 18, 2018
af76b06
Ajustes nos dados Jedi e profossores
MariaSilvania Jul 18, 2018
05cf801
alteração no css
MariaSilvania Jul 18, 2018
8d6e185
Alteração de p para div
MariaSilvania Jul 18, 2018
d1672ac
Finalizado
MariaSilvania Jul 18, 2018
fda7cba
Alterações 2.0 css e pequenas modificações HTML
carolero Jul 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions css/bootstrap.min.css
View file
Open in desktop

Large diffs are not rendered by default.

169 changes: 166 additions & 3 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,166 @@
/*
* Estilos de tu proyecto
*/
* {
font-family: 'Oxygen', sans-serif;
}

body{
background-color:#f7f7f7;
margin: 0px;
}
main{
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: space-around;
}

.linha{
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: space-around;
}
.grafico{
width: 420px;
height: 400px;
margin: 5px;
color: blue;
}

text {
color: #56F89A;
}

#estudante{
display: none;
margin-right: 30px;
margin-left: 30px;
}

.menu-profile {
font-size: 15px;
position: relative;
left: 70px;
}

button {
outline: none;
}

#estudante h1{
color: #ffcc00;
}
#foto-Estudantes{
display: flex;
flex-direction: column;
flex-wrap: wrap;
justify-content: center;
align-items: center;
text-align: center;
}
h1{
text-align: center;
font-size: 30px;
color: #000;
}
h2{
background-color: #fff;
padding: 20px;
}
img{
width: 200px;
height: 200px;
margin: 20px 30px;

}
ul {
list-style-type: none;
margin: 0;
padding: 0;
overflow: hidden;
background-color: #000;
}


li a, .dropbtn {
display: inline-block;
color: #fff;
text-align: center;
font-size: 13px;
padding: 14px 16px;
text-decoration: none;
}

li a:hover, .dropdown:hover .dropbtn {
background-color: #ffcc00;
}

li.dropdown {
display: inline-block;
}

.dropdown-content {
display: none;
position: absolute;
background-color: #ffcc00;
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
}

.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
text-align: left;
}

.dropdown-content a:hover {
background-color: #56F89A;
}

.dropdown:hover .dropdown-content {
display: block;
}

#header {
background-color: #000;
display: flex;
align-items: center;
justify-content: space-around;
}


#header p {
color: #fff;
float: left;
margin-left: 10px;
}
#header i {
color: #ffcc00;
float: left;
}
#header h1{
color: #ffcc00;
}

#MostrarEstudantes{
background-color: #ffcc00;
color: #000;
width: 90px;
height: 30px;
border: none;
position: relative;
right: 80px;
}

#MostrarEstudantes:hover{
background-color: #56F89A;
}


.fa-user-circle {
font-size: 35px;
position: relative;
top: 10px;
}
67 changes: 65 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,75 @@
<head>
<meta charset="utf-8">
<title>Data Dashboard</title>
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.0/css/all.css" integrity="sha384-lKuwvrZot6UHsBSfcMvOkWwlCMgc0TaWr+30HWe3a4ltaBwTZhyTEggF5tJv8tbt" crossorigin="anonymous">
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<link href="https://fonts.googleapis.com/css?family=Oxygen" rel="stylesheet">
</head>
<body>
<header id="header">
<button type="button" id="MostrarEstudantes">Estudantes</a></button>
<!-- <a href="#"><i class="fas fa-bars"></i></a> -->
<h1>< Laboratoria ></h1>
<!-- <p>Vanessa Pinheiro</p>
<p>Manager BR</p> -->
<!-- <a href="#"><i class="fas fa-sign-out-alt"></i></a> -->
<div class="menu-profile">
<i class="fas fa-user-circle"></i>
<p>Vanessa Pinheiro</p>
</div>
</header>
<nav>
<ul class="menu clearfix">
<li class="dropdown">
<a class="dropbtn sede">AQP</a>
<div class="dropdown-content">
<a href="#" class="turma">2016-2</a>
<a href="#" class="turma">2017-1</a>
</div>
</li>
<li class="dropdown">
<a class="dropbtn sede">CDMX</a>
<div class="dropdown-content">
<a href="#" class="turma">2017-1</a>
<a href="#" class="turma">2017-2</a>
</div>
</li>
<li class="dropdown">
<a class="dropbtn sede">LIM</a>
<div class="dropdown-content">
<a href="#" class="turma">2016-2</a>
<a href="#" class="turma">2017-1</a>
<a href="#" class="turma">2017-2</a>
</div>
</li>
<li class="dropdown">
<a class="dropbtn sede">SCL</a>
<div class="dropdown-content">
<a href="#" class="turma">2016-2</a>
<a href="#" class="turma">2017-1</a>
<a href="#" class="turma">2017-2</a>
</div>
</li>
</ul>
</nav>
<section id="titulo">
</section>
<main id="geral">
<section class="linha">
<div id="piechart" class="grafico"></div>
<div id="satisfacao" class="grafico"></div>
<div id="dados"></div>
</section>
<section class="linha">

<!-- Base de datos -->
</section>
</main>
<section id="estudante">
<div id="foto-Estudantes"></div>
</section>
<script src="js/jquery-3.3.1.min.js"></script>
<script src="./js/data.js"></script>
<!-- Aquí va tus archivos JS -->
<script src="./js/app.js"></script>
</body>
</html>
Loading