aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/scss
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-13 11:59:19 -0800
committerArmen Kesablyan2012-02-13 11:59:19 -0800
commit90d0c8c0e98d062c628c061fe5765ce991fda409 (patch)
tree9780e9dcf475bf319f3cacc1a1ad52fcf9f133af /js/panels/Timeline/Style.reel/scss
parent8110e01dc5093ac6baf621103dcaa5f769e5be92 (diff)
parente142611e22718b1f1d1696902ad9161ec5f33f98 (diff)
downloadninja-90d0c8c0e98d062c628c061fe5765ce991fda409.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Style.reel/scss')
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss70
-rw-r--r--js/panels/Timeline/Style.reel/scss/config.rb9
2 files changed, 79 insertions, 0 deletions
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
new file mode 100644
index 00000000..f15f553d
--- /dev/null
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -0,0 +1,70 @@
1/* Layer.scss
2 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css.
3 */
4
5// Import theme settings
6@import "../../../../../_scss/imports/themes/default/colors";
7@import "../../../../../_scss/imports/themes/default/mixins";
8
9// Import generic mixins and styles
10@import "../../../../../_scss/imports/scss/mixins";
11
12.hidden {
13 display: none;
14}
15.row-editor {
16 position: relative;
17 height: 14px;
18}
19.style-padding {
20 padding-left: 5px;
21 padding-top: 3px;
22 padding-right: 5px;
23}
24.style-row {
25 height: 20px;
26 border-bottom: 1px solid $color-menu-divider;
27}
28
29div.content-style div.editable2 {
30 height: 14px;
31 background-color: $color-panel-hilite-text !IMPORTANT;
32 color: $color-panel-hilite-bg !IMPORTANT;
33 border-width: 0px;
34 font-size: 11px;
35 overflow: hidden;
36 -webkit-user-select: text;
37 white-space: nowrap;
38 text-overflow: clip;
39 width: 100%;
40}
41.content-style.collapsible-content,
42.content-style.collapsible-content div,
43.content-style.collapsible-content span {
44 overflow: visible;
45 text-overflow: visible;
46}
47div.content-style div.cell-property,
48div.content-style div.cell-value {
49 width: 45%;
50 float: left;
51 height: 18px;
52 overflow: hidden;
53 text-overflow: ellipsis;
54 white-space: nowrap;
55 line-height: 18px;
56}
57div.content-style div.cell-property div {
58 min-width: 90%;
59 height: 100%;
60 overflow: hidden;
61 text-overflow: ellipsis;
62 white-space: nowrap;
63}
64
65div.content-style input.nj-skinned {
66 height: 10px;
67 font-size: 12px;
68 top: -3px;
69}
70
diff --git a/js/panels/Timeline/Style.reel/scss/config.rb b/js/panels/Timeline/Style.reel/scss/config.rb
new file mode 100644
index 00000000..e5a99b70
--- /dev/null
+++ b/js/panels/Timeline/Style.reel/scss/config.rb
@@ -0,0 +1,9 @@
1# Require any additional compass plugins here.
2# Set this to the root of your project when deployed:
3http_path = "/"
4css_dir = "../css"
5sass_dir = ""
6images_dir = "../images/"
7javascripts_dir = "../js"
8# To enable relative paths to assets via compass helper functions. Uncomment:
9# relative_assets = true