diff options
author | Valerio Virgillito | 2012-02-02 00:20:39 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-02 00:20:39 -0800 |
commit | 7303d3a7c3913658bf33be5f99db85a30889cfd9 (patch) | |
tree | 45c55830b5971bdec183ac64217716c7a2fc6b47 | |
parent | a1ad71231368f459f1d842d77185f333f04c58ec (diff) | |
parent | 2e24eaa71b260fd11632d8a124874b238c9aa82a (diff) | |
download | ninja-7303d3a7c3913658bf33be5f99db85a30889cfd9.tar.gz |
Merge branch 'pullrequest' of github.com:jreid01/ninja-internal into staging
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | _scss/compass_app_log.txt | 109 | ||||
-rw-r--r-- | _scss/imports/scss/_Base.scss | 7 | ||||
-rw-r--r-- | _scss/imports/scss/_PanelUI.scss | 2 | ||||
-rw-r--r-- | _scss/imports/themes/default/_colors.scss | 2 | ||||
-rw-r--r-- | css/ninja.css | 8 | ||||
-rw-r--r-- | js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js | 4 |
7 files changed, 16 insertions, 119 deletions
@@ -20,4 +20,5 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78 | |||
20 | 20 | ||
21 | cloud/ | 21 | cloud/ |
22 | 22 | ||
23 | /.idea/scopes/scope_settings.xml \ No newline at end of file | 23 | /.idea/scopes/scope_settings.xml |
24 | /_scss/compass_app_log.txt \ No newline at end of file | ||
diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt deleted file mode 100644 index 463846ba..00000000 --- a/_scss/compass_app_log.txt +++ /dev/null | |||
@@ -1,109 +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-27 16:08:54 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...") | ||
97 | 2012-01-27 16:08:54 overwrite ../css/ninja.css | ||
98 | 2012-01-27 16:09:18 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...") | ||
99 | 2012-01-27 16:09:18 overwrite ../css/ninja.css | ||
100 | 2012-01-27 16:09:34 error ninja.scss (Line 93: Invalid CSS after " z-index:": expected pseudoclass or pseudoelement, was " 2;") | ||
101 | 2012-01-27 16:09:34 overwrite ../css/ninja.css | ||
102 | 2012-01-27 16:11:17 error ninja.scss (Line 20: Invalid CSS after "...nately it doesn": expected "{", was "'t seem to work...") | ||
103 | 2012-01-27 16:11:17 overwrite ../css/ninja.css | ||
104 | 2012-01-27 16:11:57 error ninja.scss (Line 106: Invalid CSS after "...how the corner.": expected class name, was "Setting the ::-...") | ||
105 | 2012-01-27 16:11:57 overwrite ../css/ninja.css | ||
106 | 2012-01-27 16:12:29 overwrite ../css/ninja.css | ||
107 | 2012-01-27 16:13:46 overwrite ../css/ninja.css | ||
108 | 2012-01-27 16:14:02 overwrite ../css/ninja.css | ||
109 | 2012-01-31 17:22:02 overwrite ../css/ninja.css | ||
diff --git a/_scss/imports/scss/_Base.scss b/_scss/imports/scss/_Base.scss index 77faa8f3..8a743174 100644 --- a/_scss/imports/scss/_Base.scss +++ b/_scss/imports/scss/_Base.scss | |||
@@ -127,15 +127,18 @@ button.nj-skinned { | |||
127 | padding: 4px; | 127 | padding: 4px; |
128 | border: 1px $color-input-border solid; | 128 | border: 1px $color-input-border solid; |
129 | background-color: $color-menu-bg; | 129 | background-color: $color-menu-bg; |
130 | background-image: -webkit-linear-gradient(top, $color-radio-gradient-top 0%, $color-radio-gradient-bottom 100%); | 130 | background-image: -webkit-linear-gradient(top, $color-formgrad-top 0%, $color-formgrad-bottom 100%); |
131 | border-radius: 4px; | 131 | border-radius: 4px; |
132 | color: $color-menu-text; | 132 | color: $color-menu-text; |
133 | text-transform: uppercase; | 133 | text-transform: uppercase; |
134 | cursor: pointer; | 134 | cursor: pointer; |
135 | text-shadow: 1px 1px 1px $color-app-shadow | 135 | text-shadow: 1px 1px 1px $color-app-shadow |
136 | } | 136 | } |
137 | button.nj-skinned:active { | ||
138 | background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); | ||
139 | } | ||
137 | button.nj-skinned:hover { | 140 | button.nj-skinned:hover { |
138 | background-image: -webkit-linear-gradient(top, $color-radio-gradient-bottom 0%, $color-radio-gradient-top 100%); | 141 | -webkit-box-shadow: 0px 0px 3px $color-focus-outline; |
139 | } | 142 | } |
140 | 143 | ||
141 | // Radio buttons | 144 | // Radio buttons |
diff --git a/_scss/imports/scss/_PanelUI.scss b/_scss/imports/scss/_PanelUI.scss index ac82adf8..21ada556 100644 --- a/_scss/imports/scss/_PanelUI.scss +++ b/_scss/imports/scss/_PanelUI.scss | |||
@@ -390,7 +390,7 @@ ul.treeComponent > img:first-child | |||
390 | // | 390 | // |
391 | #pp-container-assets .pp-scroll-linked, | 391 | #pp-container-assets .pp-scroll-linked, |
392 | #pp-container-list .pp-scroll-linked { | 392 | #pp-container-list .pp-scroll-linked { |
393 | width: 420px; | 393 | //width: 420px; |
394 | } | 394 | } |
395 | 395 | ||
396 | 396 | ||
diff --git a/_scss/imports/themes/default/_colors.scss b/_scss/imports/themes/default/_colors.scss index 34d5ffc9..2a7b8191 100644 --- a/_scss/imports/themes/default/_colors.scss +++ b/_scss/imports/themes/default/_colors.scss | |||
@@ -15,6 +15,8 @@ $color-radio-border: rgb(40,40,40); | |||
15 | $color-radio-shadow: rgba(200,200,200,0.5); | 15 | $color-radio-shadow: rgba(200,200,200,0.5); |
16 | $color-radio-gradient-top: rgb(100,100,100); | 16 | $color-radio-gradient-top: rgb(100,100,100); |
17 | $color-radio-gradient-bottom: rgb(60,60,60); | 17 | $color-radio-gradient-bottom: rgb(60,60,60); |
18 | $color-formgrad-top: rgb(80,80,80); | ||
19 | $color-formgrad-bottom: rgb(60,60,60); | ||
18 | $color-radio-bg: rgb(0,0,0); | 20 | $color-radio-bg: rgb(0,0,0); |
19 | $color-radio: rgb(200,200,200); | 21 | $color-radio: rgb(200,200,200); |
20 | $color-input: rgb(255,255,255); | 22 | $color-input: rgb(255,255,255); |
diff --git a/css/ninja.css b/css/ninja.css index bf71955f..8ce60a10 100644 --- a/css/ninja.css +++ b/css/ninja.css | |||
@@ -34,9 +34,11 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button { -webkit-appearan | |||
34 | 34 | ||
35 | input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "\2716"; } | 35 | input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "\2716"; } |
36 | 36 | ||
37 | button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } | 37 | button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } |
38 | 38 | ||
39 | button.nj-skinned:hover { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #646464 100%); } | 39 | button.nj-skinned:active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); } |
40 | |||
41 | button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; } | ||
40 | 42 | ||
41 | input[type="radio"].nj-skinned { background-color: #474747; background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); color: #c8c8c8; border: 2px solid #282828; width: 12px; height: 12px; overflow: hidden; border-radius: 10px; font-size: 16px; line-height: 7px; text-indent: -7px; cursor: pointer; -webkit-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); -moz-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); } | 43 | input[type="radio"].nj-skinned { background-color: #474747; background-image: -webkit-linear-gradient(top, #646464 0%, #3c3c3c 100%); color: #c8c8c8; border: 2px solid #282828; width: 12px; height: 12px; overflow: hidden; border-radius: 10px; font-size: 16px; line-height: 7px; text-indent: -7px; cursor: pointer; -webkit-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); -moz-box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); box-shadow: 0px 0px 2px rgba(200, 200, 200, 0.5); } |
42 | 44 | ||
@@ -338,8 +340,6 @@ ul.treeComponent > img:first-child { margin-left: -35px; margin-right: 5px; -web | |||
338 | 340 | ||
339 | #pp-view-assets { display: none; } | 341 | #pp-view-assets { display: none; } |
340 | 342 | ||
341 | #pp-container-assets .pp-scroll-linked, #pp-container-list .pp-scroll-linked { width: 420px; } | ||
342 | |||
343 | .pp-header-container { position: relative; overflow: hidden; border-bottom: 1px solid black; background-color: #3a3a3a; min-width: 390px; } | 343 | .pp-header-container { position: relative; overflow: hidden; border-bottom: 1px solid black; background-color: #3a3a3a; min-width: 390px; } |
344 | 344 | ||
345 | .pp-header { border-right: 1px solid black; color: white; padding-top: 4px; padding-left: 6px; font-weight: bold; display: block; float: left; overflow: visible; position: relative; } | 345 | .pp-header { border-right: 1px solid black; color: white; padding-top: 4px; padding-left: 6px; font-weight: bold; display: block; float: left; overflow: visible; position: relative; } |
diff --git a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js index 31582153..e5173005 100644 --- a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js +++ b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js | |||
@@ -577,11 +577,11 @@ exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require | |||
577 | arrLinkedScrollersLength = arrLinkedScrollers.length, | 577 | arrLinkedScrollersLength = arrLinkedScrollers.length, |
578 | i = 0, | 578 | i = 0, |
579 | that = this; | 579 | that = this; |
580 |