diff options
| author | Mark Otto <[email protected]> | 2012-09-07 22:34:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-07 22:34:51 -0700 |
| commit | 7e2958121028b4fdfcd40f7d03dd3c37ceba6a51 (patch) | |
| tree | a357929a7f065cfd2ad2498412e224eb2d0df458 /docs/assets/css/docs.css | |
| parent | cb46ddee72eb45f835504a625947c821c8f60635 (diff) | |
| parent | f29f98501c11678e2ecfe8fd5c842adcd5a40091 (diff) | |
| download | bootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.tar.xz bootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.zip | |
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 84be1df11..21eed6082 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -132,16 +132,6 @@ hr.soften { } /* Download button */ -@-webkit-keyframes downloadButton { - from { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } - 50% { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); } - to { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } -} -@-moz-keyframes downloadButton { - from { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } - 50% { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); } - to { box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.5); } -} .masthead .btn { padding: 14px 24px; font-size: 24px; @@ -151,19 +141,17 @@ hr.soften { -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); - box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01); - -webkit-animation-name: downloadButton; - -moz-animation-name: downloadButton; - -webkit-animation-duration: 1.5s; - -moz-animation-duration: 1.5s; - -webkit-animation-iteration-count: infinite; - -moz-animation-iteration-count: infinite; + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); -webkit-transition: none; -moz-transition: none; transition: none; - +} +.masthead .btn:hover { + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25); } .masthead .btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1); @@ -547,7 +535,7 @@ h2 + .row { background-color: rgba(255,0,0,.25); } -/* Eaxmples page +/* Example page ------------------------- */ .bootstrap-examples p { font-size: 13px; @@ -653,10 +641,6 @@ h2 + .row { form.bs-docs-example { padding-bottom: 19px; } -.bs-docs-example .lead { - font-size: 18px; - line-height: 24px; -} /* Images */ .bs-docs-example-images img { |