playground
/
ratchet
mirror of https://github.com/twbs/ratchet.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Trim trailing spaces.

pull/300/merge
XhmikosR 11 years ago
parent
2d8c6f3e3e
commit
7eb31a7049
18 changed files with 115 additions and 115 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Gruntfile.js
  2. 2
      dist/ratchet.js
  3. 4
      docs/assets/js/docs.js
  4. 2
      docs/dist/ratchet.js
  5. 2
      js/push.js
  6. 10
      sass/bars.scss
  7. 4
      sass/base.scss
  8. 2
      sass/buttons.scss
  9. 14
      sass/docs.scss
  10. 4
      sass/modals.scss
  11. 124
      sass/normalize.scss
  12. 2
      sass/popovers.scss
  13. 2
      sass/push.scss
  14. 4
      sass/sliders.scss
  15. 4
      sass/table-views.scss
  16. 24
      sass/theme-android.scss
  17. 16
      sass/theme-ios.scss
  18. 2
      sass/toggles.scss

8
Gruntfile.js
Unescape View File

@ -20,7 +20,7 @@ module.exports = function(grunt) {
docsPath: 'docs/dist/',
docsAssetsPath: 'docs/assets/'
},
banner: '/*!\n' +
' * =====================================================\n' +
' * Ratchet v<%= pkg.version %>\n' +
@ -30,7 +30,7 @@ module.exports = function(grunt) {
' * V<%= pkg.version %> designed by @connors.\n' +
' * =====================================================\n' +
' */\n',
concat: {
ratchet: {
options: {
@ -51,7 +51,7 @@ module.exports = function(grunt) {
dest: '<%= meta.docsPath %><%= pkg.name %>.js'
}
},
sass: {
options: {
banner: '<%= banner %>',
@ -110,7 +110,7 @@ module.exports = function(grunt) {
}
}
},
watch: {
scripts: {
files: [

2
dist/ratchet.js vendored
Unescape View File

@ -131,7 +131,7 @@
'slide-out' : 'slide-in',
'fade' : 'fade'
};
var bars = {
bartab : '.bar-tab',
barnav : '.bar-nav',

4
docs/assets/js/docs.js
Unescape View File

@ -42,7 +42,7 @@ $(function() {
if (windowWidth >= 768) {
device.initialLeft = device.offset().left;
device.initialTop = device.initialTop || device.offset().top;
device.dockingOffset = ($(window).height() - device.height())/2;
device.dockingOffset = ($(window).height() - device.height())/2;
}
checkDesktopContent();
@ -65,7 +65,7 @@ $(function() {
var trigger = $('.js-docs-nav-trigger');
trigger.toggleClass('active');
nav.toggleClass('active');
nav.toggleClass('active');
});
navComponentLinks.click(function(e) {

2
docs/dist/ratchet.js vendored
Unescape View File

@ -131,7 +131,7 @@
'slide-out' : 'slide-in',
'fade' : 'fade'
};
var bars = {
bartab : '.bar-tab',
barnav : '.bar-nav',

2
js/push.js
Unescape View File

@ -22,7 +22,7 @@
'slide-out' : 'slide-in',
'fade' : 'fade'
};
var bars = {
bartab : '.bar-tab',
barnav : '.bar-nav',

10
sass/bars.scss
Unescape View File

@ -59,7 +59,7 @@
display: block;
width: 100%;
padding: 0;
margin: 0 (-$bar-side-spacing);
margin: 0 (-$bar-side-spacing);
font-size: $font-size-default;
font-weight: $font-weight;
line-height: $bar-base-height;
@ -131,10 +131,10 @@
font-weight: $font-weight-light;
// Give buttons that are floated left and right side margin
&.pull-right {
margin-left: $bar-side-spacing;
&.pull-right {
margin-left: $bar-side-spacing;
}
&.pull-left {
&.pull-left {
margin-right: $bar-side-spacing;
}
}
@ -202,7 +202,7 @@
top: 3px;
padding: 0;
}
// Handle carets in the titles
.title .icon {
padding: 0;

4
sass/base.scss
Unescape View File

@ -3,7 +3,7 @@
// --------------------------------------------------
// Use box sizing on all the things!
* {
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@ -27,7 +27,7 @@ body {
a {
color: $primary-color;
text-decoration: none;
-webkit-tap-highlight-color: rgba(0,0,0,0); // Removes the dark touch outlines on links in webkit browsers.
-webkit-tap-highlight-color: rgba(0,0,0,0); // Removes the dark touch outlines on links in webkit browsers.
&:active {
color: darken($primary-color, 10%);

2
sass/buttons.scss
Unescape View File

@ -78,7 +78,7 @@
}
}
// Outlined buttons
// Outlined buttons
.btn-outlined {
background-color: transparent;

14
sass/docs.scss
Unescape View File

@ -272,7 +272,7 @@ body {
font-size: 14px;
}
// Docs modules
// Docs modules
.docs-module {
margin-top: 20px;
padding: 20px;
@ -584,7 +584,7 @@ code {
margin: 10px auto;
}
// Popovers
// Popovers
#popoversInDevice {
#iwindow:before {
position: absolute;
@ -649,7 +649,7 @@ hr {
// Docs media queries
// --------------------------------------------------
// Tablet to desktop
// Tablet to desktop
@media screen and (min-width: 768px) {
.docs-header {
min-height: 830px;
@ -680,7 +680,7 @@ hr {
.docs-header-content {
top: 32%;
@include transform(translateY(-50%));
.btn {
display: inline-block;
}
@ -722,7 +722,7 @@ hr {
cursor: pointer;
@include transition(opacity .2 linear);
&:hover {
&:hover {
color: $primary-color;
}
&:active {
@ -813,7 +813,7 @@ hr {
font-size: 18px;
}
// Docs modules
// Docs modules
.docs-module {
margin-top: 35px;
}
@ -981,7 +981,7 @@ hr {
.offset-1 { margin-left: 50%; }
// Tablet to desktop
// Tablet to desktop
// --------------------------------------------------
@media screen and (min-width: 768px) {

4
sass/modals.scss
Unescape View File

@ -3,10 +3,10 @@
// --------------------------------------------------
.modal {
position: fixed;
position: fixed;
top: 0;
opacity: 0;
z-index: 11;
z-index: 11;
width: 100%;
min-height: 100%;
overflow: hidden;

124
sass/normalize.scss vendored
Unescape View File

@ -3,26 +3,26 @@
// 1. Set default font family to sans-serif.
// 2. Prevent iOS text size adjust after orientation change, without disabling
// user zoom.
html {
font-family: sans-serif; // 1
-ms-text-size-adjust: 100%; // 2
-webkit-text-size-adjust: 100%; // 2
font-family: sans-serif; // 1
-ms-text-size-adjust: 100%; // 2
-webkit-text-size-adjust: 100%; // 2
}
// Remove default margin.
body {
margin: 0;
}
// HTML5 display definitions
// ==========================================================================
// ==========================================================================
// Correct `block` display not defined in IE 8/9.
article,
aside,
@ -41,19 +41,19 @@ summary {
// 1. Correct `inline-block` display not defined in IE 8/9.
// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
audio,
canvas,
progress,
video {
display: inline-block; // 1
vertical-align: baseline; // 2
display: inline-block; // 1
vertical-align: baseline; // 2
}
// Prevent modern browsers from displaying `audio` without controls.
// Remove excess height in iOS 5 devices.
audio:not([controls]) {
display: none;
@ -62,7 +62,7 @@ audio:not([controls]) {
// Address `[hidden]` styling not present in IE 8/9.
// Hide the `template` element in IE, Safari, and Firefox < 22.
[hidden],
template {
@ -70,17 +70,17 @@ template {
}
// Links
// ==========================================================================
// ==========================================================================
// Remove the gray background color from active links in IE 10.
a {
background: transparent;
}
// Improve readability when focused and also mouse hovered in all browsers.
a:active,
a:hover {
@ -88,17 +88,17 @@ a:hover {
}
// Text-level semantics
// ==========================================================================
// ==========================================================================
// Address styling not present in IE 8/9, Safari 5, and Chrome.
abbr[title] {
border-bottom: 1px dotted;
}
// Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
b,
strong {
@ -106,7 +106,7 @@ strong {
}
// Address styling not present in Safari 5 and Chrome.
dfn {
font-style: italic;
@ -114,7 +114,7 @@ dfn {
// Address variable `h1` font-size and margin within `section` and `article`
// contexts in Firefox 4+, Safari 5, and Chrome.
h1 {
font-size: 2em;
@ -122,7 +122,7 @@ h1 {
}
// Address styling not present in IE 8/9.
mark {
background: #ff0;
@ -130,14 +130,14 @@ mark {
}
// Address inconsistent and variable font size in all browsers.
small {
font-size: 80%;
}
// Prevent `sub` and `sup` affecting `line-height` in all browsers.
sub,
sup {
@ -156,34 +156,34 @@ sub {
}
// Embedded content
// ==========================================================================
// ==========================================================================
// Remove border when inside `a` element in IE 8/9.
img {
border: 0;
}
// Correct overflow displayed oddly in IE 9.
svg:not(:root) {
overflow: hidden;
}
// Grouping content
// ==========================================================================
// ==========================================================================
// Address margin not present in IE 8/9 and Safari 5.
figure {
margin: 1em 40px;
}
// Address differences between Firefox and other browsers.
hr {
-moz-box-sizing: content-box;
@ -192,14 +192,14 @@ hr {
}
// Contain overflow in all browsers.
pre {
overflow: auto;
}
// Address odd `em`-unit font size rendering in all browsers.
code,
kbd,
@ -210,30 +210,30 @@ samp {
}
// Forms
// ==========================================================================
// ==========================================================================
// Known limitation: by default, Chrome and Safari on OS X allow very limited
// styling of `select`, unless a `border` property is set.
// 1. Correct color not being inherited.
// Known issue: affects color of disabled elements.
// 2. Correct font properties not being inherited.
// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
button,
input,
optgroup,
select,
textarea {
color: inherit; // 1
font: inherit; // 2
margin: 0; // 3
color: inherit; // 1
font: inherit; // 2
margin: 0; // 3
}
// Address `overflow` set to `hidden` in IE 8/9/10.
button {
overflow: visible;
@ -243,7 +243,7 @@ button {
// All other form control elements do not inherit `text-transform` values.
// Correct `button` style inheritance in Firefox, IE 8+, and Opera
// Correct `select` style inheritance in Firefox.
button,
select {
@ -255,18 +255,18 @@ select {
// 2. Correct inability to style clickable `input` types in iOS.
// 3. Improve usability and consistency of cursor style between image-type
// `input` and others.
button,
html input[type="button"], // 1
html input[type="button"], // 1
input[type="reset"],
input[type="submit"] {
-webkit-appearance: button; // 2
cursor: pointer; // 3
-webkit-appearance: button; // 2
cursor: pointer; // 3
}
// Re-set default cursor for disabled elements.
button[disabled],
html input[disabled] {
@ -274,7 +274,7 @@ html input[disabled] {
}
// Remove inner padding and border in Firefox 4+.
button::-moz-focus-inner,
input::-moz-focus-inner {
@ -284,7 +284,7 @@ input::-moz-focus-inner {
// Address Firefox 4+ setting `line-height` on `input` using `!important` in
// the UA stylesheet.
input {
line-height: normal;
@ -295,18 +295,18 @@ input {
//
// 1. Address box sizing set to `content-box` in IE 8/9/10.
// 2. Remove excess padding in IE 8/9/10.
input[type="checkbox"],
input[type="radio"] {
box-sizing: border-box; // 1
padding: 0; // 2
box-sizing: border-box; // 1
padding: 0; // 2
}
// 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
// decrement button to change from `default` to `text`.
input[type="number"]::-webkit-inner-spin-button,
input[type="number"]::-webkit-outer-spin-button {
@ -316,19 +316,19 @@ input[type="number"]::-webkit-outer-spin-button {
// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
// (include `-moz` to future-proof).
input[type="search"] {
-webkit-appearance: textfield; // 1
-webkit-appearance: textfield; // 1
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box; // 2
-webkit-box-sizing: content-box; // 2
box-sizing: content-box;
}
// 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
// padding (and `textfield` appearance).
input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-decoration {
@ -336,7 +336,7 @@ input[type="search"]::-webkit-search-decoration {
}
// Define consistent border, margin, and padding.
fieldset {
border: 1px solid #c0c0c0;
@ -346,15 +346,15 @@ fieldset {
// 1. Correct `color` not being inherited in IE 8/9.
// 2. Remove padding so people aren't caught out if they zero out fieldsets.
legend {
border: 0; // 1
padding: 0; // 2
border: 0; // 1
padding: 0; // 2
}
// Remove default vertical scrollbar in IE 8/9.
textarea {
overflow: auto;
@ -362,17 +362,17 @@ textarea {
// 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.
optgroup {
font-weight: bold;
}
// Tables
// ==========================================================================
// ==========================================================================
// Remove most spacing between table cells.
table {
border-collapse: collapse;

2
sass/popovers.scss
Unescape View File

@ -63,7 +63,7 @@
.popover .btn-block {
margin-bottom: 5px;
// Remove extra margin on bottom of last button
&:last-child {
margin-bottom: 0;

2
sass/push.scss
Unescape View File

@ -3,7 +3,7 @@
// --------------------------------------------------
.content {
// Fade animation
// Fade animation
&.fade {
left: 0;
opacity: 0;

4
sass/sliders.scss
Unescape View File

@ -18,12 +18,12 @@
font-size: 0; // Remove spaces from inline-block children
white-space: nowrap;
@include transition(all 0 linear);
// Individual slide
.slide {
display: inline-block;
vertical-align: top; // Ensure that li always aligns to top
width: 100%;
width: 100%;
height: 100%;
font-size: 14px;
}

4
sass/table-views.scss
Unescape View File

@ -20,7 +20,7 @@
border-bottom: $border-default;
// Remove the border from the last table view item
&:last-child {
&:last-child {
border-bottom: 0;
}
// If it's a table view of links, make sure the child <a> takes up full table view item tap area (want to avoid selecting child buttons though)
@ -49,7 +49,7 @@
padding-top: 6px;
padding-bottom: 6px;
padding-left: 15px;
margin-top: -1px; // Hides the border of the previous list item
margin-top: -1px; // Hides the border of the previous list item
margin-left: 0;
color: #999;
font-weight: $font-weight;

24
sass/theme-android.scss
Unescape View File

@ -51,7 +51,7 @@ body {
// Universal link styling
a {
color: $primary-color;
&:active {
color: darken($primary-color, 10%);
}
@ -142,7 +142,7 @@ a {
}
}
// Outlined buttons
// Outlined buttons
.btn-outlined {
border: 1px solid $default-color;
background-color: transparent;
@ -288,7 +288,7 @@ a {
}
}
// Left aligned text in the .bar-nav
// Left aligned text in the .bar-nav
.title {
position: static;
padding-left: 15px;
@ -328,7 +328,7 @@ a {
}
// Bars with segmented-controls
//
//
// Remove standard segmented bottom margin
.bar .segmented-control {
top: 7px;
@ -370,7 +370,7 @@ a {
}
// Badge modifiers
//
//
// Main badge
.badge-primary {
color: #fff;
@ -423,7 +423,7 @@ a {
.table-view-cell {
border-bottom: 1px solid #d9d9d9;
// Remove the border from the last table view item
&:last-child {
background-image: none;
@ -571,7 +571,7 @@ textarea,
.control-item {
color: #fff;
border-color: inherit;
&:active,
&.active {
color: #fff;
@ -587,7 +587,7 @@ textarea,
.control-item {
color: #fff;
border-color: inherit;
&:active,
&.active {
color: #fff;
@ -653,7 +653,7 @@ textarea,
border: 2px solid #d7d7d7;
border-radius: 0;
background-color: #d7d7d7;
// Sliding handle
.toggle-handle {
top: 0;
@ -682,7 +682,7 @@ textarea,
margin-right: 2px;
background-color: $primary-color;
border-color: $primary-color;
@include transform(translate3d(50px,0,0));
@include transform(translate3d(50px,0,0));
}
&:before {
left: auto;
@ -705,7 +705,7 @@ textarea,
}
// Ratchicons for Android
// Ratchicons for Android
// --------------------------------------------------
.icon-caret:before { content: '\e800'; }
@ -715,7 +715,7 @@ textarea,
.icon-left:before,
.icon-left-nav:before { content: '\e803'; }
.icon-more-vertical:before { content: '\e804'; }
.icon-more:before { content: '\e805'; }
.icon-more:before { content: '\e805'; }
.icon-right:before,
.icon-right-nav:before { content: '\e806'; }
.icon-search:before { content: '\e807'; }

16
sass/theme-ios.scss
Unescape View File

@ -50,12 +50,12 @@ a {
// Typography
// --------------------------------------------------
.h5, h5,
.h5, h5,
.h6, h6,
p {
color: #8f8f94;
}
.h5, h5,
.h5, h5,
.h6, h6, {
font-weight: normal;
text-transform: uppercase;
@ -124,7 +124,7 @@ p {
}
}
// Outlined buttons
// Outlined buttons
.btn-outlined {
background-color: transparent;
@ -227,7 +227,7 @@ p {
// Link buttons in nav bars
.btn-link {
color: $primary-color;
&:active {
color: $primary-color;
opacity: .6;
@ -306,7 +306,7 @@ p {
.table-view-cell {
border-bottom: 0;
@include hairline(single, #c8c7cc, 15px); // Single grey border with 15px offset.
// Remove the border from the last table view item
&:last-child {
background-image: none;
@ -426,7 +426,7 @@ textarea,
.control-item {
color: $primary-color;
border-color: inherit;
&:active {
background-color: lighten($primary-color, 35%);
}
@ -546,7 +546,7 @@ textarea,
@include box-shadow(inset 0 0 0 13px $positive-color);
.toggle-handle {
@include transform(translate3d(17px,0,0));
@include transform(translate3d(17px,0,0));
}
.toggle-handle {
@ -559,7 +559,7 @@ textarea,
// Push styles
// --------------------------------------------------
.content {
// Fade animation
// Fade animation
&.fade {
@include transition(opacity .2s ease-in-out);
}

2
sass/toggles.scss
Unescape View File

@ -46,7 +46,7 @@
.toggle-handle {
border-color: $positive-color;
@include transform(translate3d(44px,0,0));
@include transform(translate3d(44px,0,0));
}
&:before {
right: auto;

Write Preview
Loading…
Cancel
Save