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 /node_modules/montage/ui/select.reel | |
| 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 'node_modules/montage/ui/select.reel')
| -rw-r--r-- | node_modules/montage/ui/select.reel/select.css | 6 | ||||
| -rw-r--r-- | node_modules/montage/ui/select.reel/select.html | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/select.reel/select.css b/node_modules/montage/ui/select.reel/select.css index 6ed695d3..f96a40df 100644 --- a/node_modules/montage/ui/select.reel/select.css +++ b/node_modules/montage/ui/select.reel/select.css | |||
| @@ -41,15 +41,15 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 41 | background: #f2f2f2 url(select.png) no-repeat right center; | 41 | background: #f2f2f2 url(select.png) no-repeat right center; |
| 42 | cursor: pointer; | 42 | cursor: pointer; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | .montage-select:hover { | 45 | .montage-select:hover { |
| 46 | background-color: #fff; | 46 | background-color: #fff; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | .montage-select:active { | 49 | .montage-select:active { |
| 50 | background-color: #e5e5e5; | 50 | background-color: #e5e5e5; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | .montage-select:focus { | 53 | .montage-select:focus { |
| 54 | border-color: #7f7f7f; | 54 | border-color: #7f7f7f; |
| 55 | } | 55 | } |
diff --git a/node_modules/montage/ui/select.reel/select.html b/node_modules/montage/ui/select.reel/select.html index 58c09eda..c725610b 100644 --- a/node_modules/montage/ui/select.reel/select.html +++ b/node_modules/montage/ui/select.reel/select.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |