Commit c75a59e7 authored by Mark Otto's avatar Mark Otto

Merge pull request #1069 from necolas/2.0-wip

2.0-wip: Changes to .gitignore, clearfix mixin, and search input reset
parents ab8f2e27 8825443d
# Numerous always-ignore extensions
*.diff
*.err
*.orig
*.log
*.rej
*.swo
*.swp
*.vi
*~
*.sass-cache
# OS or Editor folders
.DS_Store .DS_Store
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 js/min
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * 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 { html, body {
margin: 0; margin: 0;
...@@ -163,7 +163,7 @@ input[type="search"] { ...@@ -163,7 +163,7 @@ input[type="search"] {
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
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; -webkit-appearance: none;
} }
textarea { textarea {
...@@ -182,13 +182,11 @@ body { ...@@ -182,13 +182,11 @@ body {
width: 940px; width: 940px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
zoom: 1; *zoom: 1;
} }
.container:before, .container:after { .container:before, .container:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.container:after { .container:after {
clear: both; clear: both;
...@@ -198,13 +196,11 @@ body { ...@@ -198,13 +196,11 @@ body {
min-width: 940px; min-width: 940px;
padding-left: 20px; padding-left: 20px;
padding-right: 20px; padding-right: 20px;
zoom: 1; *zoom: 1;
} }
.fluid-container:before, .fluid-container:after { .fluid-container:before, .fluid-container:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.fluid-container:after { .fluid-container:after {
clear: both; clear: both;
...@@ -243,13 +239,11 @@ a:hover { ...@@ -243,13 +239,11 @@ a:hover {
} }
.row { .row {
margin-left: -20px; margin-left: -20px;
zoom: 1; *zoom: 1;
} }
.row:before, .row:after { .row:before, .row:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.row:after { .row:after {
clear: both; clear: both;
...@@ -865,16 +859,14 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus { ...@@ -865,16 +859,14 @@ input:invalid:focus, textarea:invalid:focus, select:invalid:focus {
} }
.input-prepend, .input-append { .input-prepend, .input-append {
margin-bottom: 5px; margin-bottom: 5px;
zoom: 1; *zoom: 1;
} }
.input-prepend:before, .input-prepend:before,
.input-append:before, .input-append:before,
.input-prepend:after, .input-prepend:after,
.input-append:after { .input-append:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.input-prepend:after, .input-append:after { .input-prepend:after, .input-append:after {
clear: both; clear: both;
...@@ -1610,16 +1602,14 @@ i { ...@@ -1610,16 +1602,14 @@ i {
background-color: #0088cc; background-color: #0088cc;
} }
.tabs, .pills { .tabs, .pills {
zoom: 1; *zoom: 1;
} }
.tabs:before, .tabs:before,
.pills:before, .pills:before,
.tabs:after, .tabs:after,
.pills:after { .pills:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.tabs:after, .pills:after { .tabs:after, .pills:after {
clear: both; clear: both;
...@@ -1743,13 +1733,11 @@ i { ...@@ -1743,13 +1733,11 @@ i {
border-color: #999; border-color: #999;
} }
.tabbable { .tabbable {
zoom: 1; *zoom: 1;
} }
.tabbable:before, .tabbable:after { .tabbable:before, .tabbable:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.tabbable:after { .tabbable:after {
clear: both; clear: both;
...@@ -1907,7 +1895,7 @@ i { ...@@ -1907,7 +1895,7 @@ i {
.navbar-search .search-query :-moz-placeholder { .navbar-search .search-query :-moz-placeholder {
color: #eeeeee; color: #eeeeee;
} }
.navbar-search .search-query ::-webkit-input-placeholder { .navbar-search .search-query::-webkit-input-placeholder {
color: #eeeeee; color: #eeeeee;
} }
.navbar-search .search-query:hover { .navbar-search .search-query:hover {
...@@ -2135,13 +2123,11 @@ i { ...@@ -2135,13 +2123,11 @@ i {
margin-bottom: 18px; margin-bottom: 18px;
list-style: none; list-style: none;
text-align: center; text-align: center;
zoom: 1; *zoom: 1;
} }
.pager:before, .pager:after { .pager:before, .pager:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.pager:after { .pager:after {
clear: both; clear: both;
...@@ -2237,13 +2223,11 @@ i { ...@@ -2237,13 +2223,11 @@ i {
-webkit-box-shadow: inset 0 1px 0 #ffffff; -webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff; -moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff;
zoom: 1; *zoom: 1;
} }
.modal-footer:before, .modal-footer:after { .modal-footer:before, .modal-footer:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.modal-footer:after { .modal-footer:after {
clear: both; clear: both;
...@@ -2575,13 +2559,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2575,13 +2559,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
} }
.btn-group { .btn-group {
position: relative; position: relative;
zoom: 1; *zoom: 1;
} }
.btn-group:before, .btn-group:after { .btn-group:before, .btn-group:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.btn-group:after { .btn-group:after {
clear: both; clear: both;
...@@ -2730,13 +2712,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2730,13 +2712,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.thumbnails { .thumbnails {
margin-left: -20px; margin-left: -20px;
list-style: none; list-style: none;
zoom: 1; *zoom: 1;
} }
.thumbnails:before, .thumbnails:after { .thumbnails:before, .thumbnails:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
.thumbnails:after { .thumbnails:after {
clear: both; clear: both;
......
This diff is collapsed.
...@@ -10,13 +10,11 @@ ...@@ -10,13 +10,11 @@
// ------------------------- // -------------------------
// For clearing floats like a boss h5bp.com/q // For clearing floats like a boss h5bp.com/q
.clearfix() { .clearfix() {
zoom: 1; *zoom: 1;
&:before, &:before,
&:after { &:after {
display: table; display: table;
*display: inline;
content: ""; content: "";
zoom: 1;
} }
&:after { &:after {
clear: both; clear: both;
......
...@@ -140,7 +140,8 @@ input[type="search"] { // Appearance in Safari/Chrome ...@@ -140,7 +140,8 @@ input[type="search"] { // Appearance in Safari/Chrome
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
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 -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
} }
textarea { textarea {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment