Browse Source

Merge branch 'master' of https://github.com/jrtechs/github-graphs

pull/11/head
Jeffery Russell 5 years ago
parent
commit
133532bae4
7 changed files with 121 additions and 17 deletions
  1. +42
    -0
      public/404.html
  2. +15
    -6
      public/about.css
  3. +42
    -2
      public/about.html
  4. BIN
      public/favicon.ico
  5. +8
    -3
      public/index.html
  6. +4
    -3
      public/logo.svg
  7. +10
    -3
      public/style.css

+ 42
- 0
public/404.html View File

@ -0,0 +1,42 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="./style.css" />
</head>
<body>
<div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
<div id="header-title">
<a href="./index.html">
<img id="logo" class="text-center" src="./logo.svg" />
</a>
</div>
<ul id="navigation" class="nav justify-content-end">
<li class="nav-item">
<a href="./GraphTest.html">
Generate graphs
</a>
</li>
<div class="nav-sep"></div>
<li class="nav-item">
<a href="https://github.com/jrtechs/github-graphs">
View on GitHub
</a>
</li>
<div class="nav-sep"></div>
<li class="nav-item">
<a href="./about.html">
About
</a>
</li>
</ul>
</div>
<div class="main">
<div id="content" class="container">
</div>
</div>
</body>
</html>

+ 15
- 6
public/about.css View File

@ -9,17 +9,26 @@
top: 20%; top: 20%;
height: 80px; height: 80px;
background-color: rgb(208, 208, 208); background-color: rgb(208, 208, 208);
border-radius: 20px 20px 0px 0px;
border-radius: 20px 20px 0px 0px
} }
#content-body { #content-body {
position: relative; position: relative;
background-color: rgb(242, 242, 242); background-color: rgb(242, 242, 242);
border-radius: 0px 0px 20px 20px; border-radius: 0px 0px 20px 20px;
} }
.plink {
.card-deck {
position: relative;
padding-top: 20px;
}
.rounder {
border-radius: 20px !important;
} }
body {
background-color: #232323;
.avatar {
border-radius: 10px 10px 10px 10px !important;
top: 10px;
position: relative;
width: 70%;
}
.plink {
color: rgb(250, 152, 33);
} }

+ 42
- 2
public/about.html View File

@ -3,6 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="./style.css" /> <link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" href="./about.css" /> <link rel="stylesheet" href="./about.css" />
@ -11,12 +13,12 @@
<div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center"> <div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
<div id="header-title"> <div id="header-title">
<a href="./index.html"> <a href="./index.html">
<img id="logo" src="./logo.svg" />
<img id="logo" class="text-center" src="./logo.svg" />
</a> </a>
</div> </div>
<ul id="navigation" class="nav justify-content-end"> <ul id="navigation" class="nav justify-content-end">
<li class="nav-item"> <li class="nav-item">
<a href="./generate">
<a href="./GraphTest.html">
Generate graphs Generate graphs
</a> </a>
</li> </li>
@ -52,6 +54,44 @@
This project was made for participation in <a class="plink" href="https://brickhack.io/">BrickHack V</a>. This project was made for participation in <a class="plink" href="https://brickhack.io/">BrickHack V</a>.
</p> </p>
</div> </div>
<div id="content-title" style="border-radius: 20px;">
<h1 class="big-title text-center">Developers</h1>
</div>
<div class="card-deck">
<div class="card rounder">
<img class="avatar mx-auto d-block" src="https://avatars0.githubusercontent.com/u/13894625?s=400&v=4" />
<div class="card-header text-center m-title">
Jeff
</div>
<div class="card-body">
<p>
did stuff
</p>
</div>
</div>
<div class="card rounder">
<img class="avatar mx-auto d-block" src="https://avatars0.githubusercontent.com/u/32306409?s=400&v=4" />
<div class="card-header text-center m-title">
Bryce
</div>
<div class="card-body">
<p>
also did stuff
</p>
</div>
</div>
<div class="card rounder">
<img class="avatar mx-auto d-block" src="https://avatars3.githubusercontent.com/u/32624140?s=400&v=4" />
<div class="card-header text-center m-title">
Alex
</div>
<div class="card-body">
<p>
kinda did stuff
</p>
</div>
</div>
</div>
</div> </div>
</div> </div>
</body> </body>

BIN
public/favicon.ico View File

Before After

+ 8
- 3
public/index.html View File

@ -1,8 +1,10 @@
<!doctype html>
<!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
<link rel="stylesheet" href="./style.css" /> <link rel="stylesheet" href="./style.css" />
</head> </head>
@ -10,12 +12,12 @@
<div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center"> <div id="header-bar" class="d-flex flex-column flex-md-row shadow-sm align-items-center">
<div id="header-title"> <div id="header-title">
<a href="./index.html"> <a href="./index.html">
<img id="logo" src="./logo.svg" />
<img id="logo" class="text-center" src="./logo.svg" />
</a> </a>
</div> </div>
<ul id="navigation" class="nav justify-content-end"> <ul id="navigation" class="nav justify-content-end">
<li class="nav-item"> <li class="nav-item">
<a href="./generate">
<a href="./GraphTest.html">
Generate graphs Generate graphs
</a> </a>
</li> </li>
@ -33,6 +35,9 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="main">
<div id="content" class="container">
</div>
</body> </body>
</html> </html>

+ 4
- 3
public/logo.svg
File diff suppressed because it is too large
View File


+ 10
- 3
public/style.css View File

@ -20,12 +20,14 @@
} }
#header-title { #header-title {
width: 30%; width: 30%;
padding-left: 20px;
font-size: 25px; font-size: 25px;
} }
#logo { #logo {
height: 60px; height: 60px;
} }
#error-code {
background-color: rgb(208, 208, 208);
}
#navigation { #navigation {
width: 70%; width: 70%;
padding-right: 20px !important; padding-right: 20px !important;
@ -35,6 +37,11 @@
font-weight: bold; font-weight: bold;
font-size: 60px; font-size: 60px;
} }
.m-title {
font-family: Comfortaa;
font-weight: normal;
font-size: 150%;
}
.nav-sep { .nav-sep {
position: relative; position: relative;
left: 10px; left: 10px;
@ -52,9 +59,9 @@
text-decoration: none; text-decoration: none;
} }
.nav-item a:hover { .nav-item a:hover {
color: rgb(57, 163, 225);
color: rgb(250, 152, 33);
text-decoration: none; text-decoration: none;
} }
body { body {
background-color: rgb(242, 242, 242);
background-color: #232323;
} }

Loading…
Cancel
Save