diff options
| author | Eric Guzman | 2012-02-08 14:41:56 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-08 14:41:56 -0800 |
| commit | 637db74743ac1397ade7edec3da3ae1c1cdaa82a (patch) | |
| tree | bc16578a5368098956d39f16ddd48737a9bb355c | |
| parent | 40622aa97d31837254996b718b0a6feca2bcd0ce (diff) | |
| parent | ab12be4e9a0d9fee4450795077b0107983b5682e (diff) | |
| download | ninja-637db74743ac1397ade7edec3da3ae1c1cdaa82a.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
82 files changed, 599 insertions, 3033 deletions
diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scssc deleted file mode 100644 index 49f58b5a..00000000 --- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Base.scssc +++ /dev/null | |||
| Binary files differ | |||
diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scssc deleted file mode 100644 index 38415553..00000000 --- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_Components.scssc +++ /dev/null | |||
| Binary files differ | |||
diff --git a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc b/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc deleted file mode 100644 index d9a82daa..00000000 --- a/_scss/.sass-cache/00e44b9921bd33f78c5d566e59665c128be109ba/_MainWindow.scssc +++ /dev/null | |||
| @@ -1,437 +0,0 @@ | |||
| 1 | 3.0.24 (Classy Cassidy) | ||
| 2 | 962a1ab0ef1e7d35ecb9743bbd47fbbf3b79de41 | ||
| 3 | o:Sass::Tree::RootNode | ||
| 4 | : | ||
| 5 | @linei: @options{: | ||
| 6 | style: expanded:load_paths[ " ./public/stylesheets/sass",/Users/rmwh84/Sites/Ninja/MainApp/_scss"o/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/blueprint/stylesheets"~/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/_blueprint_deprecated_imports/stylesheets"m/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/compass/stylesheets"|/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-0.10.6/frameworks/_compass_deprecated_imports/stylesheets"l/Applications/compass.app/Contents/Resources/ruby/gem/gems/compass-960-plugin-0.10.0/lib/../stylesheets"j/Applications/compass.app/Contents/Resources/ruby/gem/gems/html5-boilerplate-0.2.6/lib/../stylesheets: | ||
| 7 | cacheT:cache_location"8/Users/rmwh84/Sites/Ninja/MainApp/_scss/.sass-cache: syntax: scss:full_exceptionT:css_location"./public/stylesheets:always_updateF:always_checkT:line_commentsT:template_location[ [@@[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ | ||
| 8 | "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@ "3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@"3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css[@"3/Users/rmwh84/Sites/Ninja/MainApp/_scss/../css: filename"J/Users/rmwh84/Sites/Ninja/MainApp/_scss/imports/scss/_MainWindow.scss:property_syntax0:@template"1G/* <copyright> | ||
| 9 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 10 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 11 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 12 | </copyright> */ | ||
| 13 | |||
| 14 | /* | ||
| 15 | * MainWindow.scss | ||
| 16 | * Styles governing the main window and overall layout of the application. | ||
| 17 | * Note that colors and font definitions go in | ||
| 18 | * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss | ||
| 19 | */ | ||
| 20 | |||
| 21 | body { | ||
| 22 | position: absolute; | ||
| 23 | margin: 0px; | ||
| 24 | width: 100%; | ||
| 25 | height:100%; | ||
| 26 | background-color:$color-app-bg; | ||
| 27 | overflow: hidden; | ||
| 28 | -webkit-user-select:none; | ||
| 29 | font-family: 'DroidSans'; | ||
| 30 | } | ||
| 31 | |||
| 32 | #appContainer { | ||
| 33 | position: absolute; | ||
| 34 | margin: 0px; | ||
| 35 | display: -webkit-box; | ||
| 36 | -webkit-box-orient: vertical; | ||
| 37 | -webkit-box-align: stretch; | ||
| 38 | width: 100%; | ||
| 39 | height: 100%; | ||
| 40 | border-left: 16px solid #000; | ||
| 41 | border-right: 16px solid #000; | ||
| 42 | border-top: 28px solid #000; | ||
| 43 | -webkit-box-sizing: border-box; | ||
| 44 | max-width:100%; | ||
| 45 | max-height:100%; | ||
| 46 | } | ||
| 47 | |||
| 48 | #appContainer > section { | ||
| 49 | display: -webkit-box; | ||
| 50 | -webkit-box-flex:0; | ||
| 51 | } | ||
| 52 | |||
| 53 | #appContainer #appWorkspace { | ||
| 54 | -webkit-box-flex:1; | ||
| 55 | -webkit-box-align: stretch; | ||
| 56 | } | ||
| 57 | |||
| 58 | #appWorkspace { | ||
| 59 | display: -webkit-box; | ||
| 60 | -webkit-box-orient: horizontal; | ||
| 61 | -webkit-box-pack: center; | ||
| 62 | -webkit-box-align: center; | ||
| 63 | -webkit-box-sizing: stretch; | ||
| 64 | position:relative; | ||
| 65 | padding:2px 0px; | ||
| 66 | border: 1px solid #333; | ||
| 67 | |||