diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index aedd8d1a9157..990090209bb3 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -1,28 +1,28 @@ -.com { color: #93a1a1; } -.lit { color: #195f91; } -.pun, .opn, .clo { color: #93a1a1; } -.fun { color: #dc322f; } -.str, .atv { color: #D14; } -.kwd, .linenums .tag { color: #1e347b; } -.typ, .atn, .dec, .var { color: teal; } -.pln { color: #48484c; } +.su_bootstrap_safe .com { color: #93a1a1; } +.su_bootstrap_safe .lit { color: #195f91; } +.su_bootstrap_safe .pun, .su_bootstrap_safe .opn, .su_bootstrap_safe .clo { color: #93a1a1; } +.su_bootstrap_safe .fun { color: #dc322f; } +.su_bootstrap_safe .str, .su_bootstrap_safe .atv { color: #D14; } +.su_bootstrap_safe .kwd, .su_bootstrap_safe .linenums .tag { color: #1e347b; } +.su_bootstrap_safe .typ, .su_bootstrap_safe .atn, .su_bootstrap_safe .dec, .su_bootstrap_safe .var { color: teal; } +.su_bootstrap_safe .pln { color: #48484c; } -.prettyprint { +.su_bootstrap_safe .prettyprint { padding: 8px; background-color: #f7f7f9; border: 1px solid #e1e1e8; } -.prettyprint.linenums { +.su_bootstrap_safe .prettyprint.linenums { -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0; } /* Specify class=linenums on a pre to get line numbering */ -ol.linenums { +.su_bootstrap_safe ol.linenums { margin: 0 0 0 33px; /* IE indents via margin-left */ } -ol.linenums li { +.su_bootstrap_safe ol.linenums li { padding-left: 12px; color: #bebec5; line-height: 18px; diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index c831de6b64b5..67f6f0e60d5e 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -30,7 +30,10 @@ this.options = options this.$element = $(content) .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + this.$element.removeClass('su_bootstrap_safe').addClass('su_bootstrap_safe') } + + var openedModals = [] Modal.prototype = { @@ -49,6 +52,9 @@ if (this.isShown || e.isDefaultPrevented()) return $('body').addClass('modal-open') + + // SU focused modal hack + $(openedModals).removeClass('focused'); for( var i = 0; i < openedModals.length; i++ ) { var $modal = openedModals[i]; $modal.removeClass('focused'); } this.$element.addClass('focused'); openedModals.push(this.$element); this.isShown = true @@ -77,6 +83,7 @@ } , hide: function (e) { + if( ! this.$element.hasClass('focused') ) return; e && e.preventDefault() var that = this @@ -89,15 +96,15 @@ this.isShown = false - $('body').removeClass('modal-open') + openedModals.length <= 1 && $('body').removeClass('modal-open') escape.call(this) - - this.$element.removeClass('in') + + this.$element.removeClass('in focused'); openedModals.pop() $.support.transition && this.$element.hasClass('fade') ? hideWithTransition.call(this) : - hideModal.call(this) + hideModal.call(this) } } @@ -125,6 +132,7 @@ .trigger('hidden') backdrop.call(this) + var previousModal = openedModals[openedModals.length - 1]; previousModal && previousModal.addClass('focused'); } function backdrop(callback) { @@ -134,7 +142,7 @@ if (this.isShown && this.options.backdrop) { var doAnimate = $.support.transition && animate - this.$backdrop = $('
') + this.$backdrop = $('') .appendTo(document.body) if (this.options.backdrop != 'static') { @@ -170,9 +178,9 @@ var that = this if (this.isShown && this.options.keyboard) { $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() + e.which == 27 && $('.modal.focused').modal('hide') }) - } else if (!this.isShown) { + } else if (!this.isShown && openedModals.length <= 1) { $(document).off('keyup.dismiss.modal') } } diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index d5ecfa92077c..34d837bd09e7 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -92,7 +92,7 @@ $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { placement: 'right' , content: '' - , template: ' and elements
// --------------------------------------------------------
@@ -54,4 +55,5 @@ pre {
.pre-scrollable {
max-height: 340px;
overflow-y: scroll;
-}
\ No newline at end of file
+}
+}
diff --git a/less/component-animations.less b/less/component-animations.less
index da1f2e535058..b5a105954bfb 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -1,7 +1,8 @@
+.su_bootstrap_safe {
// COMPONENT ANIMATIONS
// --------------------
-.fade {
+&.fade, .fade {
.opacity(0);
.transition(opacity .15s linear);
&.in {
@@ -17,4 +18,5 @@
&.in {
height: auto;
}
-}
\ No newline at end of file
+}
+}
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 6c60385e553e..d3520d86ce19 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// DROPDOWN MENUS
// --------------
@@ -141,3 +142,4 @@
margin-top: 2px; // give it some space to breathe
.border-radius(4px);
}
+}
diff --git a/less/forms.less b/less/forms.less
index 7d967c6b3dbb..d927a7663989 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// Forms.less
// Base styles for various input types, form layouts, and states
// -------------------------------------------------------------
@@ -582,3 +583,4 @@ legend + .control-group {
padding-left: 160px;
}
}
+}
diff --git a/less/grid.less b/less/grid.less
index e62a960932f5..673ace68e816 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -1,5 +1,7 @@
+.su_bootstrap_safe {
// Fixed (940px)
#grid > .core(@gridColumnWidth, @gridGutterWidth);
// Fluid (940px)
-#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
\ No newline at end of file
+#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
+}
diff --git a/less/hero-unit.less b/less/hero-unit.less
index 0ffe82962a01..2df3f20e1de8 100644
--- a/less/hero-unit.less
+++ b/less/hero-unit.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// HERO UNIT
// ---------
@@ -20,3 +21,4 @@
color: @heroUnitLeadColor;
}
}
+}
diff --git a/less/labels-badges.less b/less/labels-badges.less
index 0fbd7bbc61df..04dbc2c64e15 100644
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// LABELS & BADGES
// ---------------
@@ -53,3 +54,4 @@ a {
&-inverse { background-color: @grayDark; }
&-inverse[href] { background-color: darken(@grayDark, 10%); }
}
+}
diff --git a/less/layouts.less b/less/layouts.less
index cc53627ff74c..b842e5b728c3 100644
--- a/less/layouts.less
+++ b/less/layouts.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
//
// Layouts
// Fixed-width and fluid (with sidebar) layouts
@@ -14,4 +15,5 @@
padding-right: @gridGutterWidth;
padding-left: @gridGutterWidth;
.clearfix();
-}
\ No newline at end of file
+}
+}
diff --git a/less/mixins.less b/less/mixins.less
index b107955f57b7..c1609b6fd098 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -101,6 +101,7 @@
// CSS image replacement
// -------------------------
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+.su_bootstrap_safe {
.hide-text {
font: 0/0 a;
color: transparent;
@@ -108,6 +109,7 @@
background-color: transparent;
border: 0;
}
+}
// FONTS
@@ -149,12 +151,14 @@
// --------------------------------------------------
// Block level inputs
+.su_bootstrap_safe {
.input-block-level {
display: block;
width: 100%;
min-height: 28px; // Make inputs at least the height of their button counterpart
.box-sizing(border-box); // Makes inputs behave like true block-level elements
}
+}
// Mixin for form field states
@@ -590,7 +594,7 @@
width: 100%;
.clearfix();
[class*="span"] {
- .input-block-level();
+ .su_bootstrap_safe .input-block-level();
float: left;
margin-left: @fluidGridGutterWidth;
*margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
diff --git a/less/modals.less b/less/modals.less
index 870ad0dfe677..ca4fb906cbf0 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -3,14 +3,17 @@
// Recalculate z-index where appropriate
.modal-open {
+.su_bootstrap_safe {
.dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
.dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
- .popover { z-index: @zindexPopover + @zindexModal; }
- .tooltip { z-index: @zindexTooltip + @zindexModal; }
+ &.popover { z-index: @zindexPopover + @zindexModal; }
+ &.tooltip { z-index: @zindexTooltip + @zindexModal; }
+}
}
// Background
-.modal-backdrop {
+.su_bootstrap_safe {
+&.modal-backdrop {
position: fixed;
top: 0;
right: 0;
@@ -22,13 +25,13 @@
&.fade { opacity: 0; }
}
-.modal-backdrop,
-.modal-backdrop.fade.in {
+&.modal-backdrop,
+&.modal-backdrop.fade.in {
.opacity(80);
}
// Base modal
-.modal {
+&.modal {
position: fixed;
top: 50%;
left: 50%;
@@ -88,3 +91,4 @@
margin-left: -1px;
}
}
+}
diff --git a/less/navbar.less b/less/navbar.less
index adfe1096a48f..d08093ddcc7b 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// NAVBAR (FIXED AND STATIC)
// -------------------------
@@ -361,4 +362,5 @@
left: auto;
right: 13px;
}
-}
\ No newline at end of file
+}
+}
diff --git a/less/navs.less b/less/navs.less
index 5cb9f9f3a2e6..e329e47ce5a4 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// NAVIGATIONS
// -----------
@@ -361,3 +362,4 @@
border-color: #ddd #ddd #ddd transparent;
*border-left-color: @white;
}
+}
diff --git a/less/pager.less b/less/pager.less
index 4244b5eb8098..3a24ca02e889 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// PAGER
// -----
@@ -33,4 +34,5 @@
color: @grayLight;
background-color: #fff;
cursor: default;
-}
\ No newline at end of file
+}
+}
diff --git a/less/pagination.less b/less/pagination.less
index 38cf65cc44e2..8845ee5dd555 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// PAGINATION
// ----------
@@ -54,3 +55,4 @@
.pagination-right {
text-align: right;
}
+}
diff --git a/less/popovers.less b/less/popovers.less
index 558d99ec9990..37aab1fb33ed 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -1,7 +1,8 @@
+.su_bootstrap_safe {
// POPOVERS
// --------
-.popover {
+&.popover {
position: absolute;
top: 0;
left: 0;
@@ -47,3 +48,4 @@
margin-bottom: 0;
}
}
+}
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 3b47e64828f6..1c9f9b0ecce8 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// PROGRESS BARS
// -------------
@@ -115,3 +116,4 @@
.progress-warning.progress-striped .bar {
#gradient > .striped(lighten(@orange, 15%));
}
+}
diff --git a/less/reset.less b/less/reset.less
index d9ce2b110768..35d3fc1bd869 100644
--- a/less/reset.less
+++ b/less/reset.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// Reset.less
// Adapted from Normalize.css http://github.com/necolas/normalize.css
// ------------------------------------------------------------------------
@@ -124,3 +125,4 @@ textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser
}
+}
diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less
index a7c9f4e004a3..75b42f283f33 100644
--- a/less/responsive-1200px-min.less
+++ b/less/responsive-1200px-min.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// LARGE DESKTOP & UP
// ------------------
@@ -24,3 +25,4 @@
}
}
+}
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index 614c6905c2d6..b40da5e78ea1 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// UP TO LANDSCAPE PHONE
// ---------------------
@@ -135,7 +136,7 @@
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
- .input-block-level();
+ .su_bootstrap_safe .input-block-level();
}
// But don't let it screw up prepend/append inputs
.input-prepend input,
@@ -147,3 +148,4 @@
}
}
+}
diff --git a/less/responsive-768px-979px.less b/less/responsive-768px-979px.less
index 76f4f6df1504..42acf45f6dc8 100644
--- a/less/responsive-768px-979px.less
+++ b/less/responsive-768px-979px.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// PORTRAIT TABLET TO DEFAULT DESKTOP
// ----------------------------------
@@ -15,3 +16,4 @@
// No need to reset .thumbnails here since it's the same @gridGutterWidth
}
+}
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index d49b8ae12d87..f10f49fe8025 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -1,6 +1,7 @@
+.su_bootstrap_safe {
// TABLETS AND BELOW
// -----------------
-@media (max-width: 979px) {
+@media (max-width: 767px) {
// UNFIX THE TOPBAR
// ----------------
@@ -138,9 +139,10 @@
// ---------------
// Required to make the collapsing navbar work on regular desktops
-@media (min-width: 980px) {
+@media (min-width: 768px) {
.nav-collapse.collapse {
height: auto !important;
overflow: visible !important;
}
-}
\ No newline at end of file
+}
+}
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
index 572846c0fadb..5341d1de073b 100644
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// RESPONSIVE CLASSES
// ------------------
@@ -39,3 +40,4 @@
.hidden-desktop { display: inherit !important; }
.visible-desktop { display: none !important ; }
}
+}
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 57c74eda074e..70a959b3ed98 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// Scaffolding
// Basic and global styles for generating a grid system, structural layout, and page templates
// -------------------------------------------------------------------------------------------
@@ -20,10 +21,11 @@ body {
// -----
a {
- color: @linkColor;
+ //color: @linkColor;
text-decoration: none;
}
a:hover {
- color: @linkColorHover;
+ //color: @linkColorHover;
text-decoration: underline;
}
+}
diff --git a/less/sprites.less b/less/sprites.less
index 72a3a916b65f..5c1b13decc8d 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// SPRITES
// Glyphs and icons for buttons, nav, and more
// -------------------------------------------
@@ -189,3 +190,4 @@
+}
diff --git a/less/tables.less b/less/tables.less
index b4f6027bf969..863ee331e2f8 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
//
// Tables.less
// Tables for, you guessed it, tabular data
@@ -174,3 +175,4 @@ table {
.span23 { .tableColumns(23); }
.span24 { .tableColumns(24); }
}
+}
diff --git a/less/thumbnails.less b/less/thumbnails.less
index aa69f8e33dbb..53c1fc91dc45 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// THUMBNAILS
// ----------
// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
@@ -45,3 +46,4 @@ a.thumbnail:hover {
.thumbnail .caption {
padding: 9px;
}
+}
diff --git a/less/tooltip.less b/less/tooltip.less
index 5111a193f039..a9cf52b8a45e 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -1,7 +1,8 @@
+.su_bootstrap_safe {
// TOOLTIP
// ------=
-.tooltip {
+&.tooltip {
position: absolute;
z-index: @zindexTooltip;
display: block;
@@ -33,3 +34,4 @@
width: 0;
height: 0;
}
+}
diff --git a/less/type.less b/less/type.less
index 0d562193406b..1c85c27e0b9b 100644
--- a/less/type.less
+++ b/less/type.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// Typography.less
// Headings, body text, lists, code, and more for a versatile and durable typography system
// ----------------------------------------------------------------------------------------
@@ -233,3 +234,4 @@ small {
cite {
font-style: normal;
}
+}
diff --git a/less/utilities.less b/less/utilities.less
index d60d22031199..92b1a72a45fe 100644
--- a/less/utilities.less
+++ b/less/utilities.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// UTILITY CLASSES
// ---------------
@@ -21,3 +22,4 @@
.invisible {
visibility: hidden;
}
+}
diff --git a/less/wells.less b/less/wells.less
index 9300061a5084..7646bb594189 100644
--- a/less/wells.less
+++ b/less/wells.less
@@ -1,3 +1,4 @@
+.su_bootstrap_safe {
// WELLS
// -----
@@ -25,3 +26,4 @@
padding: 9px;
.border-radius(3px);
}
+}