diff options
author | Jon Reid | 2012-05-15 11:24:53 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css | |
parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css')
-rw-r--r-- | node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css index 3147fc67..9f9affab 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css | |||
@@ -30,94 +30,94 @@ | |||
30 | border-radius: 5px; | 30 | border-radius: 5px; |
31 | } | 31 | } |
32 | 32 | ||
33 | #montage-resizer-handle-n { | 33 | .montage-resizer-handle.n { |
34 | top: -4px; | 34 | top: -4px; |
35 | left: 50%; | 35 | left: 50%; |
36 | margin-left: -4px; | 36 | margin-left: -4px; |
37 | cursor: n-resize; | 37 | cursor: n-resize; |
38 | } | 38 | } |
39 | 39 | ||
40 | #montage-resizer-handle-n:hover { | 40 | .montage-resizer-handle.n:hover { |
41 | top: -5px; | 41 | top: -5px; |
42 | margin-left: -5px; | 42 | margin-left: -5px; |
43 | } | 43 | } |
44 | 44 | ||
45 | #montage-resizer-handle-ne { | 45 | .montage-resizer-handle.ne { |
46 | top: -4px; | 46 | top: -4px; |
47 | right: -4px; | 47 | right: -4px; |
48 | cursor: ne-resize; | 48 | cursor: ne-resize; |
49 | } | 49 | } |
50 | 50 | ||
51 | #montage-resizer-handle-ne:hover { | 51 | .montage-resizer-handle.ne:hover { |
52 | top: -5px; | 52 | top: -5px; |
53 | right: -5px; | 53 | right: -5px; |
54 | } | 54 | } |
55 | 55 | ||
56 | #montage-resizer-handle-e { | 56 | .montage-resizer-handle.e { |
57 | right: -4px; | 57 | right: -4px; |
58 | top: 50%; | 58 | top: 50%; |
59 | margin-top: -4px; | 59 | margin-top: -4px; |
60 | cursor: e-resize; | 60 | cursor: e-resize; |
61 | } | 61 | } |
62 | 62 | ||
63 | #montage-resizer-handle-e:hover { | 63 | .montage-resizer-handle.e:hover { |
64 | right: -5px; | 64 | right: -5px; |
65 | margin-top: -5px; | 65 | margin-top: -5px; |
66 | } | 66 | } |
67 | 67 | ||
68 | #montage-resizer-handle-se { | 68 | .montage-resizer-handle.se { |
69 | bottom: -4px; | 69 | bottom: -4px; |
70 | right: -4px; | 70 | right: -4px; |
71 | cursor: se-resize; | 71 | cursor: se-resize; |
72 | } | 72 | } |
73 | 73 | ||
74 | #montage-resizer-handle-se:hover { | 74 | .montage-resizer-handle.se:hover { |
75 | bottom: -5px; | 75 | bottom: -5px; |
76 | right: -5px; | 76 | right: -5px; |
77 | } | 77 | } |
78 | 78 | ||
79 | #montage-resizer-handle-s { | 79 | .montage-resizer-handle.s { |
80 | bottom: -4px; | 80 | bottom: -4px; |
81 | left: 50%; | 81 | left: 50%; |
82 | margin-left: -4px; | 82 | margin-left: -4px; |
83 | cursor: s-resize; | 83 | cursor: s-resize; |
84 | } | 84 | } |
85 | 85 | ||
86 | #montage-resizer-handle-s:hover { | 86 | .montage-resizer-handle.s:hover { |
87 | bottom: -5px; | 87 | bottom: -5px; |
88 | margin-left: -5px; | 88 | margin-left: -5px; |
89 | } | 89 | } |
90 | 90 | ||
91 | #montage-resizer-handle-sw { | 91 | .montage-resizer-handle.sw { |
92 | bottom: -4px; | 92 | bottom: -4px; |
93 | left: -4px; | 93 | left: -4px; |
94 | cursor: sw-resize; | 94 | cursor: sw-resize; |
95 | } | 95 | } |
96 | 96 | ||
97 | #montage-resizer-handle-sw:hover { | 97 | .montage-resizer-handle.sw:hover { |
98 | bottom: -5px; | 98 | bottom: -5px; |
99 | left: -5px; | 99 | left: -5px; |
100 | } | 100 | } |
101 | 101 | ||
102 | #montage-resizer-handle-w { | 102 | .montage-resizer-handle.w { |
103 | left: -4px; | 103 | left: -4px; |
104 | top: 50%; | 104 | top: 50%; |
105 | margin-top: -4px; | 105 | margin-top: -4px; |
106 | cursor: w-resize; | 106 | cursor: w-resize; |
107 | } | 107 | } |
108 | 108 | ||
109 | #montage-resizer-handle-w:hover { | 109 | .montage-resizer-handle.w:hover { |
110 | left: -5px; | 110 | left: -5px; |
111 | margin-top: -5px; | 111 | margin-top: -5px; |
112 | } | 112 | } |
113 | 113 | ||
114 | #montage-resizer-handle-nw { | 114 | .montage-resizer-handle.nw { |
115 | top: -4px; | 115 | top: -4px; |
116 | left: -4px; | 116 | left: -4px; |
117 | cursor: nw-resize; | 117 | cursor: nw-resize; |
118 | } | 118 | } |
119 | 119 | ||
120 | #montage-resizer-handle-nw:hover { | 120 | .montage-resizer-handle.nw:hover { |
121 | top: -5px; | 121 | top: -5px; |
122 | left: -5px; | 122 | left: -5px; |
123 | } | 123 | } |