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/components/popup.reel/css/popup.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/components/popup.reel/css/popup.scss')
-rwxr-xr-x | js/components/popup.reel/css/popup.scss | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/js/components/popup.reel/css/popup.scss b/js/components/popup.reel/css/popup.scss index 75ff2814..fc959b84 100755 --- a/js/components/popup.reel/css/popup.scss +++ b/js/components/popup.reel/css/popup.scss | |||
@@ -34,43 +34,43 @@ $grey_light: #494949; | |||
34 | 34 | ||
35 | .default_popup | 35 | .default_popup |
36 | { | 36 | { |
37 | //MUST HAVE TO ALLOW FOR SIZE AJUSTMENTS | 37 | //MUST HAVE TO ALLOW FOR SIZE AJUSTMENTS |
38 | position: absolute; | 38 | position: absolute; |
39 | width: auto; | 39 | width: auto; |
40 | float: left; | 40 | float: left; |
41 | 41 | ||
42 | //TEXT STYLES | 42 | //TEXT STYLES |
43 | font-family: 'Droid Sans', sans-serif; | 43 | font-family: 'Droid Sans', sans-serif; |
44 | color: #FFF; | 44 | color: #FFF; |
45 | 45 | ||
46 | //BACKGROUND AND CONTAINER | 46 | //BACKGROUND AND CONTAINER |
47 | background: $grey_light; | 47 | background: $grey_light; |
48 | border: 1px solid $grey_dark; | 48 | border: 1px solid $grey_dark; |
49 | border-radius: 8px; | 49 | border-radius: 8px; |
50 | padding: 8px; | 50 | padding: 8px; |
51 | box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); | 51 | box-shadow: 0px 0px 8px rgba(0, 0, 0, .8); |
52 | pointerEvents: auto; | 52 | pointerEvents: auto; |
53 | } | 53 | } |
54 | 54 | ||
55 | .default_popup .content | 55 | .default_popup .content |
56 | { | 56 | { |
57 | overflow: auto; | 57 | overflow: auto; |
58 | float: left; | 58 | float: left; |
59 | } | 59 | } |
60 | 60 | ||
61 | .default_popup .tooltip | 61 | .default_popup .tooltip |
62 | { | 62 | { |
63 | position: absolute; | 63 | position: absolute; |
64 | overflow: hidden; | 64 | overflow: hidden; |
65 | } | 65 | } |
66 | 66 | ||
67 | .default_popup .tooltip span | 67 | .default_popup .tooltip span |
68 | { | 68 | { |
69 | -webkit-transform:rotate(45deg); | 69 | -webkit-transform:rotate(45deg); |
70 | width: 12px; | 70 | width: 12px; |
71 | height: 12px; | 71 | height: 12px; |
72 | margin: 3px; | 72 | margin: 3px; |
73 | display: block; | 73 | display: block; |
74 | background: $grey_light; | 74 | background: $grey_light; |
75 | border: 1px solid $grey_dark; | 75 | border: 1px solid $grey_dark; |
76 | } | 76 | } |