Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml =================================================================== diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -rbd2bc54a1b78829ff02a8355a86be5a7a44978ec --- lams_flex/LamsAuthor/src/LamsAuthor.mxml (.../LamsAuthor.mxml) (revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633) +++ lams_flex/LamsAuthor/src/LamsAuthor.mxml (.../LamsAuthor.mxml) (revision bd2bc54a1b78829ff02a8355a86be5a7a44978ec) @@ -82,11 +82,13 @@ />--> - + + + Index: lams_flex/LamsAuthor/src/assets/icons/branch.png =================================================================== diff -u Binary files differ Index: lams_flex/LamsAuthor/src/assets/icons/converge.png =================================================================== diff -u Binary files differ Index: lams_flex/LamsAuthor/src/assets/icons/gate.png =================================================================== diff -u Binary files differ Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml =================================================================== diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -rbd2bc54a1b78829ff02a8355a86be5a7a44978ec --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml (.../ToolBar.mxml) (revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633) +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBar.mxml (.../ToolBar.mxml) (revision bd2bc54a1b78829ff02a8355a86be5a7a44978ec) @@ -1,19 +1,42 @@ - + xmlns:components="org.lamsfoundation.lams.author.components.*"> - + + + @@ -43,17 +66,53 @@ - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBarDropDown.mxml =================================================================== diff -u --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBarDropDown.mxml (revision 0) +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/ToolBarDropDown.mxml (revision bd2bc54a1b78829ff02a8355a86be5a7a44978ec) @@ -0,0 +1,30 @@ + + + + + +