Permalink
Browse files

Neue Version: v3.3.5

  • Loading branch information...
1 parent 71438a9 commit 0a99bc4c4adab7bda825b376fdc6a1fa7c20215f @juthilo committed Jun 16, 2015
View
@@ -24,7 +24,7 @@ Um direkt loszulegen, geh auf <http://holdirbootstrap.de>!
Es sind einige Optionen verfügbar, um direkt loszulegen:
-- [Neueste Version herunterladen](https://github.com/twbs/bootstrap/archive/v3.3.4.zip).
+- [Neueste Version herunterladen](https://github.com/twbs/bootstrap/archive/v3.3.5.zip).
- Repository klonen: `git clone https://github.com/twbs/bootstrap.git`.
- Mit [Bower](http://bower.io) installieren: `bower install bootstrap`.
- Mit [npm](https://www.npmjs.com) installieren: `npm install bootstrap`.
View
@@ -19,19 +19,19 @@ exclude:
- vendor
# Custom vars
-current_version: 3.3.4
+current_version: 3.3.5
repo: https://github.com/twbs/bootstrap
sass_repo: https://github.com/twbs/bootstrap-sass
download:
- source: https://github.com/twbs/bootstrap/archive/v3.3.4.zip
- dist: https://github.com/twbs/bootstrap/releases/download/v3.3.4/bootstrap-3.3.4-dist.zip
- sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.4.tar.gz
+ source: https://github.com/twbs/bootstrap/archive/v3.3.5.zip
+ dist: https://github.com/twbs/bootstrap/releases/download/v3.3.5/bootstrap-3.3.5-dist.zip
+ sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.5.tar.gz
blog: http://blog.getbootstrap.com
expo: http://expo.getbootstrap.com
cdn:
- 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
+ css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css
+ css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css
+ js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js
Oops, something went wrong.
@@ -1,60 +0,0 @@
-/**
-* Store the link icon as a base64 embedded icon font.
-*/
-@font-face {
- font-family: 'anchorjs-link';
- src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMg6v8yoAAAC8AAAAYGNtYXDL8RqdAAABHAAAADxnYXNwAAAAEAAAAVgAAAAIZ2x5Zkm2oNUAAAFgAAABWGhlYWQAHd4cAAACuAAAADZoaGVhB3sECwAAAvAAAAAkaG10eAYAAEcAAAMUAAAADGxvY2EACgCsAAADIAAAAAhtYXhwAAYAcAAAAygAAAAgbmFtZUQXtNYAAANIAAABOXBvc3QAAwAAAAAEhAAAACAAAwQAAZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAACDmAAPA/8D/wAPAAEAAAAAAAAAAAAAAAAAAAAAgAAAAAAACAAAAAwAAABQAAwABAAAAFAAEACgAAAAGAAQAAQACACDmAP//AAAAIOYA////4RoCAAEAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAIARwAHA7kDeQA2AG0AAAEnLgEiBg8BDgEUFh8BHgMXNy4DLwEuATQ2PwE+ATIWHwEeARQGDwEeAxU3PgE0JicBLgMnBx4DHwEeARQGDwEOASImLwEuATQ2PwEuAzUHDgEUFh8BHgEyNj8BPgE0Ji8BA7kEI1ldWiPaIyQkIwQDBgYGBFAEBwYHAwQTExMT2xMwMjETBBMTExNjBwkGA5gkIyMk/r4DBgYGBFAEBwYHAwQTExMT2xMwMjETBBMTExNjBwkGA5gkIyMkBCNZXVoj2iMkJCMEA3UEJCMjJNojWV1aIwQDBgUFA1ACBQUFAwQUMDIxE9oTExMTBBMxMjATYxAhISIRmSNaXVkj/sYDBgUFA1ACBQUFAwQUMDIxE9oTExMTBBMxMjATYxAhISIRmSNaXVkjBCQjIyTaI1ldWiMEAAEAAAABAABR/4xQXw889QALBAAAAAAAzqNM0wAAAADOo0zTAAAAAAO5A3kAAAAIAAIAAAAAAAAAAQAAA8D/wAAABAAAAABHA7kAAQAAAAAAAAAAAAAAAAAAAAMAAAAAAgAAAAQAAEcAAAAAAAoArAABAAAAAwBuAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAADgCuAAEAAAAAAAEADgAAAAEAAAAAAAIADgBHAAEAAAAAAAMADgAkAAEAAAAAAAQADgBVAAEAAAAAAAUAFgAOAAEAAAAAAAYABwAyAAEAAAAAAAoAKABjAAMAAQQJAAEADgAAAAMAAQQJAAIADgBHAAMAAQQJAAMADgAkAAMAAQQJAAQADgBVAAMAAQQJAAUAFgAOAAMAAQQJAAYADgA5AAMAAQQJAAoAKABjAGkAYwBvAG0AbwBvAG4AVgBlAHIAcwBpAG8AbgAgADAALgAwAGkAYwBvAG0AbwBvAG5pY29tb29uAGkAYwBvAG0AbwBvAG4AUgBlAGcAdQBsAGEAcgBpAGMAbwBtAG8AbwBuAEcAZQBuAGUAcgBhAHQAZQBkACAAYgB5ACAASQBjAG8ATQBvAG8AbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('truetype'),
- url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAATwAAsAAAAABKQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgDq/zKmNtYXAAAAFoAAAAPAAAADzL8RqdZ2FzcAAAAaQAAAAIAAAACAAAABBnbHlmAAABrAAAAVgAAAFYSbag1WhlYWQAAAMEAAAANgAAADYAHd4caGhlYQAAAzwAAAAkAAAAJAd7BAtobXR4AAADYAAAAAwAAAAMBgAAR2xvY2EAAANsAAAACAAAAAgACgCsbWF4cAAAA3QAAAAgAAAAIAAGAHBuYW1lAAADlAAAATkAAAE5RBe01nBvc3QAAATQAAAAIAAAACAAAwAAAAMEAAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAg5gADwP/A/8ADwABAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAgAAAAMAAAAUAAMAAQAAABQABAAoAAAABgAEAAEAAgAg5gD//wAAACDmAP///+EaAgABAAAAAAAAAAEAAf//AA8AAQAAAAAAAAAAAAIAADc5AQAAAAACAEcABwO5A3kANgBtAAABJy4BIgYPAQ4BFBYfAR4DFzcuAy8BLgE0Nj8BPgEyFh8BHgEUBg8BHgMVNz4BNCYnAS4DJwceAx8BHgEUBg8BDgEiJi8BLgE0Nj8BLgM1Bw4BFBYfAR4BMjY/AT4BNCYvAQO5BCNZXVoj2iMkJCMEAwYGBgRQBAcGBwMEExMTE9sTMDIxEwQTExMTYwcJBgOYJCMjJP6+AwYGBgRQBAcGBwMEExMTE9sTMDIxEwQTExMTYwcJBgOYJCMjJAQjWV1aI9ojJCQjBAN1BCQjIyTaI1ldWiMEAwYFBQNQAgUFBQMEFDAyMRPaExMTEwQTMTIwE2MQISEiEZkjWl1ZI/7GAwYFBQNQAgUFBQMEFDAyMRPaExMTEwQTMTIwE2MQISEiEZkjWl1ZIwQkIyMk2iNZXVojBAABAAAAAQAAUf+MUF8PPPUACwQAAAAAAM6jTNMAAAAAzqNM0wAAAAADuQN5AAAACAACAAAAAAAAAAEAAAPA/8AAAAQAAAAARwO5AAEAAAAAAAAAAAAAAAAAAAADAAAAAAIAAAAEAABHAAAAAAAKAKwAAQAAAAMAbgACAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAA4AAAABAAAAAAACAA4ARwABAAAAAAADAA4AJAABAAAAAAAEAA4AVQABAAAAAAAFABYADgABAAAAAAAGAAcAMgABAAAAAAAKACgAYwADAAEECQABAA4AAAADAAEECQACAA4ARwADAAEECQADAA4AJAADAAEECQAEAA4AVQADAAEECQAFABYADgADAAEECQAGAA4AOQADAAEECQAKACgAYwBpAGMAbwBtAG8AbwBuAFYAZQByAHMAaQBvAG4AIAAwAC4AMABpAGMAbwBtAG8AbwBuaWNvbW9vbgBpAGMAbwBtAG8AbwBuAFIAZQBnAHUAbABhAHIAaQBjAG8AbQBvAG8AbgBHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4AAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==) format('woff');
- font-weight: normal;
- font-style: normal;
-}
-
-.anchorjs-icon {
- font-family: 'anchorjs-link';
- speak: none;
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
-
- /* Better Icon Rendering */
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-/**
-* Link placement and hover behavior.
-*/
-.anchorjs-link {
- float: left;
- width: 1em;
- height: 1em;
- margin-left: -1.2em;
- opacity: 0;
- color: inherit;
- text-align: center;
-}
-
-@media (max-width: 480px) {
- .anchorjs-link {
- display: none;
- }
-}
-
-*:hover > .anchorjs-link,
-.anchorjs-link:focus {
- opacity: .75;
- transition: color .16s linear;
-}
-*:hover > .anchorjs-link:hover {
- opacity: 1;
- text-decoration: none;
-}
-.anchorjs-icon {
- font-size: 60%;
- vertical-align: .2em;
-}
-.anchorjs-icon:before {
- content: "\e600";
-}
@@ -1,8 +1,8 @@
/*!
* Bootstrap Docs (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
- * details, see http://creativecommons.org/licenses/by/3.0/.
+ * details, see https://creativecommons.org/licenses/by/3.0/.
*/
@@ -236,7 +236,7 @@ h4 code {
.bs-docs-masthead,
.bs-docs-header {
position: relative;
- padding: 30px 15px;
+ padding: 30px 0;
color: #cdbfe3;
text-align: center;
text-shadow: 0 1px 0 rgba(0,0,0,.1);
@@ -356,7 +356,7 @@ h4 code {
width: auto !important;
height: auto !important;
padding: 20px !important;
- margin: 30px -30px -31px !important;
+ margin: 30px -15px -31px !important;
overflow: hidden; /* clearfix */
font-size: 13px !important;
line-height: 16px !important;
@@ -1595,6 +1595,31 @@ h1[id] {
}
}
+/*
+ * AnchorJS Styles
+ */
+.anchorjs-link {
+ color: inherit;
+}
+
+@media (max-width: 480px) {
+ .anchorjs-link {
+ display: none;
+ }
+}
+
+*:hover > .anchorjs-link {
+ opacity: .75;
+ -webkit-transition: color .16s linear;
+ -o-transition: color .16s linear;
+ transition: color .16s linear;
+}
+
+*:hover > .anchorjs-link:hover,
+.anchorjs-link:focus {
+ text-decoration: none;
+ opacity: 1;
+}
/*
* Miscellaneous
Oops, something went wrong.
View
Oops, something went wrong.
@@ -2,10 +2,10 @@
// IT'S JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2014-2015 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
- * details, see http://creativecommons.org/licenses/by/3.0/.
+ * details, see https://creativecommons.org/licenses/by/3.0/.
*/
// Intended to prevent false-positive bug reports about Bootstrap not working properly in old versions of IE due to folks testing using IE's unreliable emulation modes.
(function () {
@@ -23,8 +23,8 @@
function actualNonEmulatedIEMajorVersion() {
// Detects the actual version of IE in use, even if it's in an older-IE emulation mode.
- // IE JavaScript conditional compilation docs: http://msdn.microsoft.com/en-us/library/ie/121hztk3(v=vs.94).aspx
- // @cc_on docs: http://msdn.microsoft.com/en-us/library/ie/8ka90k2e(v=vs.94).aspx
+ // IE JavaScript conditional compilation docs: https://msdn.microsoft.com/library/121hztk3%28v=vs.94%29.aspx
+ // @cc_on docs: https://msdn.microsoft.com/library/8ka90k2e%28v=vs.94%29.aspx
var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')() // jshint ignore:line
if (jscriptVersion === undefined) {
return 11 // IE11+ not in emulation mode
@@ -1,15 +1,15 @@
/*!
* IE10 viewport hack for Surface/desktop Windows 8 bug
- * Copyright 2014 Twitter, Inc.
- * Licensed under the Creative Commons Attribution 3.0 Unported License. For
- * details, see http://creativecommons.org/licenses/by/3.0/.
+ * Copyright 2014-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
// See the Getting Started docs for more information:
// http://getbootstrap.com/getting-started/#support-ie10-width
(function () {
'use strict';
+
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
var msViewportStyle = document.createElement('style')
msViewportStyle.appendChild(
@@ -19,4 +19,5 @@
)
document.querySelector('head').appendChild(msViewportStyle)
}
+
})();
@@ -2,10 +2,10 @@
// IT'S JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
- * details, see http://creativecommons.org/licenses/by/3.0/.
+ * details, see https://creativecommons.org/licenses/by/3.0/.
*/
// Intended to prevent false-positive bug reports about responsive styling supposedly not working in IE8.
if (window.location.protocol == 'file:') {
Oops, something went wrong.
@@ -4,12 +4,12 @@
/*!
* JavaScript for Bootstrap's docs (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
- * details, see http://creativecommons.org/licenses/by/3.0/.
+ * details, see https://creativecommons.org/licenses/by/3.0/.
*/
-/* global ZeroClipboard, addAnchors */
+/* global ZeroClipboard, anchors */
!function ($) {
'use strict';
@@ -58,26 +58,26 @@
// theme toggler
;(function () {
- var stylesheetLink = $('#bs-theme-stylesheet')
- var themeBtn = $('.bs-docs-theme-toggle')
+ var $stylesheetLink = $('#bs-theme-stylesheet')
+ var $themeBtn = $('.bs-docs-theme-toggle')
var activateTheme = function () {
- stylesheetLink.attr('href', stylesheetLink.attr('data-href'))
- themeBtn.text('Theme-Preview deaktivieren')
+ $stylesheetLink.attr('href', $stylesheetLink.attr('data-href'))
+ $themeBtn.text('Theme-Vorschau deaktivieren')
localStorage.setItem('previewTheme', true)
}
if (localStorage.getItem('previewTheme')) {
activateTheme()
}
- themeBtn.click(function () {
- var href = stylesheetLink.attr('href')
+ $themeBtn.click(function () {
+ var href = $stylesheetLink.attr('href')
if (!href || href.indexOf('data') === 0) {
activateTheme()
} else {
- stylesheetLink.attr('href', '')
- themeBtn.text('Theme-Preview aktivieren')
+ $stylesheetLink.attr('href', '')
+ $themeBtn.text('Theme-Vorschau aktivieren')
localStorage.removeItem('previewTheme')
}
})
@@ -102,22 +102,22 @@
// Button state demo
$('#loading-example-btn').on('click', function () {
- var btn = $(this)
- btn.button('loading')
+ var $btn = $(this)
+ $btn.button('loading')
setTimeout(function () {
- btn.button('reset')
+ $btn.button('reset')
}, 3000)
})
// Modal relatedTarget demo
$('#exampleModal').on('show.bs.modal', function (event) {
- var button = $(event.relatedTarget) // Button that triggered the modal
- var recipient = button.data('whatever') // Extract info from data-* attributes
+ var $button = $(event.relatedTarget) // Button that triggered the modal
+ var recipient = $button.data('whatever') // Extract info from data-* attributes
// If necessary, you could initiate an AJAX request here (and then do the updating in a callback).
// Update the modal's content. We'll use jQuery here, but you could use a data binding library or other methods instead.
- var modal = $(this)
- modal.find('.modal-title').text('Neue Nachricht an ' + recipient)
- modal.find('.modal-body input').val(recipient)
+ var $modal = $(this)
+ $modal.find('.modal-title').text('Neue Nachricht an ' + recipient)
+ $modal.find('.modal-body input').val(recipient)
})
// Activate animated progress bar
@@ -137,38 +137,38 @@
$(this).before(btnHtml)
})
var zeroClipboard = new ZeroClipboard($('.btn-clipboard'))
- var htmlBridge = $('#global-zeroclipboard-html-bridge')
+ var $htmlBridge = $('#global-zeroclipboard-html-bridge')
// Handlers for ZeroClipboard
zeroClipboard.on('load', function () {
- htmlBridge
+ $htmlBridge
.data('placement', 'top')
.attr('title', 'Copy to clipboard')
.tooltip()
- })
- // Copy to clipboard
- zeroClipboard.on('dataRequested', function (client) {
- var highlight = $(this).parent().nextAll('.highlight').first()
- client.setText(highlight.text())
- })
- // Notify copy success and reset tooltip title
- zeroClipboard.on('complete', function () {
- htmlBridge
- .attr('title', 'Copied!')
- .tooltip('fixTitle')
- .tooltip('show')
- .attr('title', 'Copy to clipboard')
- .tooltip('fixTitle')
+ // Copy to clipboard
+ zeroClipboard.on('dataRequested', function (client) {
+ var highlight = $(this).parent().nextAll('.highlight').first()
+ client.setText(highlight.text())
+ })
+
+ // Notify copy success and reset tooltip title
+ zeroClipboard.on('complete', function () {
+ $htmlBridge
+ .attr('title', 'Copied!')
+ .tooltip('fixTitle')
+ .tooltip('show')
+ .attr('title', 'Copy to clipboard')
+ .tooltip('fixTitle')
+ })
})
- // Notify copy failure
+ // Hide copy button when no Flash is found
+ // or wrong Flash version is present
zeroClipboard.on('noflash wrongflash', function () {
- htmlBridge
- .attr('title', 'Flash required')
- .tooltip('fixTitle')
- .tooltip('show')
+ $('.zero-clipboard').remove()
+ ZeroClipboard.destroy()
})
})
@@ -177,5 +177,7 @@
;(function () {
'use strict';
- addAnchors('.bs-docs-container h1, .bs-docs-container h2, .bs-docs-container h3, .bs-docs-container h4, .bs-docs-container h5');
+
+ anchors.options.placement = 'left';
+ anchors.add('.bs-docs-section > h1, .bs-docs-section > h2, .bs-docs-section > h3, .bs-docs-section > h4, .bs-docs-section > h5')
})();
Oops, something went wrong.

0 comments on commit 0a99bc4

Please sign in to comment.