github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed git merge comment from javascript doc

Browse Source
This commit is contained in:
Arnold Daniels
2012-03-28 01:30:34 +02:00
parent f921fd0861
commit 67f39e1a79
12 changed files with 138 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

5
docs/assets/css/bootstrap.css vendored
View File

@@ -687,7 +687,8 @@ input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
.uneditable-input,
.uneditable-textarea {
float: none;
margin-left: 0;
}
@@ -1000,7 +1001,7 @@ textarea.editor-ckeditor {
padding-left: 5px;
}
.input-prepend, .input-append {
margin-bottom: 5px;
margin-bottom: 0px;
*zoom: 1;
}
.input-prepend:before,

15
docs/base-css.html
View File

@@ -1909,6 +1909,21 @@ on multiple lines
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/components.html
View File

@@ -1583,6 +1583,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/download.html
View File

@@ -361,6 +361,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/examples.html
View File

@@ -144,6 +144,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/index.html
View File

@@ -256,6 +256,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/javascript.html
View File

@@ -1598,6 +1598,21 @@ $('.myCarousel').carousel({
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/less.html
View File

@@ -794,6 +794,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

15
docs/scaffolding.html
View File

@@ -437,6 +437,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>

1
docs/templates/pages/javascript.mustache vendored
View File

@@ -1380,7 +1380,6 @@ $('.myCarousel').carousel({
</div>
</section>
<<<<<<< HEAD
<!-- Placeholder

15
docs/upgrading.html
View File

@@ -296,6 +296,21 @@
<script src="assets/js/bootstrap-table-href.js"></script>
<script src="assets/js/application.js"></script>
<!-- Analytics
================================================== -->
<script>
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
t.src = '//secure.gaug.es/track.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(t, s);
})();
</script>
</body>
</html>