From 1ad1172847c3851abf52af4e946b4b336443ee6c Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Mon, 18 May 2015 18:34:45 -0400 Subject: [PATCH 1/2] :arrow_up: bootstrap@3.3.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 330117ff3..30d3deb11 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "atom-keymap": "^5.1.2", "atom-space-pen-views": "^2.0.4", "babel-core": "^5.1.11", - "bootstrap": "git+https://github.com/atom/bootstrap.git#6af81906189f1747fd6c93479e3d998ebe041372", + "bootstrap": "^3.3.4", "clear-cut": "^2.0.1", "coffee-cash": "0.8.0", "coffee-script": "1.8.0", From 54ca8957776949e2bf3a1e021a3436640dd15eb3 Mon Sep 17 00:00:00 2001 From: Machiste Quintana Date: Mon, 18 May 2015 19:30:05 -0400 Subject: [PATCH 2/2] Use configured font settings in tooltips --- static/bootstrap-overrides.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/static/bootstrap-overrides.less b/static/bootstrap-overrides.less index 258de6320..df61c0171 100644 --- a/static/bootstrap-overrides.less +++ b/static/bootstrap-overrides.less @@ -26,3 +26,9 @@ body { font-family: inherit; // inherit from html font-size: inherit; // inherit from html } + +// Latest Bootstrap specifies the font properties again instead of inheriting +.tooltip { + font-family: @font-family; + font-size: @font-size; +}