From 6b67b498b3b1eec82e7bb7f34261e2c390506616 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 30 Apr 2012 16:04:13 -0700 Subject: Updating id to data-montage-id (and associated CSS, if necessary) in some of our custom ui controls (such as hottest, slider, etc.), materials panels and three-d section of the PI. Signed-off-by: Nivesh Rajbhandari --- js/components/checkbox.reel/checkbox.html | 2 +- js/components/combobox.reel/combobox.html | 2 +- js/components/hottext.reel/hottext.html | 2 +- js/components/hottextunit.reel/hottextunit.html | 2 +- js/components/radio.reel/radio.html | 2 +- js/components/slider.reel/slider.html | 8 ++-- js/components/textfield.reel/textfield.html | 2 +- js/components/ui/color-chip.reel/color-chip.html | 12 +++--- js/components/ui/file-input.reel/file-input.html | 6 +-- js/components/ui/input-group.reel/input-group.html | 6 +-- .../ui/property-control.reel/property-control.html | 8 ++-- .../materials-library-panel.css | 43 +++++++++------------- .../materials-library-panel.html | 14 +++---- .../materials-popup.reel/materials-popup.css | 15 +++++--- .../materials-popup.reel/materials-popup.html | 26 ++++--------- .../sections/three-d-view.reel/three-d-view.html | 30 +++++++-------- 16 files changed, 82 insertions(+), 98 deletions(-) (limited to 'js') diff --git a/js/components/checkbox.reel/checkbox.html b/js/components/checkbox.reel/checkbox.html index a03d72fb..ded91fc2 100755 --- a/js/components/checkbox.reel/checkbox.html +++ b/js/components/checkbox.reel/checkbox.html @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/js/components/combobox.reel/combobox.html b/js/components/combobox.reel/combobox.html index a68dd37f..81920005 100755 --- a/js/components/combobox.reel/combobox.html +++ b/js/components/combobox.reel/combobox.html @@ -18,6 +18,6 @@ - \ No newline at end of file diff --git a/js/components/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html index 314d4ca3..c759354e 100755 --- a/js/components/hottext.reel/hottext.html +++ b/js/components/hottext.reel/hottext.html @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/js/components/hottextunit.reel/hottextunit.html b/js/components/hottextunit.reel/hottextunit.html index 3f946f9b..ec10f975 100755 --- a/js/components/hottextunit.reel/hottextunit.html +++ b/js/components/hottextunit.reel/hottextunit.html @@ -22,6 +22,6 @@ -
+
\ No newline at end of file diff --git a/js/components/radio.reel/radio.html b/js/components/radio.reel/radio.html index 2a8ba3dd..01b76b92 100755 --- a/js/components/radio.reel/radio.html +++ b/js/components/radio.reel/radio.html @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/js/components/slider.reel/slider.html b/js/components/slider.reel/slider.html index ecfb6ca4..b23aa651 100755 --- a/js/components/slider.reel/slider.html +++ b/js/components/slider.reel/slider.html @@ -27,10 +27,10 @@ -
-
- -
+
+
+ +
diff --git a/js/components/textfield.reel/textfield.html b/js/components/textfield.reel/textfield.html index 22f487ac..f3f8ac53 100755 --- a/js/components/textfield.reel/textfield.html +++ b/js/components/textfield.reel/textfield.html @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html index 8f10092d..647f7e79 100755 --- a/js/components/ui/color-chip.reel/color-chip.html +++ b/js/components/ui/color-chip.reel/color-chip.html @@ -23,13 +23,11 @@ -
- -
- -
- +
+
+
+ +
- \ No newline at end of file diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html index 0c3c465e..735f970c 100755 --- a/js/components/ui/file-input.reel/file-input.html +++ b/js/components/ui/file-input.reel/file-input.html @@ -22,9 +22,9 @@ -
- - +
+ +
\ No newline at end of file diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html index 4cdb4e69..ba85c089 100755 --- a/js/components/ui/input-group.reel/input-group.html +++ b/js/components/ui/input-group.reel/input-group.html @@ -65,9 +65,9 @@ -
-
-
+
+
+
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html index d85cb0e3..0535ea5f 100755 --- a/js/components/ui/property-control.reel/property-control.html +++ b/js/components/ui/property-control.reel/property-control.html @@ -28,10 +28,10 @@ -
-
-
-
+
+
+
+
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css index fe88ebf6..bed3acfe 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.css @@ -5,43 +5,34 @@ */ .materials_library_panel hr { - float: left; - clear: both; - width: 100%; - display: block; - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); - border: none; - height: 2px; - margin: 4px 0px 4px 0px; + float: left; + clear: both; + width: 100%; + display: block; + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); + border: none; + height: 2px; + margin: 4px 0 4px 0; } -#ml_buttons { +.ml_buttons { clear:both; float: left; - margin: 0px -4px 0px 4px; + margin: 0 -4px 0 4px; width: 97%; } -#ml_buttons .nj-skinned{ - height: 22px; - overflow: hidden; - display: block; - cursor: pointer; - margin: 0px 1px; -} - -#ml_add_btn { - float: left; - width: 60px; -} - -#ml_copy_btn { +.ml_buttons .nj-skinned { + height: 22px; + overflow: hidden; + display: block; + cursor: pointer; + margin: 0 1px; float: left; width: 60px; } -#ml_delete_btn { +.ml_buttons .nj-skinned:last-child { float: right; - width: 60px; } \ No newline at end of file diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 741ff6aa..7fc48a55 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html @@ -88,15 +88,15 @@ -
-
-
+
+
+
-
- - - +
+ + +
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index 2d339411..943d9bcb 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css @@ -21,15 +21,15 @@ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.5, #1d1d1d), color-stop(0.75, #424242)); border: none; height: 2px; - margin: 4px 0px 4px 0px; + margin: 4px 0 4px 0; } -#mp_title { - margin: 4px 0px 0px 0px; +.mp_title { + margin: 4px 0 0 0; text-align: center; } -#mp_preview { +.mp_preview { height: 100px; text-align: center; } @@ -84,12 +84,17 @@ width: 27px !important; height: 27px !important; overflow:hidden !important; + margin-top: -6px; +} + +.mp_properties_list .mp_property:first-child { + margin-bottom: 12px; } .mp_buttons { clear:both; float: left; - margin: 0px -4px 0px 4px; + margin: 0 -4px 4px 4px; width: 97%; } diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index 9fdbc00d..d18599d6 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html @@ -88,29 +88,19 @@ - -
-
Material Name
- +
+
Material Name
- -
Preview Pane
- +
Preview Pane
- -
-
+
+
-
- -
- - +
+ +
-
- - \ No newline at end of file diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index b82124d0..5ef13fab 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html @@ -259,43 +259,43 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -
-
+
+
-
+
-
+
- +
-
+
- +
-
+
- +
-
+
@@ -306,7 +306,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -314,7 +314,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -322,7 +322,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -336,7 +336,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
-
+
@@ -347,7 +347,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
- +
-- cgit v1.2.3