diff options
author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /_scss | |
parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to '_scss')
-rw-r--r-- | _scss/compass_app_log.txt | 102 | ||||
-rw-r--r-- | _scss/imports/scss/_Base.scss | 70 | ||||
-rw-r--r-- | _scss/imports/scss/_Components.scss | 4 | ||||
-rw-r--r-- | _scss/imports/scss/_MainWindow.scss | 30 | ||||
-rw-r--r-- | _scss/imports/scss/_MenuUI.scss | 15 | ||||
-rw-r--r-- | _scss/imports/scss/_PanelUI.scss | 101 | ||||
-rw-r--r-- | _scss/imports/scss/_ScrollBars.scss | 42 | ||||
-rw-r--r-- | _scss/imports/scss/_Stage.scss | 24 | ||||
-rw-r--r-- | _scss/imports/scss/_Tools.scss | 48 | ||||
-rw-r--r-- | _scss/imports/scss/_ToolsSample.scss | 2 | ||||
-rw-r--r-- | _scss/imports/scss/_mixins.scss | 10 | ||||
-rw-r--r-- | _scss/imports/scss/_toolbar.scss | 18 | ||||
-rw-r--r-- | _scss/imports/themes/default/_colors.scss | 67 | ||||
-rw-r--r-- | _scss/imports/themes/default/_fonts.scss | 5 | ||||
-rw-r--r-- | _scss/imports/themes/default/_mixins.scss | 6 | ||||
-rwxr-xr-x | _scss/ninja.scss | 8 |
16 files changed, 231 insertions, 321 deletions
diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt deleted file mode 100644 index d28e1e77..00000000 --- a/_scss/compass_app_log.txt +++ /dev/null | |||
@@ -1,102 +0,0 @@ | |||
1 | 2011-09-02 13:25:28 overwrite ../css/ninja.css | ||
2 | 2011-09-02 13:38:07 overwrite ../css/ninja.css | ||
3 | 2011-09-02 13:38:27 overwrite ../css/ninja.css | ||
4 | 2011-09-02 13:39:16 overwrite ../css/ninja.css | ||
5 | 2011-09-02 13:42:04 overwrite ../css/ninja.css | ||
6 | 2011-09-02 13:42:48 overwrite ../css/ninja.css | ||
7 | 2011-09-14 16:53:51 overwrite ../css/ninja.css | ||
8 | 2011-09-14 16:54:56 overwrite ../css/ninja.css | ||
9 | 2011-09-14 16:55:59 overwrite ../css/ninja.css | ||
10 | 2011-09-14 16:57:48 overwrite ../css/ninja.css | ||
11 | 2011-09-14 17:00:26 overwrite ../css/ninja.css | ||
12 | 2011-09-14 17:02:28 error ninja.scss (Line 19: Invalid CSS after ".SubselectionTool": expected "{", was "",") | ||
13 | 2011-09-14 17:02:28 overwrite ../css/ninja.css | ||
14 | 2011-09-14 17:04:10 overwrite ../css/ninja.css | ||
15 | 2011-09-14 17:05:49 overwrite ../css/ninja.css | ||
16 | 2011-09-14 17:08:00 overwrite ../css/ninja.css | ||
17 | 2011-09-14 17:08:36 overwrite ../css/ninja.css | ||
18 | 2011-09-14 17:09:27 overwrite ../css/ninja.css | ||
19 | 2011-09-14 17:10:02 overwrite ../css/ninja.css | ||
20 | 2011-09-14 17:11:37 overwrite ../css/ninja.css | ||
21 | 2011-09-14 17:12:37 overwrite ../css/ninja.css | ||
22 | 2011-09-14 17:14:35 overwrite ../css/ninja.css | ||
23 | 2011-09-14 17:15:36 overwrite ../css/ninja.css | ||
24 | 2011-09-14 17:16:33 overwrite ../css/ninja.css | ||
25 | 2011-09-14 17:17:11 overwrite ../css/ninja.css | ||
26 | 2011-09-14 17:17:19 overwrite ../css/ninja.css | ||
27 | 2011-09-14 17:18:27 overwrite ../css/ninja.css | ||
28 | 2011-09-14 17:19:06 overwrite ../css/ninja.css | ||
29 | 2011-09-14 17:19:22 overwrite ../css/ninja.css | ||
30 | 2011-09-14 17:19:43 overwrite ../css/ninja.css | ||
31 | 2011-09-14 17:20:16 overwrite ../css/ninja.css | ||
32 | 2011-09-14 17:20:39 overwrite ../css/ninja.css | ||
33 | 2011-09-14 17:21:09 overwrite ../css/ninja.css | ||
34 | 2011-09-14 17:21:51 overwrite ../css/ninja.css | ||
35 | 2011-09-14 17:22:33 overwrite ../css/ninja.css | ||
36 | 2011-09-15 13:56:59 overwrite ../css/ninja.css | ||
37 | 2011-09-15 13:57:29 overwrite ../css/ninja.css | ||
38 | 2011-10-03 13:19:40 overwrite ../css/ninja.css | ||
39 | 2011-10-03 13:21:00 overwrite ../css/ninja.css | ||
40 | 2011-10-03 13:21:21 overwrite ../css/ninja.css | ||
41 | 2011-10-03 13:26:42 overwrite ../css/ninja.css | ||
42 | 2011-10-03 13:44:20 overwrite ../css/ninja.css | ||
43 | 2011-10-03 13:44:54 overwrite ../css/ninja.css | ||
44 | 2011-10-03 13:45:14 overwrite ../css/ninja.css | ||
45 | 2011-10-03 13:46:26 overwrite ../css/ninja.css | ||
46 | 2011-10-03 13:46:29 overwrite ../css/ninja.css | ||
47 | 2011-10-04 15:06:33 overwrite ../css/ninja.css | ||
48 | 2011-10-04 15:06:36 overwrite ../css/ninja.css | ||
49 | 2011-10-04 15:06:43 overwrite ../css/ninja.css | ||
50 | 2011-10-04 15:15:22 overwrite ../css/ninja.css | ||
51 | 2011-10-11 16:02:52 overwrite ../css/ninja.css | ||
52 | 2011-10-13 00:13:38 identical ../css/ninja.css | ||
53 | 2011-10-13 00:14:12 overwrite ../css/ninja.css | ||
54 | 2011-10-13 00:15:03 overwrite ../css/ninja.css | ||
55 | 2011-10-26 15:19:00 overwrite ../css/ninja.css | ||
56 | 2011-10-26 15:19:33 overwrite ../css/ninja.css | ||
57 | 2011-11-22 16:21:56 overwrite ../css/ninja.css | ||
58 | 2011-11-22 17:47:41 overwrite ../css/ninja.css | ||
59 | 2011-11-30 01:14:42 overwrite ../css/ninja.css | ||
60 | 2011-11-30 01:15:04 overwrite ../css/ninja.css | ||
61 | 2011-11-30 01:15:09 overwrite ../css/ninja.css | ||
62 | 2011-11-30 16:54:38 overwrite ../css/ninja.css | ||
63 | 2011-12-01 11:38:06 overwrite ../css/ninja.css | ||
64 | 2011-12-01 11:38:11 overwrite ../css/ninja.css | ||
65 | 2011-12-07 12:10:05 overwrite ../css/ninja.css | ||
66 | 2011-12-07 12:10:22 overwrite ../css/ninja.css | ||
67 | 2011-12-07 12:12:11 overwrite ../css/ninja.css | ||
68 | 2011-12-07 12:14:43 overwrite ../css/ninja.css | ||
69 | 2011-12-07 17:32:10 overwrite ../css/ninja.css | ||
70 | 2011-12-07 17:55:01 overwrite ../css/ninja.css | ||
71 | 2011-12-15 14:51:46 overwrite ../css/ninja.css | ||
72 | 2011-12-15 14:52:46 overwrite ../css/ninja.css | ||
73 | 2011-12-15 14:52:59 overwrite ../css/ninja.css | ||
74 | 2011-12-15 14:53:25 overwrite ../css/ninja.css | ||
75 | 2011-12-20 21:56:57 overwrite ../css/ninja.css | ||
76 | 2011-12-30 15:41:28 overwrite ../css/ninja.css | ||
77 | 2011-12-30 15:43:24 overwrite ../css/ninja.css | ||
78 | 2011-12-30 15:45:49 overwrite ../css/ninja.css | ||
79 | 2012-01-12 16:26:20 overwrite ../css/ninja.css | ||
80 | 2012-01-12 16:26:22 overwrite ../css/ninja.css | ||
81 | 2012-01-12 16:26:25 overwrite ../css/ninja.css | ||
82 | 2012-01-19 11:06:48 overwrite ../css/ninja.css | ||
83 | 2012-01-19 11:06:55 overwrite ../css/ninja.css | ||
84 | 2012-01-19 11:11:16 overwrite ../css/ninja.css | ||
85 | 2012-01-19 14:30:22 overwrite ../css/ninja.css | ||
86 | 2012-01-19 14:35:47 overwrite ../css/ninja.css | ||
87 | 2012-01-19 14:38:18 overwrite ../css/ninja.css | ||
88 | 2012-01-19 14:40:59 overwrite ../css/ninja.css | ||
89 | 2012-01-19 14:41:24 overwrite ../css/ninja.css | ||
90 | 2012-01-20 15:13:41 overwrite ../css/ninja.css | ||
91 | 2012-01-20 15:14:27 overwrite ../css/ninja.css | ||
92 | 2012-01-20 15:15:32 overwrite ../css/ninja.css | ||
93 | 2012-01-20 15:16:38 overwrite ../css/ninja.css | ||
94 | 2012-01-20 15:17:03 overwrite ../css/ninja.css | ||
95 | 2012-01-20 15:17:39 overwrite ../css/ninja.css | ||
96 | 2012-01-30 16:28:54 overwrite ../css/ninja.css | ||
97 | 2012-01-30 16:29:04 overwrite ../css/ninja.css | ||
98 | 2012-01-30 16:33:31 overwrite ../css/ninja.css | ||
99 | 2012-01-30 17:18:02 overwrite ../css/ninja.css | ||
100 | 2012-01-30 18:28:44 overwrite ../css/ninja.css | ||
101 | 2012-02-02 17:20:26 overwrite ../css/ninja.css | ||
102 | 2012-02-02 17:20:31 identical ../css/ninja.css | ||
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss index f9a1cfa3..8a743174 100644 --- a/_scss/imports/scss/_Base.scss +++ b/_scss/imports/scss/_Base.scss | |||
@@ -4,12 +4,12 @@ | |||
4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | // </copyright> | 5 | // </copyright> |
6 | 6 | ||
7 | /* | 7 | |
8 | * Base.scss | 8 | //Base.scss |
9 | * Base styles for entire application. | 9 | //Base styles for entire application. |
10 | * Note that colors and font definitions go in | 10 | //Note that colors and font definitions go in |
11 | * _scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss | 11 | //_scss/themes/themename/_colors.scss and _scss/themes/themename/_fonts.scss |
12 | */ | 12 | |
13 | 13 | ||
14 | .clear { | 14 | .clear { |
15 | display: block; | 15 | display: block; |
@@ -42,19 +42,18 @@ | |||
42 | float: right; | 42 | float: right; |
43 | } | 43 | } |
44 | 44 | ||
45 | /* Begin: Basic skinning for form fields */ | 45 | // Begin: Basic skinning for form fields |
46 | /* Reset all */ | 46 | // Reset all |
47 | input.nj-skinned, | 47 | input.nj-skinned, |
48 | textarea.nj-skinned, | 48 | textarea.nj-skinned, |
49 | button.nj-skinned, | 49 | button.nj-skinned, |
50 | select.nj-skinned, | 50 | select.nj-skinned, |
51 | select.nj-skinned option, | 51 | select.nj-skinned option { |
52 | button.nj-skinned { | ||
53 | -webkit-appearance: none; | 52 | -webkit-appearance: none; |
54 | outline: none; | 53 | outline: none; |
55 | } | 54 | } |
56 | 55 | ||
57 | /* Base styles */ | 56 | // Base styles |
58 | input[type="text"].nj-skinned, | 57 | input[type="text"].nj-skinned, |
59 | input[type="password"].nj-skinned, | 58 | input[type="password"].nj-skinned, |
60 | input[type="search"].nj-skinned, | 59 | input[type="search"].nj-skinned, |
@@ -68,7 +67,7 @@ select.nj-skinned option { | |||
68 | font-family: 'Droid Sans', sans-serif; | 67 | font-family: 'Droid Sans', sans-serif; |
69 | } | 68 | } |
70 | 69 | ||
71 | /* Disabled styles */ | 70 | // Disabled styles |
72 | input.nj-skinned:disabled, | 71 | input.nj-skinned:disabled, |
73 | textarea.nj-skinned:disabled, | 72 | textarea.nj-skinned:disabled, |
74 | select.nj-skinned:disabled, | 73 | select.nj-skinned:disabled, |
@@ -76,7 +75,7 @@ button.nj-skinned:disabled { | |||
76 | opacity: 0.4; | 75 | opacity: 0.4; |
77 | } | 76 | } |
78 | 77 | ||
79 | /* Text inputs and select boxes */ | 78 | // Text inputs and select boxes |
80 | input[type="text"].nj-skinned, | 79 | input[type="text"].nj-skinned, |
81 | input[type="password"].nj-skinned, | 80 | input[type="password"].nj-skinned, |
82 | input[type="search"].nj-skinned, | 81 | input[type="search"].nj-skinned, |
@@ -84,7 +83,7 @@ select.nj-skinned, | |||
84 | select.nj-skinned option { | 83 | select.nj-skinned option { |
85 | height: 13px; | 84 | height: 13px; |
86 | } | 85 | } |
87 | /* | 86 | // |
88 | input[type="text"].nj-skinned:focus, | 87 | input[type="text"].nj-skinned:focus, |
89 | input[type="password"].nj-skinned:focus, | 88 | input[type="password"].nj-skinned:focus, |
90 | input[type="search"].nj-skinned:focus, | 89 | input[type="search"].nj-skinned:focus, |
@@ -93,7 +92,7 @@ select.nj-skinned:focus, | |||
93 | select.nj-skinned option:focus { | 92 | select.nj-skinned option:focus { |
94 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; | 93 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; |
95 | } | 94 | } |
96 | */ | 95 | |
97 | 96 | ||
98 | select.nj-skinned { | 97 | select.nj-skinned { |
99 | background-image: url("../images/dropdown-bg.png"); | 98 | background-image: url("../images/dropdown-bg.png"); |
@@ -118,13 +117,31 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { | |||
118 | content:"\2716"; | 117 | content:"\2716"; |
119 | } | 118 | } |
120 | 119 | ||
121 | /* Buttons */ | 120 | // Buttons |
122 | button.nj-skinned { | 121 | button.nj-skinned { |
123 | font-size: 9px; | 122 | font-size: 9px; |
124 | cursor: pointer; | 123 | cursor: pointer; |
124 | display: block; | ||