From: Mark Otto Date: Sun, 29 Mar 2015 07:08:54 +0000 (-0700) Subject: Merge branch 'master' into v4 X-Git-Tag: v4.0.0-alpha~332 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58082cd83e9244fa05f316b4ba4102891ff5b0aa;p=thirdparty%2Fbootstrap.git Merge branch 'master' into v4 Conflicts: .gitignore Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/js/transitions.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/migration.html js/affix.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss --- 58082cd83e9244fa05f316b4ba4102891ff5b0aa diff --cc Gruntfile.js index a934eec88c,b715189a94..a54d4781b2 --- a/Gruntfile.js +++ b/Gruntfile.js @@@ -244,18 -201,49 +244,21 @@@ module.exports = function (grunt) } }, - csslint: { - options: { - csslintrc: 'less/.csslintrc' - }, - dist: [ - 'dist/css/bootstrap.css', - 'dist/css/bootstrap-theme.css' - ], - examples: [ - 'docs/examples/**/*.css' - ], - docs: { - options: { - ids: false, - 'overqualified-elements': false - }, - src: 'docs/assets/css/src/docs.css' - } - }, - cssmin: { options: { + // TODO: disable `zeroUnits` optimization once clean-css 3.2 is released + // and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly + compatibility: 'ie8', keepSpecialComments: '*', - advanced: false - }, - minifyCore: { - src: 'dist/css/<%= pkg.name %>.css', - dest: 'dist/css/<%= pkg.name %>.min.css' + noAdvanced: true }, - minifyTheme: { - src: 'dist/css/<%= pkg.name %>-theme.css', - dest: 'dist/css/<%= pkg.name %>-theme.min.css' + core: { + files: { + 'dist/css/<%= pkg.name %>.min.css': 'dist/css/<%= pkg.name %>.css' + } }, docs: { - src: [ - 'docs/assets/css/src/pygments-manni.css', - 'docs/assets/css/src/anchor.css', - 'docs/assets/css/src/docs.css' - - ], + src: 'docs/assets/css/docs.min.css', dest: 'docs/assets/css/docs.min.css' } }, diff --cc _config.yml index 1f63b36f9d,839bc7593f..6dd22ada88 --- a/_config.yml +++ b/_config.yml @@@ -32,12 -27,6 +32,12 @@@ blog: http://blog.getbootst expo: http://expo.getbootstrap.com cdn: - css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css - js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js + css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css - css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css + js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js + jquery: //code.jquery.com/jquery-2.1.1.min.js + +bug: + firefox: https://bugzilla.mozilla.org/show_bug.cgi?id= + webkit: https://bugs.webkit.org/show_bug.cgi?id= + chrome: https://code.google.com/p/chromium/issues/detail?id= + github: https://github.com/twbs/bootstrap/issues/ diff --cc docs/about/history.md index a2c9db14be,0000000000..7d881fe07c mode 100644,000000..100644 --- a/docs/about/history.md +++ b/docs/about/history.md @@@ -1,10 -1,0 +1,10 @@@ +--- +layout: page +title: History +--- + +Originally created by a designer and a developer at Twitter, Bootstrap has become one of the most popular front-end frameworks and open source projects in the world. + +Bootstrap was created at Twitter in mid-2010 by [@mdo](https://twitter.com/mdo) and [@fat](https://twitter.com/fat). Prior to being an open-sourced framework, Bootstrap was known as _Twitter Blueprint_. A few months into development, Twitter held its [first Hack Week](https://blog.twitter.com/2010/hack-week) and the project exploded as developers of all skill levels jumped in without any external guidance. It served as the style guide for internal tools development at the company for over a year before its public release, and continues to do so today. + - Originally [released](https://dev.twitter.com/blog/bootstrap-twitter) on [](https://twitter.com/mdo/statuses/104620039650557952), we've since had over [twenty releases](https://github.com/twbs/bootstrap/releases), including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach. ++Originally [released](https://blog.twitter.com/2011/bootstrap-twitter) on [](https://twitter.com/mdo/statuses/104620039650557952), we've since had over [twenty releases](https://github.com/twbs/bootstrap/releases), including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach. diff --cc docs/getting-started/accessibility.md index c1a23da350,0000000000..c20085ff85 mode 100644,000000..100644 --- a/docs/getting-started/accessibility.md +++ b/docs/getting-started/accessibility.md @@@ -1,38 -1,0 +1,38 @@@ +--- +layout: page +title: Accessibility +--- + +Bootstrap follows common web standards and—with minimal extra effort—can be used to create sites that are accessible to those using AT. + - ### Skip navigation ++## Skip navigation + +If your navigation contains many links and comes before the main content in the DOM, add a `Skip to main content` link before the navigation (for a simple explanation, see this [A11Y Project article on skip navigation links](http://a11yproject.com/posts/skip-nav-links/)). Using the `.sr-only` class will visually hide the skip link, and the .sr-only-focusable class will ensure that the link becomes visible once focused (for sighted keyboard users). + + + +{% highlight html %} + + Skip to main content + ... +
+ +
+ +{% endhighlight %} + - ### Nested headings ++## Nested headings + +When nesting headings (`

` - `

`), your primary document header should be an `

`. Subsequent headings should make logical use of `

` - `

` such that screen readers can construct a table of contents for your pages. + +Learn more at [HTML CodeSniffer](http://squizlabs.github.io/HTML_CodeSniffer/Standards/Section508/) and [Penn State's Accessability](http://accessibility.psu.edu/headings). + - ### Additional resources ++## Additional resources + +- ["HTML Codesniffer" bookmarklet for identifying accessibility issues](https://github.com/squizlabs/HTML_CodeSniffer) +- [The A11Y Project](http://a11yproject.com/) +- [MDN accessibility documentation](https://developer.mozilla.org/en-US/docs/Accessibility) diff --cc docs/getting-started/download.md index 6bcf8dd009,0000000000..8bebeea4cc mode 100644,000000..100644 --- a/docs/getting-started/download.md +++ b/docs/getting-started/download.md @@@ -1,59 -1,0 +1,72 @@@ +--- +layout: page +title: Download +--- + +Bootstrap is available for download via ZIP file in two flavors: precompiled CSS and Javascript, and the complete source code with documentation. + +{% comment %} +## Optional builds + +### Scaffolding only +Just our global CSS resets, including Normalize and more. No custom CSS components or JavaScript. + +### Grid only +Literally just our grid container and columns. No global CSS resets, custom CSS components, or JavaScript. + +### Individual components +Choose what CSS and JS components to download and customize further for your own use. Include the global CSS resets. + +### Kitchen sink +Download the entire project and quickly get developing. Includes all CSS and JavaScript, including the source files and basic build tools. + +--- +{% endcomment %} + +### Precompiled + +Compiled and minified CSS and JavaScript. No docs or original source files are included. + +Download Bootstrap + +### Download source and docs + +Source Sass, JavaScript, and documentation. **Requires a Sass compiler and [some setup](../compiling).** + +Download source + +### Bower + +You can also install and manage Bootstrap's Sass, CSS, and JavaScript using [Bower](http://bower.io). + +{% highlight bash %}$ bower install bootstrap{% endhighlight %} + +### npm + +Bootstrap is available as [an npm package](https://www.npmjs.org/package/bootstrap). Install it into your Node powered apps with: + +{% highlight bash %}$ npm install bootstrap{% endhighlight %} + +`require('bootstrap')` will load all of Bootstrap's jQuery plugins onto the jQuery object. The `bootstrap` module itself does not export anything. You can manually load Bootstrap's jQuery plugins individually by loading the `/js/*.js` files under the package's top-level directory. + +Bootstrap's `package.json` contains some additional metadata under the following keys: + +- `less` - path to Bootstrap's main [Less](http://lesscss.org) source file +- `style` - path to Bootstrap's non-minified CSS that's been precompiled using the default settings (no customization) + ++### Meteor ++ ++{% highlight bash %} ++$ meteor add twbs:bootstrap ++{% endhighlight %} ++ ++### Composer ++ ++{% highlight bash %} ++$ composer require twbs/bootstrap ++{% endhighlight %} ++ ++ +### Autoprefixer required + +Bootstrap uses [Autoprefixer](https://github.com/postcss/autoprefixer) to deal with [CSS vendor prefixes](http://webdesign.about.com/od/css/a/css-vendor-prefixes.htm). If you're compiling Bootstrap from its source Sass and not using our Gruntfile, you'll need to integrate Autoprefixer into your build process yourself. If you're using precompiled Bootstrap or using our Gruntfile, you don't need to worry about this as Autoprefixer is already integrated into our Gruntfile. diff --cc docs/getting-started/support.md index 2a96dbef70,0000000000..cf87535baf mode 100644,000000..100644 --- a/docs/getting-started/support.md +++ b/docs/getting-started/support.md @@@ -1,218 -1,0 +1,218 @@@ +--- +layout: page +title: Supported platforms +--- + +Bootstrap is built to work best with the latest techniques. As such, older desktop and mobile browsers may display differently, but should remain fully functional. + - ### Supported browsers ++## Supported browsers + +Bootstrap supports the **latest, stable releases** of all major browsers and platforms. On Windows, **we support Internet Explorer 9-11**. More specific support information is provided below. + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ChromeFirefoxInternet ExplorerOperaSafariAndroid Browser & WebView
AndroidSupportedSupportedN/ANot supportedN/AAndroid v5.0+
supported
iOSSupportedN/ANot supportedSupportedN/A
Mac OS XSupportedSupportedSupportedSupportedN/A
WindowsSupportedSupportedSupportedSupportedNot supportedN/A
+
+ +Unofficially, Bootstrap should look and behave well enough in Chromium and Chrome for Linux, Firefox for Linux, and Internet Explorer 7, though they are not officially supported. + +For a list of some of the browser bugs that Bootstrap has to grapple with, see our [Wall of browser bugs](../browser-bugs/). + - ### Internet Explorer 9 ++## Internet Explorer 9 + +Internet Explorer 9 is also supported, however, please be aware that some CSS3 properties and HTML5 elements are not fully supported. + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FeatureStatus
border-radiusSupported
box-shadowSupported
transformSupported, with -ms prefix
transitionNot supported
placeholderNot supported
+
+ +Visit [Can I use...](http://caniuse.com/) for details on browser support of CSS3 and HTML5 features. + - ### Supporting Internet Explorer 8 ++## Supporting Internet Explorer 8 + +As of v4, Bootstrap no longer supports IE8. **If you require IE8 support, we recommend you use Bootstrap 3.** It's still supported by our team for bugfixes and documentation changes, but no new features will be added to it. + +Alternatively, you can add the some third party JavaScript to backfill support for the browser. You'll need the following: + +* [The HTML5 shiv](http://en.wikipedia.org/wiki/HTML5_Shiv) +* [Respond.js](https://github.com/scottjehl/Respond) +* [Rem unit polyfill](https://github.com/chuckcarpenter/REM-unit-polyfill) + - ### IE Compatibility modes ++## IE Compatibility modes + +Bootstrap is not supported in the old Internet Explorer compatibility modes. To be sure you're using the latest rendering mode for IE, consider including the appropriate `` tag in your pages: + +{% highlight html %} + +{% endhighlight %} + +Confirm the document mode by opening the debugging tools: press F12 and check the "Document Mode". + +This tag is included in all of Bootstrap's documentation and examples to ensure the best rendering possible in each supported version of Internet Explorer. + +See [this StackOverflow question](http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge) for more information. + - ### Internet Explorer 10 in Windows Phone 8 ++## Internet Explorer 10 in Windows Phone 8 + +Internet Explorer 10 in Windows Phone 8 versions older than [Update 3 (a.k.a. GDR3)](http://blogs.windows.com/windows_phone/b/wpdev/archive/2013/10/14/introducing-windows-phone-preview-for-developers.aspx) doesn't differentiate **device width** from **viewport width** in `@-ms-viewport` at-rules, and thus doesn't properly apply the media queries in Bootstrap's CSS. To address this, you'll need to **include the following JavaScript to work around the bug**. + +{% highlight js %} +if (navigator.userAgent.match(/IEMobile\/10\.0/)) { + var msViewportStyle = document.createElement('style') + msViewportStyle.appendChild( + document.createTextNode( + '@-ms-viewport{width:auto!important}' + ) + ) + document.querySelector('head').appendChild(msViewportStyle) +} +{% endhighlight %} + +For more information and usage guidelines, read [Windows Phone 8 and Device-Width](http://timkadlec.com/2013/01/windows-phone-8-and-device-width/). + +As a heads up, we include this in all of Bootstrap's documentation and examples as a demonstration. + - ### Modals, navbars, and virtual keyboards ++## Modals, navbars, and virtual keyboards + - #### Overflow and scrolling ++### Overflow and scrolling + +Support for `overflow: hidden;` on the `` element is quite limited in iOS and Android. To that end, when you scroll past the top or bottom of a modal in either of those devices' browsers, the `` content will begin to scroll. + - #### Virtual keyboards ++### Virtual keyboards + +Also, note that if you're using a fixed navbar or using inputs within a modal, iOS has a rendering bug that doesn't update the position of fixed elements when the virtual keyboard is triggered. A few workarounds for this include transforming your elements to `position: absolute;` or invoking a timer on focus to try to correct the positioning manually. This is not handled by Bootstrap, so it is up to you to decide which solution is best for your application. + - #### Navbar Dropdowns ++### Navbar Dropdowns + +The `.dropdown-backdrop` element isn't used on iOS in the nav because of the complexity of z-indexing. Thus, to close dropdowns in navbars, you must directly click the dropdown element (or [any other element which will fire a click event in iOS](https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile)). + - ### Browser zooming ++## Browser zooming + +Page zooming inevitably presents rendering artifacts in some components, both in Bootstrap and the rest of the web. Depending on the issue, we may be able to fix it (search first and then open an issue if need be). However, we tend to ignore these as they often have no direct solution other than hacky workarounds. + - ### Sticky `:hover`/`:focus` on mobile ++## Sticky `:hover`/`:focus` on mobile +Even though real hovering isn't possible on most touchscreens, most mobile browsers emulate hovering support and make `:hover` "sticky". In other words, `:hover` styles start applying after tapping an element and only stop applying after the user taps some other element. On mobile-first sites, this behavior is normally undesirable. + +Bootstrap includes a workaround for this, although it is disabled by default. By setting `$use-hover-media-query` to `true` when compiling from Sass, Bootstrap will use [mq4-hover-shim](https://github.com/twbs/mq4-hover-shim) to disable `:hover` styles in browsers that emulate hovering, thus preventing sticky `:hover` styles. There are some caveats to this workaround; see the shim's documentation for details. + - ### Printing ++## Printing + +Even in some modern browsers, printing can be quirky. + +In particular, as of Chrome v32 and regardless of margin settings, Chrome uses a viewport width significantly narrower than the physical paper size when resolving media queries while printing a webpage. This can result in Bootstrap's extra-small grid being unexpectedly activated when printing. [See #12078 for some details.](https://github.com/twbs/bootstrap/issues/12078) Suggested workarounds: + +Also, as of Safari v8.0, fixed-width .containers can cause Safari to use an unusually small font size when printing. See #14868 for more details. One potential workaround for this is adding the following CSS:

+ +{% highlight css %} +@media print { + .container { + width: auto; + } +} +{% endhighlight %} + - ### Android stock browser ++## Android stock browser + +Out of the box, Android 4.1 (and even some newer releases apparently) ship with the Browser app as the default web browser of choice (as opposed to Chrome). Unfortunately, the Browser app has lots of bugs and inconsistencies with CSS in general. + +#### Select menu + +On `` as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers. + +{% highlight html %} + +{% endhighlight %} + +Want to see an example? [Check out this JS Bin demo.](http://jsbin.com/OyaqoDO/2) + - ### Validators ++## Validators + +In order to provide the best possible experience to old and buggy browsers, Bootstrap uses [CSS browser hacks](http://browserhacks.com) in several places to target special CSS to certain browser versions in order to work around bugs in the browsers themselves. These hacks understandably cause CSS validators to complain that they are invalid. In a couple places, we also use bleeding-edge CSS features that aren't yet fully standardized, but these are used purely for progressive enhancement. + +These validation warnings don't matter in practice since the non-hacky portion of our CSS does fully validate and the hacky portions don't interfere with the proper functioning of the non-hacky portion, hence why we deliberately ignore these particular warnings. + +Our HTML docs likewise have some trivial and inconsequential HTML validation warnings due to our inclusion of a workaround for [a certain Firefox bug](https://bugzilla.mozilla.org/show_bug.cgi?id=654072). diff --cc docs/getting-started/third-party-support.md index 604290d028,0000000000..00a74fce75 mode 100644,000000..100644 --- a/docs/getting-started/third-party-support.md +++ b/docs/getting-started/third-party-support.md @@@ -1,25 -1,0 +1,25 @@@ +--- +layout: page +title: Third party support +--- + +While we don't officially support any third party plugins or add-ons, we do offer some useful advice to help avoid potential issues in your projects. + - ### Box-sizing ++## Box-sizing + +Some third-party software, including Google Maps and Google Custom Search Engine, conflict with Bootstrap due to `* { box-sizing: border-box; }`, a rule which makes it so `padding` does not affect the final computed width of an element. These widgets expect the box model to be `content-box` instead. Learn more about [box model and sizing at CSS Tricks](http://css-tricks.com/box-sizing/). + +You can deal with this conflict by overriding the box model back to `content-box` just for the third-party widget's section of the page: + +{% highlight scss %} +/* Box-sizing reset + * + * Override an entire region's box model via CSS + * to avoid conflicts due to the global box model settings of Bootstrap. + */ +.selector-for-some-widget { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +{% endhighlight %} diff --cc js/tests/unit/collapse.js index a4d5eec67b,0efa65400d..0f1b7b119f --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@@ -356,9 -400,9 +400,9 @@@ $(function () $body2 .toggleClass('in collapsing') - .data('bs.collapse').transitioning = 1 + .data('bs.collapse').setTransitioning(true) - $target1.click() + $target1.trigger('click') setTimeout(function () { assert.ok(!showFired, 'show event did not fire') diff --cc package.json index 89852bd939,d7940d290e..23b59c81ac --- a/package.json +++ b/package.json @@@ -52,19 -51,14 +52,19 @@@ "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.0.0", "grunt-exec": "~0.4.6", - "grunt-html": "^3.0.0", + "grunt-html": "~4.0.1", "grunt-jekyll": "~0.4.2", "grunt-jscs": "~1.5.0", + "grunt-postcss": "^0.3.0", + "grunt-sass": "~0.18.0", "grunt-saucelabs": "~8.6.0", + "grunt-scss-lint": "^0.3.4", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~3.1.0", - "markdown-it": "^3.0.7", + "markdown-it": "^4.0.1", + "mq4-hover-shim": "^0.1.0", "npm-shrinkwrap": "^200.1.0", + "superstartup-closure-compiler": "^0.1.6", "time-grunt": "^1.1.0" }, "engines": { diff --cc scss/_buttons.scss index 5f4b3bc426,740905f525..b33081868b --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@@ -44,13 -44,19 +44,19 @@@ } &.disabled, - &[disabled], + &:disabled, fieldset[disabled] & { - pointer-events: none; // Future-proof disabling of clicks - cursor: @cursor-disabled; - .opacity(.65); - .box-shadow(none); + cursor: $cursor-disabled; + opacity: .65; + @include box-shadow(none); } + + a& { + &.disabled, + fieldset[disabled] & { + pointer-events: none; // Future-proof disabling of clicks on `` elements + } + } } diff --cc scss/_forms.scss index 4e0a45f9f1,94c0e7fcef..8b58835a7b --- a/scss/_forms.scss +++ b/scss/_forms.scss @@@ -377,26 -400,28 +377,28 @@@ input[type="checkbox"] text-align: center; pointer-events: none; } - .input-lg + .form-control-feedback { + .input-lg + .form-control-feedback, + .input-group-lg + .form-control-feedback { - width: @input-height-large; - height: @input-height-large; - line-height: @input-height-large; + width: $input-height-lg; + height: $input-height-lg; + line-height: $input-height-lg; } - .input-sm + .form-control-feedback { + .input-sm + .form-control-feedback, + .input-group-sm + .form-control-feedback { - width: @input-height-small; - height: @input-height-small; - line-height: @input-height-small; + width: $input-height-sm; + height: $input-height-sm; + line-height: $input-height-sm; } -// Feedback states +// Form validation states .has-success { - .form-control-validation(@state-success-text; @state-success-text; @state-success-bg); + @include form-control-validation($state-success-text, $state-success-text, $state-success-bg); } .has-warning { - .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg); + @include form-control-validation($state-warning-text, $state-warning-text, $state-warning-bg); } .has-error { - .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg); + @include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg); } // Reposition feedback icon if input has visible label above diff --cc scss/_jumbotron.scss index f826cd6160,0000000000..d60793efd2 mode 100644,000000..100644 --- a/scss/_jumbotron.scss +++ b/scss/_jumbotron.scss @@@ -1,36 -1,0 +1,36 @@@ +// +// Jumbotron +// -------------------------------------------------- + + +.jumbotron { + padding: $jumbotron-padding ($jumbotron-padding / 2); + margin-bottom: $jumbotron-padding; + color: $jumbotron-color; + background-color: $jumbotron-bg; + @include border-radius($border-radius-lg); +} + +.jumbotron-heading { + color: $jumbotron-heading-color; +} + +.jumbotron-hr { + border-top-color: darken($jumbotron-bg, 10%); +} + +@include media-breakpoint-up(sm) { + .jumbotron { + padding: ($jumbotron-padding * 2) $jumbotron-padding; + } + + .jumbotron-heading { - font-size: ($font-size-base * 4.5); ++ font-size: $jumbotron-heading-font-size; + } +} + +.jumbotron-fluid { + padding-right: 0; + padding-left: 0; + @include border-radius(0); +} diff --cc scss/_modal.scss index da3b90c0b4,1de622050e..ac27613767 --- a/scss/_modal.scss +++ b/scss/_modal.scss @@@ -59,14 -62,16 +59,17 @@@ // Modal background .modal-backdrop { - position: absolute; + position: fixed; top: 0; right: 0; + bottom: 0; left: 0; - z-index: @zindex-modal-background; - background-color: @modal-backdrop-bg; + background-color: $modal-backdrop-bg; ++ z-index: $zindex-modal-bg; ++ // Fade for backdrop - &.fade { .opacity(0); } - &.in { .opacity(@modal-backdrop-opacity); } + &.fade { opacity: 0; } + &.in { opacity: $modal-backdrop-opacity; } } // Modal header diff --cc scss/_nav.scss index 3d27891be7,0000000000..228613cfe6 mode 100644,000000..100644 --- a/scss/_nav.scss +++ b/scss/_nav.scss @@@ -1,158 -1,0 +1,156 @@@ +// +// Navs +// -------------------------------------------------- + +.nav { + margin-bottom: 0; + @extend .list-unstyled; + @include clearfix(); +} + +.nav-item { + position: relative; + display: inline-block; +} + +.nav-link { + display: inline-block; + padding: $nav-link-padding; + line-height: $line-height-base; + + @include hover-focus { + text-decoration: none; + background-color: $nav-link-hover-bg; + } + + // Disabled state sets text to gray and nukes hover/tab effects + .disabled > &, + &.disabled { + color: $nav-disabled-link-color; + + @include plain-hover-focus { + color: $nav-disabled-link-hover-color; + cursor: $cursor-disabled; + background-color: transparent; + } + } +} + + +// +// Tabs +// + +.nav-tabs { + border-bottom: 1px solid $nav-tabs-border-color; + + .nav-item { + float: left; + // Make the list-items overlay the bottom border + margin-bottom: -1px; + + + .nav-item { + margin-left: .2rem; + } + } + + .nav-link { + display: block; + border: 1px solid transparent; + @include border-radius($border-radius-base $border-radius-base 0 0); + + @include hover-focus { + border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color; + } + } + + .open > .nav-link, + .active > .nav-link, + .nav-link.open, + .nav-link.active { + @include plain-hover-focus { + color: $nav-tabs-active-link-hover-color; + background-color: $nav-tabs-active-link-hover-bg; + border-color: $nav-tabs-active-link-hover-border-color $nav-tabs-active-link-hover-border-color transparent; + } + } + + .disabled > .nav-link, + .nav-link.disabled { + @include plain-hover-focus { + color: $nav-disabled-link-color; + background-color: transparent; + border-color: transparent; + } + } +} + + +// +// Pills +// + +.nav-pills { + .nav-item { + float: left; + + + .nav-item { + margin-left: .2rem; + } + } + + .nav-link { + display: block; + @include border-radius($nav-pills-border-radius); + } + + .open > .nav-link, + .active > .nav-link, + .nav-link.open, + .nav-link.active { + @include plain-hover-focus { + color: $component-active-color; + cursor: default; + background-color: $component-active-bg; + } + } +} + +.nav-stacked { + .nav-item { + display: block; + float: none; + + + .nav-item { + margin-top: .2rem; + margin-left: 0; + } + } +} + + +// +// Tabbable tabs +// + +// Hide tabbable panes to start, show them when `.active` +.tab-content { + > .tab-pane { + display: none; - visibility: hidden; + } + > .active { + display: block; - visibility: visible; + } +} + + +// +// Dropdowns +// + +.nav-tabs .dropdown-menu { + // Make dropdown border overlap tab border + margin-top: -1px; + // Remove the top rounded corners here since there is a hard edge above the menu + @include border-top-radius(0); +} diff --cc scss/_scaffolding.scss index 27e09e96f6,0000000000..9b93010bac mode 100644,000000..100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@@ -1,160 -1,0 +1,171 @@@ +// +// Scaffolding +// -------------------------------------------------- + + +// Reset the box-sizing +// +// Heads up! This reset may cause conflicts with some third-party widgets. +// For recommendations on resolving such conflicts, see +// http://getbootstrap.com/getting-started/#third-box-sizing +// Credit: Jon Neal & CSS-Tricks +// http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ +html { + box-sizing: border-box; +} +*, +*:before, +*:after { + box-sizing: inherit; +} + + +// Make viewport responsive +// +// @viewport is supposed to eventually replace . It's manually prefixed for forward-compatibility. +// +// @viewport is also needed because IE 10+ doesn't honor in some cases. +// (See http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/) +// +// However, `device-width` is broken on IE 10 on Windows (Phone) 8, +// (see http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ +// and https://github.com/twbs/bootstrap/issues/10497) +// and the fix for that involves a snippet of JavaScript to sniff the user agent and apply some conditional CSS. +// See http://getbootstrap.com/getting-started/#support-ie10-width for the relevant hack. + +@-moz-viewport { width: device-width; } +@-ms-viewport { width: device-width; } +@-o-viewport { width: device-width; } +@-webkit-viewport { width: device-width; } +@viewport { width: device-width; } + + +// Body reset + +html { + font-size: $font-size-root; + -webkit-tap-highlight-color: rgba(0,0,0,0); +} + +body { + font-family: $font-family-base; + font-size: $font-size-base; + line-height: $line-height-base; + color: $text-color; + background-color: $body-bg; +} + +// Reset fonts for relevant elements +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} + + +// Links + +a { + color: $link-color; + text-decoration: none; + + @include hover-focus { + color: $link-hover-color; + text-decoration: $link-hover-decoration; + } + + &:focus { + @include tab-focus(); + } +} + + +// Images + +img { + // Make them responsive with `max-width` and `height` + max-width: 100%; + height: auto; + // Match vertical alignment of most other Bootstrapped elements + vertical-align: middle; +} + +// Rounded corners +.img-rounded { + @include border-radius($border-radius-lg); +} + +// Image thumbnails +.img-thumbnail { + padding: $thumbnail-padding; + line-height: $line-height-base; + background-color: $thumbnail-bg; + border: 1px solid $thumbnail-border; + border-radius: $thumbnail-border-radius; + transition: all .2s ease-in-out; + @include box-shadow(0 1px 2px rgba(0,0,0,.075)); + + // Keep them at most 100% wide + // @include img-responsive(inline-block); +} + +// Perfect circle +.img-circle { + border-radius: 50%; // set radius in percents +} + + +// Horizontal rules + +hr { + margin-top: $spacer; + margin-bottom: $spacer; + border: 0; + border-top: .0625rem solid $hr-border; +} + + +// Only display content to screen readers +// +// See: http://a11yproject.com/posts/how-to-hide-content/ + +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0,0,0,0); + border: 0; +} + +// Use in conjunction with .sr-only to only display content when it's focused. +// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1 +// Credit: HTML5 Boilerplate + +.sr-only-focusable { + &:active, + &:focus { + position: static; + width: auto; + height: auto; + margin: 0; + overflow: visible; + clip: auto; + } +} ++ ++// iOS "clickable elements" fix for role="button" ++// ++// Fixes "clickability" issue (and more generally, the firing of events such as focus as well) ++// for traditionally non-focusable elements with role="button" ++// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile ++// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged ++ ++[role="button"] { ++ cursor: pointer; ++} diff --cc scss/_tooltip.scss index 00c6049b85,0000000000..379d6d5e60 mode 100644,000000..100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@@ -1,85 -1,0 +1,84 @@@ +// +// Tooltips +// -------------------------------------------------- + + +// Base class +.tooltip { + position: absolute; + z-index: $zindex-tooltip; + display: block; + // Reset font and text properties given new insertion method + font-family: $font-family-base; + font-size: $font-size-sm; + font-weight: normal; + line-height: 1.4; - visibility: visible; + opacity: 0; + + &.in { opacity: $tooltip-opacity; } +} + +.tooltip-top { + padding: $tooltip-arrow-width 0; + margin-top: -3px; +} +.tooltip-right { + padding: 0 $tooltip-arrow-width; + margin-left: 3px; +} +.tooltip-bottom { + padding: $tooltip-arrow-width 0; + margin-top: 3px; +} +.tooltip-left { + padding: 0 $tooltip-arrow-width; + margin-left: -3px; +} + +// Wrapper for the tooltip content +.tooltip-inner { + max-width: $tooltip-max-width; + padding: 3px 8px; + color: $tooltip-color; + text-align: center; + text-decoration: none; + background-color: $tooltip-bg; + @include border-radius($border-radius-base); +} + +// Arrows +.tooltip-arrow { + position: absolute; + width: 0; + height: 0; + border-color: transparent; + border-style: solid; +} +.tooltip-top .tooltip-arrow { + bottom: 0; + left: 50%; + margin-left: -$tooltip-arrow-width; + border-width: $tooltip-arrow-width $tooltip-arrow-width 0; + border-top-color: $tooltip-arrow-color; +} +.tooltip-right .tooltip-arrow { + top: 50%; + left: 0; + margin-top: -$tooltip-arrow-width; + border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0; + border-right-color: $tooltip-arrow-color; +} +.tooltip-left .tooltip-arrow { + top: 50%; + right: 0; + margin-top: -$tooltip-arrow-width; + border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width; + border-left-color: $tooltip-arrow-color; +} +.tooltip-bottom .tooltip-arrow { + top: 0; + left: 50%; + margin-left: -$tooltip-arrow-width; + border-width: 0 $tooltip-arrow-width $tooltip-arrow-width; + border-bottom-color: $tooltip-arrow-color; +} diff --cc scss/_variables.scss index 4119526be3,0000000000..4b78edb197 mode 100644,000000..100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@@ -1,613 -1,0 +1,615 @@@ +// +// Variables +// + + +// Colors +// +// Gray and brand colors for use across Bootstrap. + +$gray-dark: #373a3c !default; +$gray-darker: $gray-dark !default; // TODO: remove +$gray: #55595c !default; +$gray-light: #818a91 !default; +$gray-lighter: #eceeef !default; +$gray-lightest: #f7f7f9 !default; + +$brand-primary: #0275d8 !default; +$brand-success: #5cb85c !default; +$brand-info: #5bc0de !default; +$brand-warning: #f0ad4e !default; +$brand-danger: #d9534f !default; + + +// Scaffolding +// +// Settings for some of the most global styles. + +$body-bg: #fff !default; +$text-color: $gray-dark !default; + +$link-color: $brand-primary !default; +$link-hover-color: darken($link-color, 15%) !default; +$link-hover-decoration: underline !default; + + +// Global settings +// +// Quickly modify global styling by enabling or disabling features. + +$enable-rounded: true !default; +$enable-shadows: true !default; +$enable-gradients: true !default; +$enable-transitions: true !default; + +$spacer: 1rem !default; +$border-width: .075rem !default; + +$use-hover-media-query: false !default; + +// Typography +// +// Font, line-height, and color for body text, headings, and more. + +$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default; +$font-family-serif: Georgia, "Times New Roman", Times, serif !default; +$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default; +$font-family-base: $font-family-sans-serif !default; + +// Pixel value used to responsively scale all typography. Applied to the `` element. +$font-size-root: 16px !default; + +$font-size-base: 1rem !default; +$font-size-lg: 1.25rem !default; +$font-size-sm: .85rem !default; +$font-size-xs: .75rem !default; + +$font-size-h1: 3rem !default; +$font-size-h2: 2.5rem !default; +$font-size-h3: 2rem !default; +$font-size-h4: 1.5rem !default; +$font-size-h5: 1.25rem !default; +$font-size-h6: 1rem !default; + +$line-height-base: 1.5 !default; + +// TODO: nuke this +$line-height-computed: 1 !default; + +$headings-font-family: inherit !default; +$headings-font-weight: 500 !default; +$headings-line-height: 1.1 !default; +$headings-color: inherit !default; + + +// Components +// +// Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). + +$padding-base-vertical: .5rem !default; +$padding-base-horizontal: .75rem !default; + +$padding-lg-vertical: .75rem !default; +$padding-lg-horizontal: 1.5rem !default; + +$padding-sm-vertical: .3rem !default; +$padding-sm-horizontal: .75rem !default; + +$padding-xs-vertical: .2rem !default; +$padding-xs-horizontal: .5rem !default; + +$line-height-lg: (4/3) !default; +$line-height-sm: 1.5 !default; + +$border-radius-base: .25rem !default; +$border-radius-lg: .3rem !default; +$border-radius-sm: .2rem !default; + +$component-active-color: #fff !default; +$component-active-bg: $brand-primary !default; + +$caret-width-base: .3em !default; +$caret-width-large: $caret-width-base !default; + + +// Tables +// +// Customizes the `.table` component with basic values, each used across all table variations. + +$table-cell-padding: .75rem !default; +$table-sm-cell-padding: .3rem !default; + +$table-bg: transparent !default; +$table-bg-accent: #f9f9f9 !default; +$table-bg-hover: #f5f5f5 !default; +$table-bg-active: $table-bg-hover !default; + +$table-border-color: $gray-lighter !default; + + +// Buttons +// +// For each of Bootstrap's buttons, define text, background and border color. + +$btn-font-weight: normal !default; + +$btn-primary-color: #fff !default; +$btn-primary-bg: $brand-primary !default; +$btn-primary-border: darken($btn-primary-bg, 5%) !default; + +$btn-secondary-color: $gray-dark !default; +$btn-secondary-bg: #fff !default; +$btn-secondary-border: $gray-lighter !default; + +$btn-info-color: #fff !default; +$btn-info-bg: $brand-info !default; +$btn-info-border: darken($btn-info-bg, 5%) !default; + +$btn-success-color: #fff !default; +$btn-success-bg: $brand-success !default; +$btn-success-border: darken($btn-success-bg, 5%) !default; + +$btn-warning-color: #fff !default; +$btn-warning-bg: $brand-warning !default; +$btn-warning-border: darken($btn-warning-bg, 5%) !default; + +$btn-danger-color: #fff !default; +$btn-danger-bg: $brand-danger !default; +$btn-danger-border: darken($btn-danger-bg, 5%) !default; + +$btn-link-disabled-color: $gray-light !default; + + +// Forms + +$input-bg: #fff !default; +$input-bg-disabled: $gray-lighter !default; + +$input-color: $gray !default; +$input-border: #ccc !default; + +// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4 +$input-border-radius: $border-radius-base !default; +$input-border-radius-lg: $border-radius-lg !default; +$input-border-radius-sm: $border-radius-sm !default; + +$input-border-focus: #66afe9 !default; +$input-box-shadow-focus: rgba(102,175,233,.6) !default; + +$input-color-placeholder: #999 !default; + +$input-height-base: (($font-size-base * $line-height-base) + ($padding-base-vertical * 2) + ($border-width * 2)) !default; +$input-height-lg: (($font-size-lg * $line-height-lg) + ($padding-lg-vertical * 2) + ($border-width * 2)) !default; +$input-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-vertical * 2) + ($border-width * 2)) !default; + +$form-group-margin-bottom: 15px; + +$legend-color: $gray-dark !default; +$legend-border-color: #e5e5e5 !default; + +$input-group-addon-bg: $gray-lighter !default; +$input-group-addon-border-color: $input-border !default; + +$cursor-disabled: not-allowed !default; + + +// Dropdowns +// +// Dropdown menu container and contents. + +$dropdown-bg: #fff !default; +$dropdown-border: rgba(0,0,0,.15) !default; +$dropdown-divider-bg: #e5e5e5 !default; + +$dropdown-link-color: $gray-dark !default; +$dropdown-link-hover-color: darken($gray-dark, 5%) !default; +$dropdown-link-hover-bg: #f5f5f5 !default; + +$dropdown-link-active-color: $component-active-color !default; +$dropdown-link-active-bg: $component-active-bg !default; + +$dropdown-link-disabled-color: $gray-light !default; + +$dropdown-header-color: $gray-light !default; + + +// Z-index master list +// +// Warning: Avoid customizing these values. They're used for a bird's eye view +// of components dependent on the z-axis and are designed to all work together. +// +// Note: These variables are not generated into the Customizer. + +$zindex-navbar: 1000 !default; +$zindex-dropdown: 1000 !default; +$zindex-popover: 1060 !default; +$zindex-tooltip: 1070 !default; +$zindex-navbar-fixed: 1030 !default; - $zindex-modal: 1040 !default; ++$zindex-modal-bg: 1040 !default; ++$zindex-modal: 1050 !default; + + +// Media queries breakpoints +// +// Define the minimum and maximum dimensions at which your layout will change, adapting to different screen sizes. + +// Grid system +// +// Define your custom responsive grid. +$grid-breakpoints: ( + // Extra small screen / phone + xs: 0, + // Small screen / phone + sm: 34em, + // Medium screen / tablet + md: 48em, + // Large screen / desktop + lg: 62em, + // Extra large screen / wide desktop + xl: 75em +) !default; + +// Number of columns in the grid. +$grid-columns: 12 !default; + +// Padding between columns. Gets divided in half for the left and right. +$grid-gutter-width: 1.5rem !default; + + +// Container sizes +// +// Define the maximum width of `.container` for different screen sizes. + +$container-max-widths: ( + sm: 34rem, // 480 + md: 45rem, // 720 + lg: 60rem, // 960 + xl: 72.25rem // 1140 +) !default; + + +// Navbar +// +// + +// Basics of a navbar +// $navbar-height: 50px !default; +$navbar-margin-bottom: $line-height-computed !default; +$navbar-border-radius: $border-radius-base !default; +$navbar-padding-horizontal: $spacer !default; +$navbar-padding-vertical: ($spacer / 2) !default; +$navbar-collapse-max-height: 340px !default; + +$navbar-default-color: #777 !default; +$navbar-default-bg: #f8f8f8 !default; +$navbar-default-border: darken($navbar-default-bg, 6.5%) !default; + +$navbar-default-link-color: #777 !default; +$navbar-default-link-hover-color: #333 !default; +$navbar-default-link-hover-bg: transparent !default; +$navbar-default-link-active-color: #555 !default; +$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) !default; +$navbar-default-link-disabled-color: #ccc !default; +$navbar-default-link-disabled-bg: transparent !default; + +$navbar-default-brand-color: $navbar-default-link-color !default; +$navbar-default-brand-hover-color: darken($navbar-default-brand-color, 10%) !default; +$navbar-default-brand-hover-bg: transparent !default; + +$navbar-default-toggle-hover-bg: #ddd !default; +$navbar-default-toggle-icon-bar-bg: #888 !default; +$navbar-default-toggle-border-color: #ddd !default; + + +// Inverted navbar +$navbar-inverse-color: lighten($gray-light, 12%) !default; +$navbar-inverse-bg: #373a3c !default; +$navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default; + +$navbar-inverse-link-color: lighten($gray-light, 15%) !default; +$navbar-inverse-link-hover-color: #fff !default; +$navbar-inverse-link-hover-bg: transparent !default; +$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default; +$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default; +$navbar-inverse-link-disabled-color: #444 !default; +$navbar-inverse-link-disabled-bg: transparent !default; + +$navbar-inverse-brand-color: $navbar-inverse-link-color !default; +$navbar-inverse-brand-hover-color: #fff !default; +$navbar-inverse-brand-hover-bg: transparent !default; + +$navbar-inverse-toggle-hover-bg: #333 !default; +$navbar-inverse-toggle-icon-bar-bg: #fff !default; +$navbar-inverse-toggle-border-color: #333 !default; + + +// Navs + +$nav-link-padding: .6em 1em !default; +$nav-link-hover-bg: $gray-lighter !default; + +$nav-disabled-link-color: $gray-light !default; +$nav-disabled-link-hover-color: $gray-light !default; + +$nav-tabs-border-color: #ddd !default; + +$nav-tabs-link-hover-border-color: $gray-lighter !default; + +$nav-tabs-active-link-hover-bg: $body-bg !default; +$nav-tabs-active-link-hover-color: $gray !default; +$nav-tabs-active-link-hover-border-color: #ddd !default; + +$nav-tabs-justified-link-border-color: #ddd !default; +$nav-tabs-justified-active-link-border-color: $body-bg !default; + +$nav-pills-border-radius: $border-radius-base !default; +$nav-pills-active-link-hover-bg: $component-active-bg !default; +$nav-pills-active-link-hover-color: $component-active-color !default; + + +// Pagination + +$pagination-color: $link-color !default; +$pagination-bg: #fff !default; +$pagination-border: #ddd !default; + +$pagination-hover-color: $link-hover-color !default; +$pagination-hover-bg: $gray-lighter !default; +$pagination-hover-border: #ddd !default; + +$pagination-active-color: #fff !default; +$pagination-active-bg: $brand-primary !default; +$pagination-active-border: $brand-primary !default; + +$pagination-disabled-color: $gray-light !default; +$pagination-disabled-bg: #fff !default; +$pagination-disabled-border: #ddd !default; + + +// Pager + +$pager-bg: $pagination-bg !default; +$pager-border: $pagination-border !default; +$pager-border-radius: 15px !default; + +$pager-hover-bg: $pagination-hover-bg !default; + +$pager-active-bg: $pagination-active-bg !default; +$pager-active-color: $pagination-active-color !default; + +$pager-disabled-color: $pagination-disabled-color !default; + + +// Jumbotron + +$jumbotron-padding: 2rem !default; +$jumbotron-color: inherit !default; +$jumbotron-bg: $gray-lighter !default; +$jumbotron-heading-color: inherit !default; ++$jumbotron-heading-font-size: ($font-size-base * 4.5) !default; +// $jumbotron-font-size: ceil(($font-size-base * 1.5)) !default; + + +// Form states and alerts +// +// Define colors for form feedback states and, by default, alerts. + +$state-success-text: #3c763d !default; +$state-success-bg: #dff0d8 !default; +$state-success-border: darken($state-success-bg, 5%) !default; + +$state-info-text: #31708f !default; +$state-info-bg: #d9edf7 !default; +$state-info-border: darken($state-info-bg, 7%) !default; + +$state-warning-text: #8a6d3b !default; +$state-warning-bg: #fcf8e3 !default; +$state-warning-border: darken($state-warning-bg, 5%) !default; + +$state-danger-text: #a94442 !default; +$state-danger-bg: #f2dede !default; +$state-danger-border: darken($state-danger-bg, 5%) !default; + + +// Tooltips + +$tooltip-max-width: 200px !default; +$tooltip-color: #fff !default; +$tooltip-bg: #000 !default; +$tooltip-opacity: .9 !default; + +$tooltip-arrow-width: 5px !default; +$tooltip-arrow-color: $tooltip-bg !default; + + +// Popovers + +$popover-bg: #fff !default; +$popover-max-width: 276px !default; +$popover-border-color: rgba(0,0,0,.2) !default; +$popover-fallback-border-color: #ccc !default; + +$popover-title-bg: darken($popover-bg, 3%) !default; + +$popover-arrow-width: 10px !default; +$popover-arrow-color: $popover-bg !default; + +$popover-arrow-outer-width: ($popover-arrow-width + 1) !default; +$popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; +$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default; + + +// Labels + +$label-default-bg: $gray-light !default; +$label-primary-bg: $brand-primary !default; +$label-success-bg: $brand-success !default; +$label-info-bg: $brand-info !default; +$label-warning-bg: $brand-warning !default; +$label-danger-bg: $brand-danger !default; + +$label-color: #fff !default; +$label-link-hover-color: #fff !default; + + +// Modals + +// Padding applied to the modal body +$modal-inner-padding: 15px !default; + +$modal-title-padding: 15px !default; +$modal-title-line-height: $line-height-base !default; + +$modal-content-bg: #fff !default; +$modal-content-border-color: rgba(0,0,0,.2) !default; + +$modal-backdrop-bg: #000 !default; +$modal-backdrop-opacity: .5 !default; +$modal-header-border-color: #e5e5e5 !default; +$modal-footer-border-color: $modal-header-border-color !default; + +$modal-lg: 900px !default; +$modal-md: 600px !default; +$modal-sm: 300px !default; + + +// Alerts +// +// Define alert colors, border radius, and padding. + +$alert-padding: 15px !default; +$alert-border-radius: $border-radius-base !default; +$alert-link-font-weight: bold !default; + +$alert-success-bg: $state-success-bg !default; +$alert-success-text: $state-success-text !default; +$alert-success-border: $state-success-border !default; + +$alert-info-bg: $state-info-bg !default; +$alert-info-text: $state-info-text !default; +$alert-info-border: $state-info-border !default; + +$alert-warning-bg: $state-warning-bg !default; +$alert-warning-text: $state-warning-text !default; +$alert-warning-border: $state-warning-border !default; + +$alert-danger-bg: $state-danger-bg !default; +$alert-danger-text: $state-danger-text !default; +$alert-danger-border: $state-danger-border !default; + + +// Progress bars + +$progress-bg: #f5f5f5 !default; +$progress-bar-color: #fff !default; +$progress-border-radius: $border-radius-base !default; + +$progress-bar-bg: $brand-primary !default; +$progress-bar-success-bg: $brand-success !default; +$progress-bar-warning-bg: $brand-warning !default; +$progress-bar-danger-bg: $brand-danger !default; +$progress-bar-info-bg: $brand-info !default; + + +// List group + +$list-group-bg: #fff !default; +$list-group-border: #ddd !default; +$list-group-border-radius: $border-radius-base !default; + +$list-group-hover-bg: #f5f5f5 !default; +$list-group-active-color: $component-active-color !default; +$list-group-active-bg: $component-active-bg !default; +$list-group-active-border: $list-group-active-bg !default; +$list-group-active-text-color: lighten($list-group-active-bg, 40%) !default; + +$list-group-disabled-color: $gray-light !default; +$list-group-disabled-bg: $gray-lighter !default; +$list-group-disabled-text-color: $list-group-disabled-color !default; + +$list-group-link-color: #555 !default; +$list-group-link-hover-color: $list-group-link-color !default; +$list-group-link-heading-color: #333 !default; + + +// Thumbnails + +$thumbnail-padding: .25rem !default; +$thumbnail-bg: $body-bg !default; +$thumbnail-border: #ddd !default; +$thumbnail-border-radius: $border-radius-base !default; + + +// Badges + +$badge-color: #fff !default; +$badge-link-hover-color: #fff !default; +$badge-bg: $gray-light !default; + +$badge-active-color: $link-color !default; +$badge-active-bg: #fff !default; + +$badge-font-weight: bold !default; +$badge-line-height: 1 !default; +$badge-border-radius: 2em !default; + + +// Breadcrumbs + +$breadcrumb-padding-vertical: .75rem !default; +$breadcrumb-padding-horizontal: 1rem !default; + +$breadcrumb-bg: $gray-lighter !default; +$breadcrumb-divider-color: $gray-light !default; +$breadcrumb-active-color: $gray-light !default; +$breadcrumb-divider: "/" !default; + + +// Carousel + +$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default; + +$carousel-control-color: #fff !default; +$carousel-control-width: 15% !default; +$carousel-control-opacity: .5 !default; +$carousel-control-font-size: 20px !default; + +$carousel-indicator-active-bg: #fff !default; +$carousel-indicator-border-color: #fff !default; + +$carousel-caption-color: #fff !default; + + +// Close + +$close-font-weight: bold !default; +$close-color: #000 !default; +$close-text-shadow: 0 1px 0 #fff !default; + + +// Code + +$code-color: #d44950 !default; +$code-bg: #f7f7f9 !default; + +$kbd-color: #fff !default; +$kbd-bg: #333 !default; + +$pre-bg: #f7f7f9 !default; +$pre-color: $gray-dark !default; +$pre-border-color: #ccc !default; +$pre-scrollable-max-height: 340px !default; + + +// Type + +$component-offset-horizontal: 180px !default; +$text-muted: $gray-light !default; +$abbr-border-color: $gray-light !default; +$headings-small-color: $gray-light !default; +$blockquote-small-color: $gray-light !default; +$blockquote-font-size: ($font-size-base * 1.25) !default; +$blockquote-border-color: $gray-lighter !default; +$page-header-border-color: $gray-lighter !default; +$dl-horizontal-offset: $component-offset-horizontal !default; +$hr-border: $gray-lighter !default; diff --cc scss/mixins/_background-variant.scss index 577f019ca2,0000000000..3287d7a060 mode 100644,000000..100644 --- a/scss/mixins/_background-variant.scss +++ b/scss/mixins/_background-variant.scss @@@ -1,13 -1,0 +1,13 @@@ +// Contextual backgrounds + +// [converter] $parent hack +@mixin bg-variant($parent, $color) { + #{$parent} { + background-color: $color; + } + a#{$parent} { - @include hover { ++ @include hover-focus { + background-color: darken($color, 10%); + } + } +} diff --cc scss/mixins/_responsive-visibility.scss index 9867db013d,0000000000..cbdf777239 mode 100644,000000..100644 --- a/scss/mixins/_responsive-visibility.scss +++ b/scss/mixins/_responsive-visibility.scss @@@ -1,21 -1,0 +1,21 @@@ +// Responsive utilities + +// +// More easily include all the states for responsive-utilities.less. +// [converter] $parent hack +@mixin responsive-visibility($parent) { + #{$parent} { + display: block !important; + } - table#{$parent} { display: table; } ++ table#{$parent} { display: table !important; } + tr#{$parent} { display: table-row !important; } + th#{$parent}, + td#{$parent} { display: table-cell !important; } +} + +// [converter] $parent hack +@mixin responsive-invisibility($parent) { + #{$parent} { + display: none !important; + } +} diff --cc scss/mixins/_text-emphasis.scss index ab3869d31e,0000000000..0a6428ea76 mode 100644,000000..100644 --- a/scss/mixins/_text-emphasis.scss +++ b/scss/mixins/_text-emphasis.scss @@@ -1,12 -1,0 +1,12 @@@ +// Typography + +@mixin text-emphasis-variant($parent, $color) { + #{$parent} { + color: $color; + } + a#{$parent} { - @include hover { ++ @include hover-focus { + color: darken($color, 10%); + } + } +}