aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/css/Style.css
diff options
context:
space:
mode:
authorEric Guzman2012-07-20 11:24:19 -0700
committerEric Guzman2012-07-20 11:24:19 -0700
commit3cc29231852440508bdeec1964e40ce59f979f99 (patch)
tree2faaf3d49337437e4a84818fe24dc64a60f8c611 /js/panels/Timeline/Style.reel/css/Style.css
parent8fdf2fc8aefee68aec4c7b5891e0375f704cbf26 (diff)
parent9053e2037821a5c8405fabb74db9635deacfe8d5 (diff)
downloadninja-3cc29231852440508bdeec1964e40ce59f979f99.tar.gz
Merge branch 'refs/heads/master' into fixes_7.1
Diffstat (limited to 'js/panels/Timeline/Style.reel/css/Style.css')
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css124
1 files changed, 43 insertions, 81 deletions
diff --git a/js/panels/Timeline/Style.reel/css/Style.css b/js/panels/Timeline/Style.reel/css/Style.css
index 4819d4f5..c0130988 100644
--- a/js/panels/Timeline/Style.reel/css/Style.css
+++ b/js/panels/Timeline/Style.reel/css/Style.css
@@ -1,3 +1,4 @@
1@charset "UTF-8";
1/* <copyright> 2/* <copyright>
2Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 4All Rights Reserved.
@@ -5,16 +6,11 @@ All Rights Reserved.
5Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
7 8
8* Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
9 this list of conditions and the following disclaimer.
10 10
11* Redistributions in binary form must reproduce the above copyright notice, 11* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
12 this list of conditions and the following disclaimer in the documentation
13 and/or other materials provided with the distribution.
14 12
15* Neither the name of Motorola Mobility LLC nor the names of its 13* Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
18 14
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -28,76 +24,42 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 24ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 25POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 26</copyright> */
31/* Layer.scss 27/* Layer.scss Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. */
32 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. 28/* line 43, ../scss/Style.scss */
33 */ 29.hideme { display: none; }
34.hidden { 30
35 display: none; } 31/* line 46, ../scss/Style.scss */
36 32.row-editor { position: relative; height: 14px; }
37.row-editor { 33
38 position: relative; 34/* line 50, ../scss/Style.scss */
39 height: 14px; } 35.style-padding { padding-left: 5px; padding-top: 3px; padding-right: 5px; }
40 36
41.style-padding { 37/* line 55, ../scss/Style.scss */
42 padding-left: 5px; 38.style-row { height: 20px; border-bottom: 1px solid #505050; }
43 padding-top: 3px; 39
44 padding-right: 5px; } 40/* line 60, ../scss/Style.scss */
45 41div.content-style div.editable2 { height: 14px; background-color: #242424 !important; color: #b2b2b2 !important; border-width: 0px; font-size: 11px; overflow: hidden; -webkit-user-select: text; white-space: nowrap; text-overflow: clip; width: 100%; }
46.style-row { 42
47 height: 20px; 43/* line 74, ../scss/Style.scss */
48 border-bottom: 1px solid #505050; } 44.content-style.collapsible-content, .content-style.collapsible-content div, .content-style.collapsible-content span { overflow: visible; text-overflow: visible; }
49 45
50div.content-style div.editable2 { 46/* line 79, ../scss/Style.scss */
51 height: 14px; 47div.content-style div.cell-property, div.content-style div.cell-value { width: 45%; float: left; height: 18px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; line-height: 18px; }
52 background-color: #242424 !important; 48
53 color: #b2b2b2 !important; 49/* line 88, ../scss/Style.scss */
54 border-width: 0px; 50div.content-style div.cell-property div { min-width: 90%; height: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
55 font-size: 11px; 51
56 overflow: hidden; 52/* line 96, ../scss/Style.scss */
57 -webkit-user-select: text; 53div.content-style input.nj-skinned { height: 10px; font-size: 12px; top: -3px; }
58 white-space: nowrap; 54
59 text-overflow: clip; 55/* line 101, ../scss/Style.scss */
60 width: 100%; } 56div.style-row .container-propvals { overflow: hidden; }
61 57
62.content-style.collapsible-content, 58/* line 105, ../scss/Style.scss */
63.content-style.collapsible-content div, 59.content-style .style-row.selected { background-color: #474747; color: white; }
64.content-style.collapsible-content span { 60
65 overflow: visible; 61/* line 109, ../scss/Style.scss */
66 text-overflow: visible; } 62.content-style .style-row.style-selected { background-color: #b2b2b2; color: #242424; }
67 63
68div.content-style div.cell-property, 64/* line 114, ../scss/Style.scss */
69div.content-style div.cell-value { 65.toolColorChipCtrl.color-chip-position { margin-top: 0px; height: 14px; }
70 width: 45%;
71 float: left;
72 height: 18px;
73 overflow: hidden;
74 text-overflow: ellipsis;
75 white-space: nowrap;
76 line-height: 18px; }
77
78div.content-style div.cell-property div {
79 min-width: 90%;
80 height: 100%;
81 overflow: hidden;
82 text-overflow: ellipsis;
83 white-space: nowrap; }
84
85div.content-style input.nj-skinned {
86 height: 10px;
87 font-size: 12px;
88 top: -3px; }
89
90div.style-row .container-propvals {
91 overflow: hidden; }
92
93.content-style .style-row.selected {
94 background-color: #474747;
95 color: white; }
96
97.content-style .style-row.style-selected {
98 background-color: #b2b2b2;
99 color: #242424; }
100
101.toolColorChipCtrl.color-chip-position {
102 margin-top: 0px;
103 height: 14px; }