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
7,262 Commits 13 Branches 16 Tags
bafef3dcd9740bd252bd4bb2beb0de6103e1b222
Commit Graph

7262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnold Daniels
bafef3dcd9 Merge pull request #368 from dvc94ch/meteor-integration 
Meteor integration.
 2015-08-07 17:17:14 +02:00
Arnold Daniels
1c2fde09a0 Merge pull request #342 from brandoncc/patch-1 
Fix typo
 2015-08-07 17:16:13 +02:00
Arnold Daniels
12c88aaa00 Merge pull request #354 from Dehalion/master 
trigger clear.bs.fileinput event if user cancels
 2015-08-07 16:48:30 +02:00
Arnold Daniels
5779e70db7 Merge remote-tracking branch 'origin/master' 
Conflicts:
	js/wizard.js
 2015-08-07 16:45:40 +02:00
Arnold Daniels
4408405009 Merge pull request #346 from ipoval/whitespace-gardening 
[whitespace gardening] - rm trailing whitespaces
 2015-08-07 16:43:47 +02:00
Arnold Daniels
51f8c89ac8 Using latest packages for grunt 
Renamed jscs.json to jscsrc
Fixed styling errors in build js files
 2015-08-07 16:41:05 +02:00
Arnold Daniels
61c769a626 Revert "Added Wizard component (not yet documented)" 
This reverts commit f96d55965a.
 2015-08-07 16:22:53 +02:00
Arnold Daniels
e8b4cca929 Removed bower dependencies. 
Fixes #394

Added bootstrap as dev-dependency
Removed jQuery dependency

People might use the SASS instead of LESS and/or might use the CSS only and not the JavaScript
 2015-08-07 16:21:30 +02:00
Arnold Daniels
0efdeef8d4 Merge pull request #397 from asessa/patch-1 
Fix fileinput-filename
 2015-08-07 16:09:12 +02:00
Arnold Daniels
8a3ffced0b Merge pull request #376 from kkirsche/patch-1 
Remove moot `version` property from bower.json
 2015-08-07 16:08:24 +02:00
Arnold Daniels
843c8241e7 Travis Run npm install 2015-08-07 15:34:51 +02:00
Arnold Daniels
49a7ece11e Ignore bower_components 2015-08-07 15:34:51 +02:00
Bas Bosman
b02b71c0e6 Update javascript.html 2015-08-07 15:34:51 +02:00
hinnerk
dd49087566 silent html5 validation problems 
- deprecation notice of w3 service causes build to fail (upstream issue: https://github.com/praveenvijayan/grunt-html-validation/issues/76)
- should ampersand be escaped in url parameters? opinions differ; current practice in docs is not to escape URL parameter ampersands, and this need not cause the build to fail
 2015-08-07 15:34:51 +02:00
hinnerk
95da80b103 remove duplicate box-shadow from docs #carbonads 2015-08-07 15:34:51 +02:00
Andrea Sessa
a79b8f14d3 Fix fileinput-filename 2015-07-16 16:22:00 +02:00
Kevin Kirsche
7e5ab5d7f5 Remove moot version property from bower.json 
Per bower/bower.json-spec@a325da3

Also their maintainer says they probably won't ever use it: http://stackoverflow.com/questions/24844901/bowers-bower-json-file-version-property
 2015-06-11 21:18:51 -04:00
David Craven
0628cee6d7 Meteor integration. 2015-05-16 15:22:56 +02:00
Dehalion
cb97fb59be trigger clear.bs.fileinput event if user cancels 
this.clear() expects the event object as parameter otherwise it won't trigger the 'clear.bs.fileinput' event
so we have to trigger it ourselves
 2015-03-23 15:23:42 +01:00
Dehalion
ff935c396c give e as parameter for this.clear() 
this.clear() expects the event object as parameter if it is triggered by the user
otherwise it won't trigger the 'clear.bs.fileinput' event
 2015-03-23 15:10:21 +01:00
Ivan Povalyukhin
283e237cee [whitespace gardening] - rm trailing whitespaces 2015-03-01 13:45:55 -08:00
Brandon Conway
3e0aefdf90 Fix typo 2015-02-16 01:46:54 -08:00
Arnold Daniels
f96d55965a Added Wizard component (not yet documented) 2015-02-11 18:10:21 +01:00
Arnold Daniels
7b28b14c80 Docs: Replaced AboutMe with carbonads 
CSS fix docs home page
 2015-01-23 11:24:07 +01:00
Arnold Daniels
75b0c88693 Merge pull request #332 from eneveu/master 
Fix small typo in the website
 2015-01-15 15:48:01 +01:00
Etienne Neveu
1a2bb62b5f Fix small typo 
"jasn-bootstrap.min.js" --> "jasny-bootstrap.min.js"
 2015-01-15 14:59:29 +01:00
Arnold Daniels
5925040bf2 Merge pull request #329 from samuelscheid/master 
Fix jasny/bootstrap#279
 2014-12-31 17:43:36 +01:00
samuelscheid
30b22685cd Fix jasny/bootstrap#279 
Sass port turned declaration into mixin, without leaving the declaration. Added the declaration back in.
 2014-12-31 11:34:58 -05:00
Arnold Daniels
828bdbf4d2 Merge pull request #322 from Kronuz/patch-1 
Navmenu on the right with scrollbar
 2014-12-27 11:59:40 +01:00
Germán M. Bravo
f37278b371 Navmenu on the right with scrollbar 
Offcanvas navmenu fixed to the right had no overflow-y, so no scrollbars where shown
 2014-12-01 08:44:14 -06:00
Arnold Daniels
02c281bbf0 Merge pull request #303 from jodytate/patch-1 
typo: spelling fix for 'intended'
 2014-10-09 00:38:30 +02:00
jody tate
9dc14167d1 typo: spelling fix for 'intended' 2014-10-07 10:30:55 -07:00
Arnold Daniels
72d948a8eb Merge pull request #286 from cvrebert/master 
"Twitter Bootstrap" is now simply "Bootstrap"
 2014-08-11 21:01:31 +02:00
Chris Rebert
6c47ebecf6 "Twitter Bootstrap" is now simply "Bootstrap" 
See http://getbootstrap.com/about/#brand
Changed references to "Twitter Bootstrap" to "vanilla Bootstrap" or just "Bootstrap".
 2014-08-11 10:04:50 -07:00
Chris Rebert
9e1d6be08e update requirement in composer.json 
twitter/bootstrap => twbs/bootstrap
 2014-08-11 09:57:34 -07:00
Arnold Daniels
1dc7d44daf Merge pull request #285 from daftspunk/patch-1 
Allow touching in the offcanvas area
 2014-08-07 23:21:52 +02:00
Samuel Georges
54a950138d Allow touching in the offcanvas area 2014-08-07 20:37:43 +10:00
Arnold Daniels
45fbc321e9 Improved README 
Added CDNJS
Replace JS Bin with JSFiddle
 2014-07-24 03:44:51 +02:00
Arnold Daniels
c5a39941e0 Fixed download link and bower instructions in README 2014-07-24 03:37:28 +02:00
Arnold Daniels
31c575c568 Merge branch 'master' of github.com:jasny/bootstrap 2014-07-24 01:20:50 +02:00
Arnold Daniels
071b04b16f Merge pull request #276 from arekkas/patch-3 
Sass: Solves an issue with groups and rounded borders
 2014-07-20 21:51:47 +02:00
Arnold Daniels
758d5f2a06 Merge pull request #277 from arekkas/patch-2 
Less: Solves an issue with groups and rounded borders
 2014-07-20 21:50:43 +02:00
Arnold Daniels
1d5a7589b8 Merge pull request #274 from arekkas/patch-1 
Removed scss import of non existing mixin
 2014-07-20 21:48:45 +02:00
arekkas
ca19e02b17 Sass: Solves an issue with groups and rounded borders 2014-07-20 16:20:10 +02:00
arekkas
b000850500 Less: Solves an issue with groups and rounded borders 2014-07-20 16:20:04 +02:00
arekkas
2bc3e6f3dc See #231 2014-07-17 11:35:00 +02:00
Arnold Daniels
574034791d Merge pull request #269 from mente/modal 
Offcanvas: prevent scrolling on mobiles + modal option
 2014-07-03 09:10:00 +02:00
Alex Vasilenko
dded81671a hide menu on backdrop click 2014-07-02 16:44:22 +03:00
Alex Vasilenko
473a741ede prevent scrolling on mobiles 
modal backdrop option for offcanvas
 2014-07-02 14:22:46 +03:00
Arnold Daniels
02d43b36d0 Merge pull request #261 from tjagusz/master 
fix for #252 - input with input maske doesn't get updated
 2014-06-27 12:58:03 +02:00