diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Timeline/Style.reel/scss | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss')
-rw-r--r-- | js/panels/Timeline/Style.reel/scss/Style.scss | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss index 3fec5797..7c73d352 100644 --- a/js/panels/Timeline/Style.reel/scss/Style.scss +++ b/js/panels/Timeline/Style.reel/scss/Style.scss | |||
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
31 | /* Layer.scss | 31 | /* Layer.scss |
32 | * 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. |
33 | */ | 33 | */ |
34 | 34 | ||
35 | // Import theme settings | 35 | // Import theme settings |
36 | @import "../../../../../scss/imports/themes/default/colors"; | 36 | @import "../../../../../scss/imports/themes/default/colors"; |
37 | @import "../../../../../scss/imports/themes/default/mixins"; | 37 | @import "../../../../../scss/imports/themes/default/mixins"; |
@@ -40,29 +40,29 @@ POSSIBILITY OF SUCH DAMAGE. | |||
40 | @import "../../../../../scss/imports/scss/mixins"; | 40 | @import "../../../../../scss/imports/scss/mixins"; |
41 | 41 | ||
42 | .hidden { | 42 | .hidden { |
43 | display: none; | 43 | display: none; |
44 | } | 44 | } |
45 | .row-editor { | 45 | .row-editor { |
46 | position: relative; | 46 | position: relative; |
47 | height: 14px; | 47 | height: 14px; |
48 | } | 48 | } |
49 | .style-padding { | 49 | .style-padding { |
50 | padding-left: 5px; | 50 | padding-left: 5px; |
51 | padding-top: 3px; | 51 | padding-top: 3px; |
52 | padding-right: 5px; | 52 | padding-right: 5px; |
53 | } | 53 | } |
54 | .style-row { | 54 | .style-row { |
55 | height: 20px; | 55 | height: 20px; |
56 | border-bottom: 1px solid $color-menu-divider; | 56 | border-bottom: 1px solid $color-menu-divider; |
57 | } | 57 | } |
58 | 58 | ||
59 | div.content-style div.editable2 { | 59 | div.content-style div.editable2 { |
60 | height: 14px; | 60 | height: 14px; |
61 | background-color: $color-panel-hilite-text !IMPORTANT; | 61 | background-color: $color-panel-hilite-text !IMPORTANT; |
62 | color: $color-panel-hilite-bg !IMPORTANT; | 62 | color: $color-panel-hilite-bg !IMPORTANT; |
63 | border-width: 0px; | 63 | border-width: 0px; |
64 | font-size: 11px; | 64 | font-size: 11px; |
65 | overflow: hidden; | 65 | overflow: hidden; |
66 | -webkit-user-select: text; | 66 | -webkit-user-select: text; |
67 | white-space: nowrap; | 67 | white-space: nowrap; |
68 | text-overflow: clip; | 68 | text-overflow: clip; |
@@ -71,34 +71,34 @@ div.content-style div.editable2 { | |||
71 | .content-style.collapsible-content, | 71 | .content-style.collapsible-content, |
72 | .content-style.collapsible-content div, | 72 | .content-style.collapsible-content div, |
73 | .content-style.collapsible-content span { | 73 | .content-style.collapsible-content span { |
74 | overflow: visible; | 74 | overflow: visible; |
75 | text-overflow: visible; | 75 | text-overflow: visible; |
76 | } | 76 | } |
77 | div.content-style div.cell-property, | 77 | div.content-style div.cell-property, |
78 | div.content-style div.cell-value { | 78 | div.content-style div.cell-value { |
79 | width: 45%; | 79 | width: 45%; |
80 | float: left; | 80 | float: left; |
81 | height: 18px; | 81 | height: 18px; |
82 | overflow: hidden; | 82 | overflow: hidden; |
83 | text-overflow: ellipsis; | 83 | text-overflow: ellipsis; |
84 | white-space: nowrap; | 84 | white-space: nowrap; |
85 | line-height: 18px; | 85 | line-height: 18px; |
86 | } | 86 | } |
87 | div.content-style div.cell-property div { | 87 | div.content-style div.cell-property div { |
88 | min-width: 90%; | 88 | min-width: 90%; |
89 | height: 100%; | 89 | height: 100%; |
90 | overflow: hidden; | 90 | overflow: hidden; |
91 | text-overflow: ellipsis; | 91 | text-overflow: ellipsis; |
92 | white-space: nowrap; | 92 | white-space: nowrap; |
93 | } | 93 | } |
94 | 94 | ||
95 | div.content-style input.nj-skinned { | 95 | div.content-style input.nj-skinned { |
96 | height: 10px; | 96 | height: 10px; |
97 | font-size: 12px; | 97 | font-size: 12px; |
98 | top: -3px; | 98 | top: -3px; |
99 | } | 99 | } |
100 | div.style-row .container-propvals { | 100 | div.style-row .container-propvals { |
101 | overflow: hidden; | 101 | overflow: hidden; |
102 | } | 102 | } |
103 | 103 | ||
104 | .content-style .style-row.selected { | 104 | .content-style .style-row.selected { |