diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Timeline/EasingMenu.reel/scss | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Timeline/EasingMenu.reel/scss')
| -rw-r--r-- | js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss b/js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss index 3d98f55d..ecdd39bd 100644 --- a/js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss +++ b/js/panels/Timeline/EasingMenu.reel/scss/EasingMenu.scss | |||
| @@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 33 | /* Layer.scss | 33 | /* Layer.scss |
| 34 | * Main SCSS file for EasingMenu component, compiled by SASS into the file css/EasingMenu.css. | 34 | * Main SCSS file for EasingMenu component, compiled by SASS into the file css/EasingMenu.css. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | // Import theme settings | 37 | // Import theme settings |
| 38 | @import "../../../../../scss/imports/themes/default/colors"; | 38 | @import "../../../../../scss/imports/themes/default/colors"; |
| 39 | // @import "../../../../../scss/imports/themes/default/fonts"; | 39 | // @import "../../../../../scss/imports/themes/default/fonts"; |