Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2'
Browse files Browse the repository at this point in the history
Conflicts:
	rel/responsive.css
	rel/responsive.js
	rel/responsive.min.css
	rel/responsive.min.js
	rel/responsive.zip
	src/css/responsive.css
	src/js/000-responsive.utils.js
	tests/grid/reset.html
  • Loading branch information
JimBobSquarePants committed Jan 9, 2014
2 parents f5fcaf6 + 3a7a788 commit 69206df
Show file tree
Hide file tree
Showing 59 changed files with 732 additions and 249 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"tests"
],
"dependencies": {
"html5shiv": "3.6.2",
"html5shiv": "3.7.0",
"jquery": "2.0.3",
"jquery-legacy": "jquery#1.10",
"respond": "1.4.0"
"respond": "1.4.2"
}
}
184 changes: 122 additions & 62 deletions rel/responsive.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rel/responsive.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Licensed under the MIT License.
============================================================================== */

/*! Responsive v2.2.0 | MIT License | git.io/rRNRLA */
/*! Responsive v2.3.0 | MIT License | git.io/rRNRLA */

/*
* Responsive Utils
Expand Down
4 changes: 2 additions & 2 deletions rel/responsive.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion rel/responsive.min.js

Large diffs are not rendered by default.

Binary file modified rel/responsive.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion rel/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<link href="responsive.min.css" rel="stylesheet" />

<!--[if lt IE 9 &!(IEMobile)]>
<script src="vendor/html5shiv.min.js"></script>
<script src="vendor/html5shiv.js"></script>
<script src="vendor/respond.min.js"></script>
<![endif]-->
</head>
Expand Down
8 changes: 4 additions & 4 deletions rel/vendor/html5shiv.min.js → rel/vendor/html5shiv.js

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

9 changes: 5 additions & 4 deletions rel/vendor/respond.min.js

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

2 changes: 0 additions & 2 deletions src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ abbr {
/*
* Remove 300ms touch delay.
*/

a[href],
button,
[type="submit"],
[type="button"],
Expand Down
12 changes: 10 additions & 2 deletions src/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ button,
-webkit-appearance: none; /* 1 */
border-radius: 0; /* 1 */
display: inline-block;
max-width: none;
padding: .5em 1em;
margin-bottom: 0;
line-height: normal;
Expand All @@ -30,8 +29,13 @@ button,
* Reset width for inputs
*/
[type="submit"],
[type="button"] {
[type="reset"],
[type="button"],
.form-no-grid [type="submit"],
.form-no-grid [type="reset"],
.form-no-grid [type="button"] {
width: auto;
max-width: none;
}

/*
Expand Down Expand Up @@ -66,6 +70,9 @@ button,
outline: none;
}

/*
* 1. Fix IOS 6/7 opacity issue
*/
button[disabled],
[type="submit"][disabled],
[type="button"][disabled],
Expand All @@ -74,6 +81,7 @@ button,
color: #5d5d5d;
background-color: #e7e7e7;
cursor: not-allowed;
opacity: 1;
}

/*
Expand Down
18 changes: 9 additions & 9 deletions src/css/code.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ pre samp {
}

/*
* Reassert wrapping.
* Reassert no wrapping.
*/
pre code {
-ms-word-break: break-all;
word-break: break-all; /* webkit */
-ms-word-wrap: break-word;
word-wrap: break-word;
white-space: pre;
white-space: -moz-pre-wrap; /* fennec */
white-space: pre-wrap;
pre {
overflow-x: auto;
}

pre code {
-ms-word-wrap: normal;
word-wrap: normal;
white-space: pre;
}

/*
* Fixed height with overflow.
*/
Expand Down
Binary file removed src/css/dropdown.png
Binary file not shown.
1 change: 1 addition & 0 deletions src/css/dropdown.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 69206df

Please sign in to comment.