Skip to content
This repository has been archived by the owner on Dec 14, 2020. It is now read-only.

Commit

Permalink
update bootstrap to 2.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Schmidt committed Dec 10, 2012
1 parent 2a9154f commit 6f761bc
Show file tree
Hide file tree
Showing 7 changed files with 491 additions and 161 deletions.
37 changes: 37 additions & 0 deletions .gitignore
@@ -0,0 +1,37 @@
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.zip
*.vi
*~
*.sass-cache

# OS or Editor folders
.DS_Store
._*
Thumbs.db
.cache
.project
.settings
.tmproj
*.esproj
nbproject
*.sublime-project
*.sublime-workspace

# Komodo
*.komodoproject
.komodotools

# Folders to ignore
.hg
.svn
.CVS
.idea
node_modules
dist
9 changes: 9 additions & 0 deletions CHANGELOG.txt
Expand Up @@ -19,6 +19,15 @@ $ -> Language fix or change
- -> Removed
! -> Note

-------------------- 1.2.8 [2012-12-10] -------------------
^ Bootstrap 2.2.2 files
^ bootstrap-responsive.css
^ bootstrap.css: inkl. change path to image folder
^ glyphicons-halflings-white.png
^ glyphicons-halflings.png
^ bootstrap.js
^ bootstrap.min.js

-------------------- 1.2.7 [2012-11-19] -------------------
+ jquery-1.8.3.min.js
- jquery-1.8.2.min.js
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -15,7 +15,7 @@ Addons
------

* Modernizr 2.6.2 (http://modernizr.com)
* Twitter Bootstrap 2.2.1 (http://twitter.github.com/bootstrap/)
* Twitter Bootstrap 2.2.2 (http://twitter.github.com/bootstrap/)
* jQuery 1.8.3 (http://jquery.com)
* PIE 1.0.0 (http://css3pie.com)

Expand Down
6 changes: 5 additions & 1 deletion css/bootstrap-responsive.css
@@ -1,5 +1,5 @@
/*!
* Bootstrap Responsive v2.2.1
* Bootstrap Responsive v2.2.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand All @@ -8,6 +8,10 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/

@-ms-viewport {
width: device-width;
}

.clearfix {
*zoom: 1;
}
Expand Down

0 comments on commit 6f761bc

Please sign in to comment.