aboutsummaryrefslogtreecommitdiff
path: root/_scss
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-07 16:55:34 -0800
committerArmen Kesablyan2012-02-07 16:55:34 -0800
commit10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch)
tree12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /_scss
parent7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff)
parent668510892537eaaeb2e11520831d87b44b2489b7 (diff)
downloadninja-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.txt102
-rw-r--r--_scss/imports/scss/_Base.scss70
-rw-r--r--_scss/imports/scss/_Components.scss4
-rw-r--r--_scss/imports/scss/_MainWindow.scss30
-rw-r--r--_scss/imports/scss/_MenuUI.scss15
-rw-r--r--_scss/imports/scss/_PanelUI.scss101
-rw-r--r--_scss/imports/scss/_ScrollBars.scss42
-rw-r--r--_scss/imports/scss/_Stage.scss24
-rw-r--r--_scss/imports/scss/_Tools.scss48
-rw-r--r--_scss/imports/scss/_ToolsSample.scss2
-rw-r--r--_scss/imports/scss/_mixins.scss10
-rw-r--r--_scss/imports/scss/_toolbar.scss18
-rw-r--r--_scss/imports/themes/default/_colors.scss67
-rw-r--r--_scss/imports/themes/default/_fonts.scss5
-rw-r--r--_scss/imports/themes/default/_mixins.scss6
-rwxr-xr-x_scss/ninja.scss8
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 @@
12011-09-02 13:25:28 overwrite ../css/ninja.css
22011-09-02 13:38:07 overwrite ../css/ninja.css
32011-09-02 13:38:27 overwrite ../css/ninja.css
42011-09-02 13:39:16 overwrite ../css/ninja.css
52011-09-02 13:42:04 overwrite ../css/ninja.css
62011-09-02 13:42:48 overwrite ../css/ninja.css
72011-09-14 16:53:51 overwrite ../css/ninja.css
82011-09-14 16:54:56 overwrite ../css/ninja.css
92011-09-14 16:55:59 overwrite ../css/ninja.css
102011-09-14 16:57:48 overwrite ../css/ninja.css
112011-09-14 17:00:26 overwrite ../css/ninja.css
122011-09-14 17:02:28 error ninja.scss (Line 19: Invalid CSS after ".SubselectionTool": expected "{", was "",")
132011-09-14 17:02:28 overwrite ../css/ninja.css
142011-09-14 17:04:10 overwrite ../css/ninja.css
152011-09-14 17:05:49 overwrite ../css/ninja.css
162011-09-14 17:08:00 overwrite ../css/ninja.css
172011-09-14 17:08:36 overwrite ../css/ninja.css
182011-09-14 17:09:27 overwrite ../css/ninja.css
192011-09-14 17:10:02 overwrite ../css/ninja.css
202011-09-14 17:11:37 overwrite ../css/ninja.css
212011-09-14 17:12:37 overwrite ../css/ninja.css
222011-09-14 17:14:35 overwrite ../css/ninja.css
232011-09-14 17:15:36 overwrite ../css/ninja.css
242011-09-14 17:16:33 overwrite ../css/ninja.css
252011-09-14 17:17:11 overwrite ../css/ninja.css
262011-09-14 17:17:19 overwrite ../css/ninja.css
272011-09-14 17:18:27 overwrite ../css/ninja.css
282011-09-14 17:19:06 overwrite ../css/ninja.css
292011-09-14 17:19:22 overwrite ../css/ninja.css
302011-09-14 17:19:43 overwrite ../css/ninja.css
312011-09-14 17:20:16 overwrite ../css/ninja.css
322011-09-14 17:20:39 overwrite ../css/ninja.css
332011-09-14 17:21:09 overwrite ../css/ninja.css
342011-09-14 17:21:51 overwrite ../css/ninja.css
352011-09-14 17:22:33 overwrite ../css/ninja.css
362011-09-15 13:56:59 overwrite ../css/ninja.css
372011-09-15 13:57:29 overwrite ../css/ninja.css
382011-10-03 13:19:40 overwrite ../css/ninja.css
392011-10-03 13:21:00 overwrite ../css/ninja.css
402011-10-03 13:21:21 overwrite ../css/ninja.css
412011-10-03 13:26:42 overwrite ../css/ninja.css
422011-10-03 13:44:20 overwrite ../css/ninja.css
432011-10-03 13:44:54 overwrite ../css/ninja.css
442011-10-03 13:45:14 overwrite ../css/ninja.css
452011-10-03 13:46:26 overwrite ../css/ninja.css
462011-10-03 13:46:29 overwrite ../css/ninja.css
472011-10-04 15:06:33 overwrite ../css/ninja.css
482011-10-04 15:06:36 overwrite ../css/ninja.css
492011-10-04 15:06:43 overwrite ../css/ninja.css
502011-10-04 15:15:22 overwrite ../css/ninja.css
512011-10-11 16:02:52 overwrite ../css/ninja.css
522011-10-13 00:13:38 identical ../css/ninja.css
532011-10-13 00:14:12 overwrite ../css/ninja.css
542011-10-13 00:15:03 overwrite ../css/ninja.css
552011-10-26 15:19:00 overwrite ../css/ninja.css
562011-10-26 15:19:33 overwrite ../css/ninja.css
572011-11-22 16:21:56 overwrite ../css/ninja.css
582011-11-22 17:47:41 overwrite ../css/ninja.css
592011-11-30 01:14:42 overwrite ../css/ninja.css
602011-11-30 01:15:04 overwrite ../css/ninja.css
612011-11-30 01:15:09 overwrite ../css/ninja.css
622011-11-30 16:54:38 overwrite ../css/ninja.css
632011-12-01 11:38:06 overwrite ../css/ninja.css
642011-12-01 11:38:11 overwrite ../css/ninja.css
652011-12-07 12:10:05 overwrite ../css/ninja.css
662011-12-07 12:10:22 overwrite ../css/ninja.css
672011-12-07 12:12:11 overwrite ../css/ninja.css
682011-12-07 12:14:43 overwrite ../css/ninja.css
692011-12-07 17:32:10 overwrite ../css/ninja.css
702011-12-07 17:55:01 overwrite ../css/ninja.css
712011-12-15 14:51:46 overwrite ../css/ninja.css
722011-12-15 14:52:46 overwrite ../css/ninja.css
732011-12-15 14:52:59 overwrite ../css/ninja.css
742011-12-15 14:53:25 overwrite ../css/ninja.css
752011-12-20 21:56:57 overwrite ../css/ninja.css
762011-12-30 15:41:28 overwrite ../css/ninja.css
772011-12-30 15:43:24 overwrite ../css/ninja.css
782011-12-30 15:45:49 overwrite ../css/ninja.css
792012-01-12 16:26:20 overwrite ../css/ninja.css
802012-01-12 16:26:22 overwrite ../css/ninja.css
812012-01-12 16:26:25 overwrite ../css/ninja.css
822012-01-19 11:06:48 overwrite ../css/ninja.css
832012-01-19 11:06:55 overwrite ../css/ninja.css
842012-01-19 11:11:16 overwrite ../css/ninja.css
852012-01-19 14:30:22 overwrite ../css/ninja.css
862012-01-19 14:35:47 overwrite ../css/ninja.css
872012-01-19 14:38:18 overwrite ../css/ninja.css
882012-01-19 14:40:59 overwrite ../css/ninja.css
892012-01-19 14:41:24 overwrite ../css/ninja.css
902012-01-20 15:13:41 overwrite ../css/ninja.css
912012-01-20 15:14:27 overwrite ../css/ninja.css
922012-01-20 15:15:32 overwrite ../css/ninja.css
932012-01-20 15:16:38 overwrite ../css/ninja.css
942012-01-20 15:17:03 overwrite ../css/ninja.css
952012-01-20 15:17:39 overwrite ../css/ninja.css
962012-01-30 16:28:54 overwrite ../css/ninja.css
972012-01-30 16:29:04 overwrite ../css/ninja.css
982012-01-30 16:33:31 overwrite ../css/ninja.css
992012-01-30 17:18:02 overwrite ../css/ninja.css
1002012-01-30 18:28:44 overwrite ../css/ninja.css
1012012-02-02 17:20:26 overwrite ../css/ninja.css
1022012-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
47input.nj-skinned, 47input.nj-skinned,
48textarea.nj-skinned, 48textarea.nj-skinned,
49button.nj-skinned, 49button.nj-skinned,
50select.nj-skinned, 50select.nj-skinned,
51select.nj-skinned option, 51select.nj-skinned option {
52button.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
58input[type="text"].nj-skinned, 57input[type="text"].nj-skinned,
59input[type="password"].nj-skinned, 58input[type="password"].nj-skinned,
60input[type="search"].nj-skinned, 59input[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
72input.nj-skinned:disabled, 71input.nj-skinned:disabled,
73textarea.nj-skinned:disabled, 72textarea.nj-skinned:disabled,
74select.nj-skinned:disabled, 73select.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
80input[type="text"].nj-skinned, 79input[type="text"].nj-skinned,
81input[type="password"].nj-skinned, 80input[type="password"].nj-skinned,
82input[type="search"].nj-skinned, 81input[type="search"].nj-skinned,
@@ -84,7 +83,7 @@ select.nj-skinned,
84select.nj-skinned option { 83select.nj-skinned option {
85 height: 13px; 84 height: 13px;
86} 85}
87/* 86//
88input[type="text"].nj-skinned:focus, 87input[type="text"].nj-skinned:focus,
89input[type="password"].nj-skinned:focus, 88input[type="password"].nj-skinned:focus,
90input[type="search"].nj-skinned:focus, 89input[type="search"].nj-skinned:focus,
@@ -93,7 +92,7 @@ select.nj-skinned:focus,
93select.nj-skinned option:focus { 92select.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
98select.nj-skinned { 97select.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
122button.nj-skinned { 121button.nj-skinned {
123 font-size: 9px; 122 font-size: 9px;
124 cursor: pointer; 123 cursor: pointer;
124 display: block;