Browse Source

conflicts

pull/517/head
connors 11 years ago
parent
commit
7e6a5cc620
  1. 6
      Gruntfile.js
  2. 3
      dist/css/ratchet.css
  3. 2
      dist/css/ratchet.min.css
  4. 3
      docs/dist/css/ratchet.css
  5. 2
      docs/dist/css/ratchet.min.css
  6. 154
      sass/normalize.scss
  7. 1
      sass/table-views.scss

6
Gruntfile.js

@ -117,8 +117,7 @@ module.exports = function(grunt) {
options: { options: {
banner: '', // set to empty; see bellow banner: '', // set to empty; see bellow
keepSpecialComments: '*', // set to '*' because we already add the banner in sass keepSpecialComments: '*', // set to '*' because we already add the banner in sass
noAdvanced: true, // disable advanced optimizations since it causes many issues noAdvanced: true // disable advanced optimizations since it causes many issues
report: 'min'
}, },
ratchet: { ratchet: {
src: '<%= meta.distPath %>css/<%= pkg.name %>.css', src: '<%= meta.distPath %>css/<%= pkg.name %>.css',
@ -144,8 +143,7 @@ module.exports = function(grunt) {
banner: '<%= banner %>', banner: '<%= banner %>',
compress: true, compress: true,
mangle: true, mangle: true,
preserveComments: false, preserveComments: false
report: 'min'
}, },
ratchet: { ratchet: {
src: '<%= meta.distPath %>js/<%= pkg.name %>.js', src: '<%= meta.distPath %>js/<%= pkg.name %>.js',

3
dist/css/ratchet.css vendored

@ -8,7 +8,7 @@
* ===================================================== * =====================================================
*/ */
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
html { html {
font-family: sans-serif; font-family: sans-serif;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
@ -765,7 +765,6 @@ input[type="button"] {
.table-view .media, .table-view .media,
.table-view .media-body { .table-view .media-body {
overflow: hidden; overflow: hidden;
zoom: 1;
} }
.table-view .media-object.pull-left { .table-view .media-object.pull-left {

2
dist/css/ratchet.min.css vendored

File diff suppressed because one or more lines are too long

3
docs/dist/css/ratchet.css vendored

@ -8,7 +8,7 @@
* ===================================================== * =====================================================
*/ */
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
html { html {
font-family: sans-serif; font-family: sans-serif;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
@ -765,7 +765,6 @@ input[type="button"] {
.table-view .media, .table-view .media,
.table-view .media-body { .table-view .media-body {
overflow: hidden; overflow: hidden;
zoom: 1;
} }
.table-view .media-object.pull-left { .table-view .media-object.pull-left {

2
docs/dist/css/ratchet.min.css vendored

File diff suppressed because one or more lines are too long

154
sass/normalize.scss vendored

@ -1,9 +1,10 @@
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ /*! normalize.css v3.0.1 | MIT License | git.io/normalize */
//
// 1. Set default font family to sans-serif. // 1. Set default font family to sans-serif.
// 2. Prevent iOS text size adjust after orientation change, without disabling // 2. Prevent iOS text size adjust after orientation change, without disabling
// user zoom. // user zoom.
//
html { html {
font-family: sans-serif; // 1 font-family: sans-serif; // 1
@ -11,8 +12,9 @@ html {
-webkit-text-size-adjust: 100%; // 2 -webkit-text-size-adjust: 100%; // 2
} }
//
// Remove default margin. // Remove default margin.
//
body { body {
margin: 0; margin: 0;
@ -21,8 +23,11 @@ body {
// HTML5 display definitions // HTML5 display definitions
// ========================================================================== // ==========================================================================
// Correct `block` display not defined in IE 8/9. //
// Correct `block` display not defined for any HTML5 element in IE 8/9.
// Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
// Correct `block` display not defined for `main` in IE 11.
//
article, article,
aside, aside,
@ -39,9 +44,10 @@ summary {
display: block; display: block;
} }
//
// 1. Correct `inline-block` display not defined in IE 8/9. // 1. Correct `inline-block` display not defined in IE 8/9.
// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. // 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
//
audio, audio,
canvas, canvas,
@ -51,18 +57,20 @@ video {
vertical-align: baseline; // 2 vertical-align: baseline; // 2
} }
//
// Prevent modern browsers from displaying `audio` without controls. // Prevent modern browsers from displaying `audio` without controls.
// Remove excess height in iOS 5 devices. // Remove excess height in iOS 5 devices.
//
audio:not([controls]) { audio:not([controls]) {
display: none; display: none;
height: 0; height: 0;
} }
// Address `[hidden]` styling not present in IE 8/9. //
// Hide the `template` element in IE, Safari, and Firefox < 22. // Address `[hidden]` styling not present in IE 8/9/10.
// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
//
[hidden], [hidden],
template { template {
@ -72,15 +80,17 @@ template {
// Links // Links
// ========================================================================== // ==========================================================================
//
// Remove the gray background color from active links in IE 10. // Remove the gray background color from active links in IE 10.
//
a { a {
background: transparent; background: transparent;
} }
//
// Improve readability when focused and also mouse hovered in all browsers. // Improve readability when focused and also mouse hovered in all browsers.
//
a:active, a:active,
a:hover { a:hover {
@ -90,54 +100,61 @@ a:hover {
// Text-level semantics // Text-level semantics
// ========================================================================== // ==========================================================================
// Address styling not present in IE 8/9, Safari 5, and Chrome. //
// Address styling not present in IE 8/9/10/11, Safari, and Chrome.
//
abbr[title] { abbr[title] {
border-bottom: 1px dotted; border-bottom: 1px dotted;
} }
// Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. //
// Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
//
b, b,
strong { strong {
font-weight: bold; font-weight: bold;
} }
// Address styling not present in Safari 5 and Chrome. //
// Address styling not present in Safari and Chrome.
//
dfn { dfn {
font-style: italic; font-style: italic;
} }
//
// Address variable `h1` font-size and margin within `section` and `article` // Address variable `h1` font-size and margin within `section` and `article`
// contexts in Firefox 4+, Safari 5, and Chrome. // contexts in Firefox 4+, Safari, and Chrome.
//
h1 { h1 {
font-size: 2em; font-size: 2em;
margin: 0.67em 0; margin: 0.67em 0;
} }
//
// Address styling not present in IE 8/9. // Address styling not present in IE 8/9.
//
mark { mark {
background: #ff0; background: #ff0;
color: #000; color: #000;
} }
//
// Address inconsistent and variable font size in all browsers. // Address inconsistent and variable font size in all browsers.
//
small { small {
font-size: 80%; font-size: 80%;
} }
//
// Prevent `sub` and `sup` affecting `line-height` in all browsers. // Prevent `sub` and `sup` affecting `line-height` in all browsers.
//
sub, sub,
sup { sup {
@ -158,15 +175,17 @@ sub {
// Embedded content // Embedded content
// ========================================================================== // ==========================================================================
// Remove border when inside `a` element in IE 8/9. //
// Remove border when inside `a` element in IE 8/9/10.
//
img { img {
border: 0; border: 0;
} }
// Correct overflow displayed oddly in IE 9. //
// Correct overflow not hidden in IE 9/10/11.
//
svg:not(:root) { svg:not(:root) {
overflow: hidden; overflow: hidden;
@ -175,15 +194,17 @@ svg:not(:root) {
// Grouping content // Grouping content
// ========================================================================== // ==========================================================================
// Address margin not present in IE 8/9 and Safari 5. //
// Address margin not present in IE 8/9 and Safari.
//
figure { figure {
margin: 1em 40px; margin: 1em 40px;
} }
//
// Address differences between Firefox and other browsers. // Address differences between Firefox and other browsers.
//
hr { hr {
-moz-box-sizing: content-box; -moz-box-sizing: content-box;
@ -191,15 +212,17 @@ hr {
height: 0; height: 0;
} }
//
// Contain overflow in all browsers. // Contain overflow in all browsers.
//
pre { pre {
overflow: auto; overflow: auto;
} }
// Address odd `em`-unit font size rendering in all browsers. //
// Address odd `em`-unit font size rendering in all browsers.
//
code, code,
kbd, kbd,
@ -212,15 +235,17 @@ samp {
// Forms // Forms
// ========================================================================== // ==========================================================================
//
// Known limitation: by default, Chrome and Safari on OS X allow very limited // Known limitation: by default, Chrome and Safari on OS X allow very limited
// styling of `select`, unless a `border` property is set. // styling of `select`, unless a `border` property is set.
//
//
// 1. Correct color not being inherited. // 1. Correct color not being inherited.
// Known issue: affects color of disabled elements. // Known issue: affects color of disabled elements.
// 2. Correct font properties not being inherited. // 2. Correct font properties not being inherited.
// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. // 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
//
button, button,
input, input,
@ -232,30 +257,33 @@ textarea {
margin: 0; // 3 margin: 0; // 3
} }
// Address `overflow` set to `hidden` in IE 8/9/10. //
// Address `overflow` set to `hidden` in IE 8/9/10/11.
//
button { button {
overflow: visible; overflow: visible;
} }
//
// Address inconsistent `text-transform` inheritance for `button` and `select`. // Address inconsistent `text-transform` inheritance for `button` and `select`.
// All other form control elements do not inherit `text-transform` values. // All other form control elements do not inherit `text-transform` values.
// Correct `button` style inheritance in Firefox, IE 8+, and Opera // Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
// Correct `select` style inheritance in Firefox. // Correct `select` style inheritance in Firefox.
//
button, button,
select { select {
text-transform: none; text-transform: none;
} }
//
// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` // 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
// and `video` controls. // and `video` controls.
// 2. Correct inability to style clickable `input` types in iOS. // 2. Correct inability to style clickable `input` types in iOS.
// 3. Improve usability and consistency of cursor style between image-type // 3. Improve usability and consistency of cursor style between image-type
// `input` and others. // `input` and others.
//
button, button,
html input[type="button"], // 1 html input[type="button"], // 1
@ -265,16 +293,18 @@ input[type="submit"] {
cursor: pointer; // 3 cursor: pointer; // 3
} }
//
// Re-set default cursor for disabled elements. // Re-set default cursor for disabled elements.
//
button[disabled], button[disabled],
html input[disabled] { html input[disabled] {
cursor: default; cursor: default;
} }
//
// Remove inner padding and border in Firefox 4+. // Remove inner padding and border in Firefox 4+.
//
button::-moz-focus-inner, button::-moz-focus-inner,
input::-moz-focus-inner { input::-moz-focus-inner {
@ -282,20 +312,22 @@ input::-moz-focus-inner {
padding: 0; padding: 0;
} }
//
// Address Firefox 4+ setting `line-height` on `input` using `!important` in // Address Firefox 4+ setting `line-height` on `input` using `!important` in
// the UA stylesheet. // the UA stylesheet.
//
input { input {
line-height: normal; line-height: normal;
} }
//
// It's recommended that you don't attempt to style these elements. // It's recommended that you don't attempt to style these elements.
// Firefox's implementation doesn't respect box-sizing, padding, or width. // Firefox's implementation doesn't respect box-sizing, padding, or width.
// //
// 1. Address box sizing set to `content-box` in IE 8/9/10. // 1. Address box sizing set to `content-box` in IE 8/9/10.
// 2. Remove excess padding in IE 8/9/10. // 2. Remove excess padding in IE 8/9/10.
//
input[type="checkbox"], input[type="checkbox"],
input[type="radio"] { input[type="radio"] {
@ -303,20 +335,22 @@ input[type="radio"] {
padding: 0; // 2 padding: 0; // 2
} }
//
// Fix the cursor style for Chrome's increment/decrement buttons. For certain // Fix the cursor style for Chrome's increment/decrement buttons. For certain
// `font-size` values of the `input`, it causes the cursor style of the // `font-size` values of the `input`, it causes the cursor style of the
// decrement button to change from `default` to `text`. // decrement button to change from `default` to `text`.
//
input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button { input[type="number"]::-webkit-outer-spin-button {
height: auto; height: auto;
} }
// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. //
// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome // 1. Address `appearance` set to `searchfield` in Safari and Chrome.
// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
// (include `-moz` to future-proof). // (include `-moz` to future-proof).
//
input[type="search"] { input[type="search"] {
-webkit-appearance: textfield; // 1 -webkit-appearance: textfield; // 1
@ -325,18 +359,20 @@ input[type="search"] {
box-sizing: content-box; box-sizing: content-box;
} }
//
// Remove inner padding and search cancel button in Safari and Chrome on OS X. // Remove inner padding and search cancel button in Safari and Chrome on OS X.
// Safari (but not Chrome) clips the cancel button when the search input has // Safari (but not Chrome) clips the cancel button when the search input has
// padding (and `textfield` appearance). // padding (and `textfield` appearance).
//
input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration { input[type="search"]::-webkit-search-decoration {
-webkit-appearance: none; -webkit-appearance: none;
} }
//
// Define consistent border, margin, and padding. // Define consistent border, margin, and padding.
//
fieldset { fieldset {
border: 1px solid #c0c0c0; border: 1px solid #c0c0c0;
@ -344,25 +380,28 @@ fieldset {
padding: 0.35em 0.625em 0.75em; padding: 0.35em 0.625em 0.75em;
} }
// 1. Correct `color` not being inherited in IE 8/9. //
// 1. Correct `color` not being inherited in IE 8/9/10/11.
// 2. Remove padding so people aren't caught out if they zero out fieldsets. // 2. Remove padding so people aren't caught out if they zero out fieldsets.
//
legend { legend {
border: 0; // 1 border: 0; // 1
padding: 0; // 2 padding: 0; // 2
} }
// Remove default vertical scrollbar in IE 8/9. //
// Remove default vertical scrollbar in IE 8/9/10/11.
//
textarea { textarea {
overflow: auto; overflow: auto;
} }
//
// Don't inherit the `font-weight` (applied by a rule above). // Don't inherit the `font-weight` (applied by a rule above).
// NOTE: the default cannot safely be changed in Chrome and Safari on OS X. // NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
//
optgroup { optgroup {
font-weight: bold; font-weight: bold;
@ -371,8 +410,9 @@ optgroup {
// Tables // Tables
// ========================================================================== // ==========================================================================
//
// Remove most spacing between table cells. // Remove most spacing between table cells.
//
table { table {
border-collapse: collapse; border-collapse: collapse;

1
sass/table-views.scss

@ -65,7 +65,6 @@
.table-view .media, .table-view .media,
.table-view .media-body { .table-view .media-body {
overflow: hidden; overflow: hidden;
zoom: 1;
} }
.table-view .media-object { .table-view .media-object {
&.pull-left { &.pull-left {

Loading…
Cancel
Save