Skip to content

Commit 41f2c0b

Browse files
committed
Upgrade bootstrap
Use agency theme from npm This breaks the headers. Thumbnails aren't scaled properly. agency hasn't been checked on the official website There are probably other issues.
1 parent 55abf07 commit 41f2c0b

File tree

89 files changed

+1206
-28531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1206
-28531
lines changed

examples/common/index.pug

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,28 @@ html(lang="en")
1515
body
1616
if !hideNavbar
1717
// Add a navbar
18-
nav.navbar.navbar-default(role="navigation")
19-
.container-fluid
20-
.navbar-header
21-
button.navbar-toggle(type="button", data-toggle="collapse", data-target="gj-navbar-collapse")
22-
span.sr-only Toggle navigation
23-
span.icon-bar
24-
span.icon-bar
25-
span.icon-bar
18+
nav.navbar.navbar-dark.bg-primary(role="navigation")
2619
a.navbar-brand(href="https://github.com/OpenGeoscience/geojs", target="gj-homepage") GeoJS
2720

28-
.collapse.navbar-collapse#gj-navbar-collapse
2921
block headerButtons
30-
ul.nav.navbar-nav.navbar-right
22+
ul.nav.navbar-nav.ml-auto.navbar-right
3123
block screenShot
32-
li
33-
a.gj-screenshot-link(tabindex=0)
24+
li.nav-item
25+
a.nav-link.gj-screenshot-link(tabindex=0)
3426
| Screenshot
35-
li.gj-screenshot-waiting
36-
a ...
37-
li.gj-screenshot-result
38-
a.gj-screenshot-download(download='screenshot.png')
27+
li.nav-item.gj-screenshot-waiting
28+
a.nav-link ...
29+
li.nav-item.gj-screenshot-result
30+
a.nav-link.gj-screenshot-download(download='screenshot.png')
3931
img
4032
block showSource
4133
if docHTML
42-
li
43-
a.gj-show-source-link(href=docHTML, target="gj-docco")
34+
li.nav-item
35+
a.nav-link.gj-show-source-link(href=docHTML, target="gj-docco")
4436
| Source
4537
if !about.hidden
46-
li
47-
a.gj-show-about-link(href="#", data-toggle="modal", data-target="#about-modal")
38+
li.nav-item
39+
a.nav-link.gj-show-about-link(href="#", data-toggle="modal", data-target="#about-modal")
4840
| About
4941

5042
if ! about.hidden

examples/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ window.geo = require('../src/index');
33

44
// bootstrap and themes
55
require('bootstrap/dist/css/bootstrap.css');
6-
require('bootswatch/flatly/bootstrap.css');
6+
require('bootswatch/dist/flatly/bootstrap.css');
77
require('bootstrap');
88

99
// codemirror and plugins

examples/index.pug

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ extends ./common/index.pug
22

33
mixin thumbnail(ex)
44
.col-md-4
5-
.thumbnail
5+
.card.card-body
66
a(href=ex.path + "/")
77
img(src=ex.path + "/thumb.jpg", onerror="this.src='osm/thumb.jpg';")
88
.caption
@@ -12,7 +12,7 @@ mixin thumbnail(ex)
1212
p= ex.about.text
1313

1414
block prepend headerButtons
15-
ul.nav.navbar-nav.navbar-right
15+
ul.nav.navbar-nav.ml-auto
1616
li.dropdown
1717
a.dropdown-toggle(href="#", data-toggle="dropdown") Resources
1818
span.caret

examples/main.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ html, body {
22
overflow: auto;
33
}
44

5-
.thumbnail {
5+
.card.card-body {
66
position: relative;
77
overflow: hidden;
88
}
99

10-
.thumbnail .caption .description{
10+
.card.card-body .caption .description{
1111
position: absolute;
1212
top: 0px;
1313
right: 0px;

0 commit comments

Comments
 (0)