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/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 +++--- js/components/ui/property-control.reel/property-control.html | 8 ++++---- 4 files changed, 15 insertions(+), 17 deletions(-) (limited to 'js/components/ui') 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 @@ -
-
-
-
+
+
+
+
-- cgit v1.2.3 From 6cc9ba557dd47f407acc6b7f7527f5f2df61b362 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Thu, 3 May 2012 11:31:09 -0700 Subject: use data-montage-id instead of id in template Signed-off-by: Ananya Sen Conflicts: js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html Signed-off-by: Ananya Sen --- js/components/ui/icon-list-basic/icon.reel/icon.html | 6 +++--- js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | 6 +++--- js/components/ui/tree-basic/tree.reel/tree.html | 6 +++--- js/components/ui/tree-basic/treeItem.reel/treeItem.html | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'js/components/ui') diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html index f2406566..2ad5885a 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.html +++ b/js/components/ui/icon-list-basic/icon.reel/icon.html @@ -22,9 +22,9 @@ -
-
-
+
+
+
\ No newline at end of file diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html index 35260527..05d3ea7d 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html @@ -55,9 +55,9 @@ -
-
-
+
+
+
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html index f0c51fcc..1144b563 100755 --- a/js/components/ui/tree-basic/tree.reel/tree.html +++ b/js/components/ui/tree-basic/tree.reel/tree.html @@ -65,9 +65,9 @@ -
-
    -
  • +
    +
      +
    diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html index 9b8cb1ea..c5cdc533 100755 --- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html +++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html @@ -23,12 +23,12 @@ -
  • - +
  • +
    - +
    - +
    • \ No newline at end of file -- cgit v1.2.3 From 29ad6355ef60cfb3b3fc7f780504f3ed30845883 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 7 May 2012 14:30:47 -0700 Subject: More implementation of moving color chips to the individual subtools. Removed the tool color bar Added new icons for inkbottle Removed Pencil tool Removed Inkbottle tool Added chips to the pen, brush and tag tools Aligned controls in several subtools --- js/components/ui/color-chip.reel/color-chip.css | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'js/components/ui') diff --git a/js/components/ui/color-chip.reel/color-chip.css b/js/components/ui/color-chip.reel/color-chip.css index da75c41e..7c7135a2 100755 --- a/js/components/ui/color-chip.reel/color-chip.css +++ b/js/components/ui/color-chip.reel/color-chip.css @@ -19,13 +19,3 @@ padding: 0; background: none; } - -.colortoolbar .chipContainer { - margin: 1px 1px 1px 1px !important; - width: 40px !important; - height: 20px !important; - border: 0; - padding: 0; - background-image: url(../../../../images/colorpanel/transparent.png) !important; - background-repeat: repeat !important; -} \ No newline at end of file -- cgit v1.2.3