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

Merge pull request #478 from twbs/sass-3.3 

Sass 3.3 compatibility
pull/480/head
XhmikosR 11 years ago
parent
9a3add6d84 7f47cc278d
commit
93979dd7d6
13 changed files with 45 additions and 51 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. 2
      .travis.yml
  2. 4
      dist/css/ratchet-theme-ios.css
  3. 2
      dist/css/ratchet-theme-ios.min.css
  4. 3
      dist/css/ratchet.css
  5. 2
      dist/css/ratchet.min.css
  6. 24
      docs/assets/css/docs.css
  7. 2
      docs/assets/css/docs.min.css
  8. 4
      docs/dist/css/ratchet-theme-ios.css
  9. 2
      docs/dist/css/ratchet-theme-ios.min.css
  10. 3
      docs/dist/css/ratchet.css
  11. 2
      docs/dist/css/ratchet.min.css
  12. 30
      sass/theme-android.scss
  13. 16
      sass/theme-ios.scss

2
.travis.yml
Unescape View File

@ -6,6 +6,6 @@ before_install:
install:
- npm install -g grunt-cli
- npm install
- gem install --no-document "jekyll:1.4.2" "sass:3.2.15"
- gem install --no-document "jekyll:1.4.2" "sass:3.3.2"
matrix:
fast_finish: true

4
dist/css/ratchet-theme-ios.css vendored
Unescape View File

