Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0-wip: Changes to .gitignore, clearfix mixin, and search input reset #1069

Merged
merged 3 commits into from
Jan 20, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 35 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,36 @@
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
*.sass-cache

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

# Komodo
*.komodoproject
.komodotools

# Folders to ignore
.hg
.svn
.CVS
.idea

# Misc
js/min
46 changes: 13 additions & 33 deletions bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Wed Jan 18 00:34:59 PST 2012
* Date: Thu 19 Jan 2012 22:27:04 GMT
*/
html, body {
margin: 0;
Expand Down Expand Up @@ -163,7 +163,7 @@ input[type="search"] {
-moz-box-sizing: content-box;
box-sizing: content-box;
}
input[type="search"]::-webkit-search-decoration {
input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
}
textarea {
Expand All @@ -182,13 +182,11 @@ body {
width: 940px;
margin-left: auto;
margin-right: auto;
zoom: 1;
*zoom: 1;
}
.container:before, .container:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.container:after {
clear: both;
Expand All @@ -198,13 +196,11 @@ body {
min-width: 940px;
padding-left: 20px;
padding-right: 20px;
zoom: 1;
*zoom: 1;
}
.fluid-container:before, .fluid-container:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.fluid-container:after {
clear: both;
Expand Down Expand Up @@ -243,13 +239,11 @@ a:hover {
}
.row {
margin-left: -20px;
zoom: 1;
*zoom: 1;
}
.row:before, .row:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.row:after {
clear: both;
Expand Down Expand Up @@ -865,16 +859,14 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
}
.input-prepend, .input-append {
margin-bottom: 5px;
zoom: 1;
*zoom: 1;
}
.input-prepend:before,
.input-append:before,
.input-prepend:after,
.input-append:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.input-prepend:after, .input-append:after {
clear: both;
Expand Down Expand Up @@ -1610,16 +1602,14 @@ i {
background-color: #0088cc;
}
.tabs, .pills {
zoom: 1;
*zoom: 1;
}
.tabs:before,
.pills:before,
.tabs:after,
.pills:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.tabs:after, .pills:after {
clear: both;
Expand Down Expand Up @@ -1743,13 +1733,11 @@ i {
border-color: #999;
}
.tabbable {
zoom: 1;
*zoom: 1;
}
.tabbable:before, .tabbable:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.tabbable:after {
clear: both;
Expand Down Expand Up @@ -1907,7 +1895,7 @@ i {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
.navbar-search .search-query ::-webkit-input-placeholder {
.navbar-search .search-query::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
Expand Down Expand Up @@ -2135,13 +2123,11 @@ i {
margin-bottom: 18px;
list-style: none;
text-align: center;
zoom: 1;
*zoom: 1;
}
.pager:before, .pager:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.pager:after {
clear: both;
Expand Down Expand Up @@ -2237,13 +2223,11 @@ i {
-webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff;
zoom: 1;
*zoom: 1;
}
.modal-footer:before, .modal-footer:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.modal-footer:after {
clear: both;
Expand Down Expand Up @@ -2575,13 +2559,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
}
.btn-group {
position: relative;
zoom: 1;
*zoom: 1;
}
.btn-group:before, .btn-group:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.btn-group:after {
clear: both;
Expand Down Expand Up @@ -2730,13 +2712,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.thumbnails {
margin-left: -20px;
list-style: none;
zoom: 1;
*zoom: 1;
}
.thumbnails:before, .thumbnails:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
.thumbnails:after {
clear: both;
Expand Down
26 changes: 13 additions & 13 deletions bootstrap.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions lib/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@
// -------------------------
// For clearing floats like a boss h5bp.com/q
.clearfix() {
zoom: 1;
*zoom: 1;
&:before,
&:after {
display: table;
*display: inline;
content: "";
zoom: 1;
}
&:after {
clear: both;
Expand Down
5 changes: 3 additions & 2 deletions lib/reset.less
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,11 @@ input[type="search"] { // Appearance in Safari/Chrome
-moz-box-sizing: content-box;
box-sizing: content-box;
}
input[type="search"]::-webkit-search-decoration {
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
}
textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser
}
}