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 /scss/imports/themes/_test.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 'scss/imports/themes/_test.scss')
| -rwxr-xr-x | scss/imports/themes/_test.scss | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scss/imports/themes/_test.scss b/scss/imports/themes/_test.scss index 0767c300..4e8b914a 100755 --- a/scss/imports/themes/_test.scss +++ b/scss/imports/themes/_test.scss | |||
| @@ -39,13 +39,13 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | .docAreaBackground { | 41 | .docAreaBackground { |
| 42 | color: black; | 42 | color: black; |
| 43 | background: black; | 43 | background: black; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | .mainStageBackground { | 46 | .mainStageBackground { |
| 47 | color: white; | 47 | color: white; |
| 48 | background: gray; | 48 | background: gray; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | .stageContentShadow { | 51 | .stageContentShadow { |
| @@ -55,9 +55,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | .panelBackground { | 57 | .panelBackground { |
| 58 | color: white; | 58 | color: white; |
| 59 | /*border: solid 1px #333;*/ | 59 | /*border: solid 1px #333;*/ |
| 60 | background: rgba(41,41,41,1); | 60 | background: rgba(41,41,41,1); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | .panelCollapseControlBackground { | 63 | .panelCollapseControlBackground { |