Skip to content

Commit

Permalink
Update documentation with Page Header
Browse files Browse the repository at this point in the history
  • Loading branch information
licatajustin committed Mar 23, 2018
1 parent 14ab1d7 commit 206563e
Show file tree
Hide file tree
Showing 24 changed files with 2,880 additions and 1,488 deletions.
2 changes: 1 addition & 1 deletion docs/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source('https://rubygems.org')

gem('github-pages')
gem('hootstrap', '~> 0.1.6')
gem('hootstrap', '~> 0.3.0')
gem('jekyll')
gem('jekyll-assets')
gem('jekyll-babel')
28 changes: 14 additions & 14 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
arel (6.0.4)
autoprefixer-rails (7.2.3)
autoprefixer-rails (8.2.0)
execjs
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bootstrap (4.0.0.beta2.1)
bootstrap (4.0.0)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.12.3, < 2)
popper_js (>= 1.12.9, < 2)
sass (>= 3.5.2)
builder (3.2.3)
coffee-script (2.4.1)
Expand Down Expand Up @@ -122,8 +122,8 @@ GEM
typhoeus (~> 0.7)
globalid (0.4.1)
activesupport (>= 4.2.0)
hootstrap (0.1.6)
bootstrap (~> 4.0.0.beta)
hootstrap (0.3.0)
bootstrap (~> 4.0)
rails (>= 4.2.0)
sass-rails
html-pipeline (2.7.1)
Expand Down Expand Up @@ -251,7 +251,7 @@ GEM
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
loofah (2.1.1)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
Expand All @@ -270,7 +270,7 @@ GEM
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.0)
forwardable-extended (~> 2.6)
popper_js (1.12.5)
popper_js (1.12.9)
public_suffix (2.0.5)
rack (1.6.8)
rack-test (0.6.3)
Expand All @@ -288,18 +288,18 @@ GEM
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (4.2.9)
actionpack (= 4.2.9)
activesupport (= 4.2.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.0)
rake (12.3.1)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
Expand Down Expand Up @@ -345,10 +345,10 @@ PLATFORMS

DEPENDENCIES
github-pages
hootstrap (~> 0.1.6)
hootstrap (~> 0.3.0)
jekyll
jekyll-assets
jekyll-babel

BUNDLED WITH
1.15.4
1.16.1
1 change: 1 addition & 0 deletions docs/_data/nav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
- title: Buttons
- title: Badges
- title: Cards
- title: Layout
1 change: 1 addition & 0 deletions docs/_includes/icons/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions docs/_includes/icons/nest.svg

This file was deleted.

8 changes: 4 additions & 4 deletions docs/_includes/navbar.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<header class="navbar navbar-dark navbar-expand bg-primary flex-column flex-md-row mb-4">
<div class="container">
<a class="navbar-brand mr-0 mr-md-4 text-white" href="{{ site.url }}/" aria-label="Nest">
{% include icons/nest.svg width="34" height="34" class="align-middle" %}
<a class="navbar-brand mr-0 mr-md-4 text-white" href="{{ site.url }}/" aria-label="Hootstrap">
{% include icons/logo.svg width="34" height="34" class="align-middle" %}

<span class="ml-2 h6 text-light">ProctorU Nest</span>
<span class="ml-2 h6 text-light">ProctorU Hootstrap</span>
</a>

<div class="navbar-nav-scroll">
<ul class="navbar-nav nest-navbar-nav flex-row">
<ul class="navbar-nav hootstrap-navbar-nav flex-row">
<li class="nav-item">
<a class="nav-link" href="{{ site.url }}/content/alerts">Docs</a>
</li>
Expand Down
10 changes: 6 additions & 4 deletions docs/_layouts/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
</div>

<div class="col-md-8">
<div class="page-title">
{{ page.title }}
</div>
<div class="page-header text-left pt-0">
<h4 class="page-title">
{{ page.title }}
</h4>

<p class="lead">{{ page.description }}</p>
<h6 class="page-subtitle">{{ page.description }}</h6>
</div>

{{ content }}
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"hootstrap-216e42084f484d38539852320d1697946dc278a04cb9374ac4941c2badb754e6.js":{"mtime":"2017-12-06T18:31:15-06:00","logical_path":"hootstrap.js","integrity":"sha256-IW5CCE9ITThTmFIyDRaXlG3CeKBMuTdKxJQcK623VOY=","digest":"216e42084f484d38539852320d1697946dc278a04cb9374ac4941c2badb754e6","size":34651},"hootstrap-39cedbb5dbf62ab6756501e6b716b59ff042a3a9fdb78614a919dfd4d8473deb.js":{"mtime":"2018-01-05T09:08:39-06:00","logical_path":"hootstrap.js","integrity":"sha256-Oc7btdv2KrZ1ZQHmtxa1n/BCo6n9t4YUqRnf1NhHPes=","digest":"39cedbb5dbf62ab6756501e6b716b59ff042a3a9fdb78614a919dfd4d8473deb","size":34662}},"assets":{"hootstrap.js":"hootstrap-39cedbb5dbf62ab6756501e6b716b59ff042a3a9fdb78614a919dfd4d8473deb.js"}}
{"files":{"hootstrap-216e42084f484d38539852320d1697946dc278a04cb9374ac4941c2badb754e6.js":{"mtime":"2017-12-06T18:31:15-06:00","logical_path":"hootstrap.js","integrity":"sha256-IW5CCE9ITThTmFIyDRaXlG3CeKBMuTdKxJQcK623VOY=","digest":"216e42084f484d38539852320d1697946dc278a04cb9374ac4941c2badb754e6","size":34651},"hootstrap-39cedbb5dbf62ab6756501e6b716b59ff042a3a9fdb78614a919dfd4d8473deb.js":{"mtime":"2018-03-23T08:29:25-05:00","logical_path":"hootstrap.js","integrity":"sha256-Oc7btdv2KrZ1ZQHmtxa1n/BCo6n9t4YUqRnf1NhHPes=","digest":"39cedbb5dbf62ab6756501e6b716b59ff042a3a9fdb78614a919dfd4d8473deb","size":34662}},"assets":{"hootstrap.js":"hootstrap-39cedbb5dbf62ab6756501e6b716b59ff042a3a9fdb78614a919dfd4d8473deb.js"}}
18 changes: 5 additions & 13 deletions docs/_site/assets/scss/docs.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,19 @@
.page-title {
border-bottom: 1px solid #e9ecef;
font-size: 2em;
font-weight: 600;
line-height: 1.2;
margin-bottom: 1rem;
padding-bottom: 0.3em; }

.nest-example {
.hootstrap-example {
background-color: #fff;
border-radius: .25rem .25rem 0 0;
border: 1px solid #e9ecef;
padding: 1rem;
position: relative; }

.nest-example::before,
.nest-example::after {
.hootstrap-example::before,
.hootstrap-example::after {
content: "";
display: table; }

.nest-example .alert {
.hootstrap-example .alert {
margin-bottom: 0; }

.nest-example + .highlight {
.hootstrap-example + .highlight {
background-color: #fff;
border-radius: 0 0 .25rem .25rem;
border: 1px solid #e9ecef;
Expand Down
Loading

0 comments on commit 206563e

Please sign in to comment.