Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ module.exports = function(grunt) {
},
csscomb: {
options: {
config: 'less/bootstrap3/.csscomb.json'
config: 'less/bootstrap3-3-7/.csscomb.json'
},
dist: {
expand: true,
Expand Down
4 changes: 2 additions & 2 deletions amd/build/bootstrap.min.js

Large diffs are not rendered by default.

285 changes: 169 additions & 116 deletions amd/src/bootstrap.js

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions less/bootstrap3-3-6/mixins/tab-focus.less

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
.border-right-radius(0);
}
}
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
// Need .dropdown-toggle since :last-child doesn't apply, given that a .dropdown-menu is used immediately after it
.btn-group > .btn:last-child:not(:first-child),
.btn-group > .dropdown-toggle:not(:first-child) {
.border-left-radius(0);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ input[type="search"] {
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
//
// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
// Note that as of 9.3, iOS doesn't support `week`.

@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

width: 100%;
margin-bottom: 0;

&:focus {
z-index: 3;
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions less/bootstrap3-3-7/mixins/tab-focus.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// WebKit-style focus

.tab-focus() {
// WebKit-specific. Other browsers will keep their default outline style.
// (Initially tried to also force default via `outline: initial`,
// but that seems to erroneously remove the outline in Firefox altogether.)
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
}


// Collapsable panels (aka, accordion)
// Collapsible panels (aka, accordion)
//
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
// the help of our collapse JavaScript plugin.
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ hr {

// Only display content to screen readers
//
// See: http://a11yproject.com/posts/how-to-hide-content/
// See: http://a11yproject.com/posts/how-to-hide-content

.sr-only {
position: absolute;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* Bootstrap v3.3.6 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Bootstrap v3.3.7 (http://getbootstrap.com)
* Copyright 2011-2016 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
//** Global background color for active items (e.g., navs or dropdowns).
@component-active-bg: @brand-primary;

//** Width of the `border` for generating carets that indicator dropdowns.
//** Width of the `border` for generating carets that indicate dropdowns.
@caret-width-base: 4px;
//** Carets increase slightly in size for larger components.
@caret-width-large: 5px;
Expand Down
File renamed without changes.
22 changes: 11 additions & 11 deletions less/editor.less
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
// Strip down core bootstrap for editor.

// Core variables and mixins.
@import "bootstrap3-3-6/variables.less"; // Modify this for custom colors, font-sizes, etc.
@import "bootstrap3-3-6/mixins.less";
@import "bootstrap3-3-7/variables.less"; // Modify this for custom colors, font-sizes, etc.
@import "bootstrap3-3-7/mixins.less";


// Base CSS.
@import "bootstrap3-3-6/scaffolding.less";
@import "bootstrap3-3-6/type.less";
@import "bootstrap3-3-6/code.less";
@import "bootstrap3-3-6/tables.less";
@import "bootstrap3-3-7/scaffolding.less";
@import "bootstrap3-3-7/type.less";
@import "bootstrap3-3-7/code.less";
@import "bootstrap3-3-7/tables.less";

// Components: common.
@import "bootstrap3-3-6/wells.less";
@import "bootstrap3-3-7/wells.less";

// Components: Buttons & Alerts.
@import "bootstrap3-3-6/buttons.less";
@import "bootstrap3-3-6/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less.
@import "bootstrap3-3-7/buttons.less";
@import "bootstrap3-3-7/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less.

// Components: Misc.
@import "bootstrap3-3-6/thumbnails.less";
@import "bootstrap3-3-7/thumbnails.less";

// Utility classes.
@import "bootstrap3-3-6/utilities.less"; // Has to be last to override when necessary.
@import "bootstrap3-3-7/utilities.less"; // Has to be last to override when necessary.

// Moodle override.
@import "moodle/editor.less"; // The final override.
4 changes: 2 additions & 2 deletions less/moodle.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Upstream Bootstrap.
@import "bootstrap3-3-6/bootstrap";
@import "bootstrap3-3-7/bootstrap";

// Adds some basic gradients to page elements.
// @import "bootstrap3-3-6/theme";
// @import "bootstrap3-3-7/theme";

@import "moodle/variables";
// Override Bootstrap defaults.
Expand Down
Loading