aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/css/bootstrap-reboot.css
diff options
context:
space:
mode:
authorPierre Vanduynslager <[email protected]>2017-04-08 18:43:25 -0400
committerGitHub <[email protected]>2017-04-08 18:43:25 -0400
commitfe72daf2b34263d3cfc9bc77e9998cd22adfa34d (patch)
tree15dc9fc6fcb513362ba112d52ab01b568b423709 /docs/dist/css/bootstrap-reboot.css
parentf5cc59145642d78d7abbdf38fee1905786da5367 (diff)
parentfeb35b94a61c4d6016be8d1773a79a6bbe57d856 (diff)
downloadbootstrap-fe72daf2b34263d3cfc9bc77e9998cd22adfa34d.tar.xz
bootstrap-fe72daf2b34263d3cfc9bc77e9998cd22adfa34d.zip
Merge branch 'v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/dist/css/bootstrap-reboot.css')
-rw-r--r--docs/dist/css/bootstrap-reboot.css4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/dist/css/bootstrap-reboot.css b/docs/dist/css/bootstrap-reboot.css
index 5d714d6e7..8216b6eb2 100644
--- a/docs/dist/css/bootstrap-reboot.css
+++ b/docs/dist/css/bootstrap-reboot.css
@@ -3,8 +3,8 @@ html {
box-sizing: border-box;
font-family: sans-serif;
line-height: 1.15;
- -ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
+ -ms-text-size-adjust: 100%;
-ms-overflow-style: scrollbar;
-webkit-tap-highlight-color: transparent;
}
@@ -22,7 +22,7 @@ html {
body {
margin: 0;
- font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
font-size: 1rem;
font-weight: normal;
line-height: 1.5;