@ -457,8 +457,8 @@ textarea,
@-webkit-keyframes fadeOverlay {
from {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0), -320px 0 0 rgba(0, 0, 0, 0);
box-shadow: 0 0 10px rgba(0, 0, 0, 0), -320px 0 0 rgba(0, 0, 0, 0);
-webkit-box-shadow: 0 0 10px transparent, -320px 0 0 transparent;
box-shadow: 0 0 10px transparent, -320px 0 0 transparent;
}
to {

2
dist/css/ratchet-theme-ios.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
dist/css/ratchet.css vendored
Unescape View File

@ -251,7 +251,7 @@ a {
color: #428bca;
text-decoration: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}
a:active {
color: #3071a9;
@ -1264,7 +1264,6 @@ select {
src: url("../fonts/ratchicons.eot");
src: url("../fonts/ratchicons.eot?#iefix") format("embedded-opentype"), url("../fonts/ratchicons.woff") format("woff"), url("../fonts/ratchicons.ttf") format("truetype"), url("../fonts/ratchicons.svg#svgFontName") format("svg");
}
.icon {
display: inline-block;
font-family: Ratchicons;

2
dist/css/ratchet.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
docs/assets/css/docs.css
Unescape View File

@ -956,19 +956,6 @@ hr {
max-width: 1170px;
}
}
.platform-ios {
@-webkit-keyframes fadeOverlay {
from {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0), -320px 0 0 rgba(0, 0, 0, 0);
box-shadow: 0 0 10px rgba(0, 0, 0, 0), -320px 0 0 rgba(0, 0, 0, 0);
}
to {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .3), -320px 0 0 rgba(0, 0, 0, .1);
box-shadow: 0 0 10px rgba(0, 0, 0, .3), -320px 0 0 rgba(0, 0, 0, .1);
}
}
}
.platform-ios a {
color: #007aff;
}
@ -1374,6 +1361,16 @@ hr {
-ms-transform: translate3d(-20%, 0, 0);
transform: translate3d(-20%, 0, 0);
}
@-webkit-keyframes fadeOverlay {
.platform-ios from {
-webkit-box-shadow: 0 0 10px transparent, -320px 0 0 transparent;
box-shadow: 0 0 10px transparent, -320px 0 0 transparent;
}
.platform-ios to {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .3), -320px 0 0 rgba(0, 0, 0, .1);
box-shadow: 0 0 10px rgba(0, 0, 0, .3), -320px 0 0 rgba(0, 0, 0, .1);
}
}
.platform-ios .device {
background-position: -395px 0;
}
@ -1932,7 +1929,6 @@ hr {
opacity: 1;
}
}
.bs-callout {
padding: 20px;
margin: 20px 0;

2
docs/assets/css/docs.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
docs/dist/css/ratchet-theme-ios.css vendored
Unescape View File

@ -457,8 +457,8 @@ textarea,
@-webkit-keyframes fadeOverlay {
from {
-webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0), -320px 0 0 rgba(0, 0, 0, 0);
box-shadow: 0 0 10px rgba(0, 0, 0, 0), -320px 0 0 rgba(0, 0, 0, 0);
-webkit-box-shadow: 0 0 10px transparent, -320px 0 0 transparent;
box-shadow: 0 0 10px transparent, -320px 0 0 transparent;
}
to {

2
docs/dist/css/ratchet-theme-ios.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
docs/dist/css/ratchet.css vendored
Unescape View File

@ -251,7 +251,7 @@ a {
color: #428bca;
text-decoration: none;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-webkit-tap-highlight-color: transparent;
}
a:active {
color: #3071a9;
@ -1264,7 +1264,6 @@ select {
src: url("../fonts/ratchicons.eot");
src: url("../fonts/ratchicons.eot?#iefix") format("embedded-opentype"), url("../fonts/ratchicons.woff") format("woff"), url("../fonts/ratchicons.ttf") format("truetype"), url("../fonts/ratchicons.svg#svgFontName") format("svg");
}
.icon {
display: inline-block;
font-family: Ratchicons;

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

File diff suppressed because one or more lines are too long

30
sass/theme-android.scss
Unescape View File

@ -11,31 +11,31 @@
// --------------------------------------------------
// Type
$font-family-default: 'Roboto', sans-serif;
$font-size-default: 18px;
$font-weight: 500;
$font-weight-light: 400;
$line-height-default: 22px;
$font-family-default: 'Roboto', sans-serif !global;
$font-size-default: 18px !global;
$font-weight: 500 !global;
$font-weight-light: 400 !global;
$line-height-default: 22px !global;
// Colors
//
// Main theme colors
$primary-color: #33b5e5;
$chrome-color: #dddddd;
$text-color: #222;
$primary-color: #33b5e5 !global;
$chrome-color: #dddddd !global;
$text-color: #222 !global;
// Action colors
$default-color: #999;
$positive-color: #99cc00;
$negative-color: #ff4444;
$default-color: #999 !global;
$positive-color: #99cc00 !global;
$negative-color: #ff4444 !global;
// Bars
$bar-base-height: 50px;
$bar-tab-height: 50px;
$bar-base-height: 50px !global;
$bar-tab-height: 50px !global;
// Borders
$border-default: 1px solid #b1b1b1;
$border-radius: 2px;
$border-default: 1px solid #b1b1b1 !global;
$border-radius: 2px !global;
// Base

16
sass/theme-ios.scss
Unescape View File

@ -13,20 +13,20 @@
// Colors
//
// Main theme colors
$primary-color: #007aff;
$chrome-color: rgba(247,247,247,.98);
$primary-color: #007aff !global;
$chrome-color: rgba(247,247,247,.98) !global;
// Action colors
$default-color: #929292;
$positive-color: #4cd964;
$negative-color: #dd524d;
$default-color: #929292 !global;
$positive-color: #4cd964 !global;
$negative-color: #dd524d !global;
// Bars
$bar-base-height: 44px;
$bar-tab-height: 50px;
$bar-base-height: 44px !global;
$bar-tab-height: 50px !global;
// iOS style transitions
$timing-fuction: cubic-bezier(.1, .5, .1, 1); // Inspired by @c2prods
$timing-fuction: cubic-bezier(.1, .5, .1, 1) !global; // Inspired by @c2prods
// Base

Write Preview
Loading…
Cancel
Save