From 8423b06faec456a54f1fe759c6e3c57d87f29159 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Wed, 29 Apr 2015 17:10:34 +0100 Subject: [PATCH] Dev: On Bootstrap CSS demo pages don't change the Bootstrap default font --- .datatables-commit-sync | 2 +- examples/resources/demo.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 53898646..60376f9b 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -485b259e5c02ae763636f51c73b03b3feadc9a15 +354c9cb217149989496080939491dbe517bf8a79 diff --git a/examples/resources/demo.css b/examples/resources/demo.css index f701f932..0a378e7e 100644 --- a/examples/resources/demo.css +++ b/examples/resources/demo.css @@ -9,6 +9,11 @@ body { background-color: #fff; } +body.dt-example-bootstrap { + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 14px; + line-height: 1.42857143; +} div.container { max-width: 980px; @@ -277,6 +282,7 @@ ul.tabs li.active:hover { div.tabs { clear: both; + margin-top: -1px; } div.tabs>div {