github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 06:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6848 from atom/mq-upgrade-bootstrap

Browse Source 
Upgrade Bootstrap and fix tooltip arrow positioning
This commit is contained in:
Machisté N. Quintana
2015-05-20 21:58:37 -04:00
parent 6cb9ebcf08 54ca895777
commit 3ce312ff49
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -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",

6
static/bootstrap-overrides.less vendored
View File

@@ -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;
}