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/input-radio.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/input-radio.reel')
-rw-r--r-- | node_modules/montage/ui/input-radio.reel/input-radio.css | 10 | ||||
-rw-r--r-- | node_modules/montage/ui/input-radio.reel/input-radio.html | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/node_modules/montage/ui/input-radio.reel/input-radio.css b/node_modules/montage/ui/input-radio.reel/input-radio.css index 020c4cee..25231b21 100644 --- a/node_modules/montage/ui/input-radio.reel/input-radio.css +++ b/node_modules/montage/ui/input-radio.reel/input-radio.css | |||
@@ -27,7 +27,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 27 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | .montage-inputRadio { | 31 | .montage-inputRadio { |
32 | -webkit-appearance: none; | 32 | -webkit-appearance: none; |
33 | -moz-appearance: none; | 33 | -moz-appearance: none; |
@@ -42,19 +42,19 @@ POSSIBILITY OF SUCH DAMAGE. | |||
42 | background: #f2f2f2; | 42 | background: #f2f2f2; |
43 | cursor: pointer; | 43 | cursor: pointer; |
44 | } | 44 | } |
45 | 45 | ||
46 | .montage-inputRadio:hover { | 46 | .montage-inputRadio:hover { |
47 | background-color: #fff; | 47 | background-color: #fff; |
48 | } | 48 | } |
49 | 49 | ||
50 | .montage-inputRadio:active { | 50 | .montage-inputRadio:active { |
51 | background-color: #e5e5e5; | 51 | background-color: #e5e5e5; |
52 | } | 52 | } |
53 | 53 | ||
54 | .montage-inputRadio:focus { | 54 | .montage-inputRadio:focus { |
55 | border-color: #7f7f7f; | 55 | border-color: #7f7f7f; |
56 | } | 56 | } |
57 | 57 | ||
58 | .montage-inputRadio:checked { | 58 | .montage-inputRadio:checked { |
59 | background: #f2f2f2 url(radio.png) no-repeat center; | 59 | background: #f2f2f2 url(radio.png) no-repeat center; |
60 | } | 60 | } |
diff --git a/node_modules/montage/ui/input-radio.reel/input-radio.html b/node_modules/montage/ui/input-radio.reel/input-radio.html index d2df2c83..a1cd408d 100644 --- a/node_modules/montage/ui/input-radio.reel/input-radio.html +++ b/node_modules/montage/ui/input-radio.reel/input-radio.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. |