Skip to content

Add top-navbar with useful links. #9

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

Merged
febbraro merged 4 commits into from
Jan 17, 2018
Merged

Add top-navbar with useful links. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c33a5b
Add top-navbar with useful links.
Dec 20, 2017
e59fc09
Fix up page title and add contribution link.
Dec 20, 2017
6d82585
Add fontawesome icons and move issues dropdown to the right/bottom.
Dec 20, 2017
959b45a
Fix vertical column by removing layout directives from project list.
Dec 21, 2017
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
8 changes: 6 additions & 2 deletions frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<title>Outrigger Dashboard</title>

<link rel="shortcut icon" href="favicon.ico">

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" integrity="sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" crossorigin="anonymous">

<!-- Fonts -->
<link href="https://fonts.googleapis.com/css?family=Oswald:200,300,400,500,700|Source+Sans+Pro:200,300,400,600" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">

<!-- Custom styling -->
<style>
Expand All @@ -28,4 +28,8 @@
<div id="app"></div>
<script src="dist/build.js"></script>
</body>

<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" integrity="sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js" integrity="sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ" crossorigin="anonymous"></script>
</html>
45 changes: 34 additions & 11 deletions frontend/src/components/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,44 @@
<template>
<div id="app" class="container">
<div class="jumbotron">
<div class="project-title__wrapper">
<div class="media-left media-middle">
<img class="logo-image" src="../assets/logo.png">
</div>
<div class="media-body">
<h1 class="project-name">Outrigger Dashboard</h1>
</div>

<nav class="navbar navbar-light bg-light navbar-expand-lg fixed-top">
<a class="navbar-brand" href="#"><img src="../assets/logo.png" height="40" width="40" alt="Outrigger Logo" /></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link" href="http://outrigger.sh" title="Outrigger Homepage">What is Outrigger?</a></li>
<li class="nav-item"><a class="nav-link" href="http://docs.outrigger.sh" title="Technical Documentation">Documentation</a></li>
<li class="nav-item"><a class="nav-link" href="https://github.com/search?o=desc&q=topic%3Aoutrigger+org%3Aphase2&s=updated&type=Repositories" title="Review all the Outrigger repositories on Github"><i class="fa fa-github" aria-hidden="true"></i>&thinsp;Contribute</a></li>
<li class="nav-item"><a class="nav-link" href="http://slack.outrigger.sh/" title="Join us on Slack!"><i class="fa fa-slack" aria-hidden="true"></i>&thinsp;Slack</a></li>
</ul>
<ul class="navbar-nav ml-auto">
<li role="separator" class="dropdown-divider"></li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="supportDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
File an Issue
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="supportDropdown">
<a class="dropdown-item" href="https://github.com/phase2/outrigger-dashboard/issues">Dashboard issues</a>
<a class="dropdown-item" href="https://github.com/phase2/outrigger-docs/issues">Documentation issues</a>
<a class="dropdown-item" href="https://github.com/phase2/rig/issues">Outrigger CLI (rig) issues</a>
</div>
</li>
</ul>
</div>
</div>
<div class="container">
</nav>

<header class="jumbotron">
<h1 class="display-3 mt-5">Outrigger Dashboard</h1>
Copy link
Copy Markdown
Contributor Author

@grayside grayside Dec 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mt-5 stands for margin top 5, where 5 is multiplied by some kind of predefined spacer and unit of measurement. display-3 addresses some sizing issues after I pulled out the extra markup.

</header>

<main class="container">
<div class="row">
<dns-records :entries="dnsRecords"></dns-records>
</div>
<project-list :projects="projects"></project-list>
</div>
</main>
</div>
</template>

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Project.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="col project table-responsive">
<div class="project table-responsive">
Copy link
Copy Markdown

@Jwaxo Jwaxo Dec 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So did this clear up the "squishing" issue?

Copy link
Copy Markdown
Contributor Author

@grayside grayside Dec 21, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part fixed each project's table being on the same horizontal row. Looks good on chrome at least.. I guess I should check others.

<h2>{{ name }}</h2>
<table class="table table-striped table-hover table-bordered">
<thead>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/ProjectList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div id="project-list" class="row">
<div id="project-list">
<project v-for="(containers, name) in projects" :name="name" :containers="containers"></project>
</div>
</template>
Expand Down