Commit b250ae270927f93e1f03cfc876882c8097070e9d
1 parent
f5dbd4b7
增加一个提示
Showing
11 changed files
with
197 additions
and
57 deletions
.idea/workspace.xml
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | <favorites_list name="programming" /> | 20 | <favorites_list name="programming" /> |
| 21 | </component> | 21 | </component> |
| 22 | <component name="FileEditorManager"> | 22 | <component name="FileEditorManager"> |
| 23 | - <leaf> | 23 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 24 | <file leaf-file-name="Dir.js" pinned="false" current-in-tab="false"> | 24 | <file leaf-file-name="Dir.js" pinned="false" current-in-tab="false"> |
| 25 | <entry file="file://$PROJECT_DIR$/src/gxb-ide/Dir.js"> | 25 | <entry file="file://$PROJECT_DIR$/src/gxb-ide/Dir.js"> |
| 26 | <provider selected="true" editor-type-id="text-editor"> | 26 | <provider selected="true" editor-type-id="text-editor"> |
| @@ -46,8 +46,8 @@ | @@ -46,8 +46,8 @@ | ||
| 46 | <file leaf-file-name="README.md" pinned="false" current-in-tab="true"> | 46 | <file leaf-file-name="README.md" pinned="false" current-in-tab="true"> |
| 47 | <entry file="file://$PROJECT_DIR$/README.md"> | 47 | <entry file="file://$PROJECT_DIR$/README.md"> |
| 48 | <provider selected="true" editor-type-id="text-editor"> | 48 | <provider selected="true" editor-type-id="text-editor"> |
| 49 | - <state relative-caret-position="153"> | ||
| 50 | - <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> | 49 | + <state relative-caret-position="170"> |
| 50 | + <caret line="14" column="3" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" /> | ||
| 51 | <folding /> | 51 | <folding /> |
| 52 | </state> | 52 | </state> |
| 53 | </provider> | 53 | </provider> |
| @@ -102,6 +102,7 @@ | @@ -102,6 +102,7 @@ | ||
| 102 | <foldersAlwaysOnTop value="true" /> | 102 | <foldersAlwaysOnTop value="true" /> |
| 103 | </navigator> | 103 | </navigator> |
| 104 | <panes> | 104 | <panes> |
| 105 | + <pane id="Scratches" /> | ||
| 105 | <pane id="ProjectPane"> | 106 | <pane id="ProjectPane"> |
| 106 | <subPane> | 107 | <subPane> |
| 107 | <PATH> | 108 | <PATH> |
| @@ -172,9 +173,8 @@ | @@ -172,9 +173,8 @@ | ||
| 172 | </PATH> | 173 | </PATH> |
| 173 | </subPane> | 174 | </subPane> |
| 174 | </pane> | 175 | </pane> |
| 175 | - <pane id="Scope" /> | ||
| 176 | <pane id="PackagesPane" /> | 176 | <pane id="PackagesPane" /> |
| 177 | - <pane id="Scratches" /> | 177 | + <pane id="Scope" /> |
| 178 | </panes> | 178 | </panes> |
| 179 | </component> | 179 | </component> |
| 180 | <component name="PropertiesComponent"> | 180 | <component name="PropertiesComponent"> |
| @@ -416,6 +416,7 @@ | @@ -416,6 +416,7 @@ | ||
| 416 | <setting name="cmdLine" value="run-app" /> | 416 | <setting name="cmdLine" value="run-app" /> |
| 417 | <setting name="passParentEnv" value="true" /> | 417 | <setting name="passParentEnv" value="true" /> |
| 418 | <setting name="launchBrowser" value="true" /> | 418 | <setting name="launchBrowser" value="true" /> |
| 419 | + <setting name="depsClasspath" value="false" /> | ||
| 419 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> | 420 | <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> |
| 420 | <method /> | 421 | <method /> |
| 421 | </configuration> | 422 | </configuration> |
| @@ -581,6 +582,12 @@ | @@ -581,6 +582,12 @@ | ||
| 581 | <method /> | 582 | <method /> |
| 582 | </configuration> | 583 | </configuration> |
| 583 | <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> | 584 | <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> |
| 585 | + <node-interpreter>project</node-interpreter> | ||
| 586 | + <node-options /> | ||
| 587 | + <gulpfile /> | ||
| 588 | + <tasks /> | ||
| 589 | + <arguments /> | ||
| 590 | + <envs /> | ||
| 584 | <method /> | 591 | <method /> |
| 585 | </configuration> | 592 | </configuration> |
| 586 | <configuration default="true" type="js.build_tools.npm" factoryName="npm"> | 593 | <configuration default="true" type="js.build_tools.npm" factoryName="npm"> |
| @@ -608,40 +615,41 @@ | @@ -608,40 +615,41 @@ | ||
| 608 | <option name="presentableId" value="Default" /> | 615 | <option name="presentableId" value="Default" /> |
| 609 | <updated>1521082406200</updated> | 616 | <updated>1521082406200</updated> |
| 610 | <workItem from="1521082408104" duration="1336000" /> | 617 | <workItem from="1521082408104" duration="1336000" /> |
| 618 | + <workItem from="1521277481140" duration="4000" /> | ||
| 611 | </task> | 619 | </task> |
| 612 | <servers /> | 620 | <servers /> |
| 613 | </component> | 621 | </component> |
| 614 | <component name="TimeTrackingManager"> | 622 | <component name="TimeTrackingManager"> |
| 615 | - <option name="totallyTimeSpent" value="1336000" /> | 623 | + <option name="totallyTimeSpent" value="1340000" /> |
| 616 | </component> | 624 | </component> |
| 617 | <component name="ToolWindowManager"> | 625 | <component name="ToolWindowManager"> |
| 618 | <frame x="0" y="23" width="1232" height="730" extended-state="0" /> | 626 | <frame x="0" y="23" width="1232" height="730" extended-state="0" /> |
| 619 | - <editor active="false" /> | 627 | + <editor active="true" /> |
| 620 | <layout> | 628 | <layout> |
| 621 | - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | 629 | + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| 622 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 630 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
| 623 | - <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
| 624 | - <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
| 625 | - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> | ||
| 626 | - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | 631 | + <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
| 632 | + <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
| 633 | + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> | ||
| 634 | + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
| 627 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 635 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
| 628 | - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
| 629 | - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
| 630 | - <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | ||
| 631 | - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | 636 | + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
| 637 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | ||
| 638 | + <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||
| 639 | + <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | ||
| 632 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24537815" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 640 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24537815" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
| 633 | - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | 641 | + <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| 634 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 642 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| 635 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 643 | <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| 636 | - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> | 644 | + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
| 637 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 645 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| 638 | - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> | 646 | + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> |
| 639 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> | 647 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> |
| 640 | - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> | ||
| 641 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 648 | <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 642 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> | 649 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 643 | - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
| 644 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | 650 | <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 651 | + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> | ||
| 652 | + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | ||
| 645 | </layout> | 653 | </layout> |
| 646 | </component> | 654 | </component> |
| 647 | <component name="Vcs.Log.UiProperties"> | 655 | <component name="Vcs.Log.UiProperties"> |
| @@ -680,8 +688,34 @@ | @@ -680,8 +688,34 @@ | ||
| 680 | </entry> | 688 | </entry> |
| 681 | <entry file="file://$PROJECT_DIR$/README.md"> | 689 | <entry file="file://$PROJECT_DIR$/README.md"> |
| 682 | <provider selected="true" editor-type-id="text-editor"> | 690 | <provider selected="true" editor-type-id="text-editor"> |
| 683 | - <state relative-caret-position="153"> | ||
| 684 | - <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> | 691 | + <state relative-caret-position="0"> |
| 692 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 693 | + <folding /> | ||
| 694 | + </state> | ||
| 695 | + </provider> | ||
| 696 | + </entry> | ||
| 697 | + <entry file="file://$PROJECT_DIR$/src/gxb-ide/Dir.js"> | ||
| 698 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 699 | + <state relative-caret-position="0"> | ||
| 700 | + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 701 | + <folding> | ||
| 702 | + <element signature="n#!!doc" expanded="true" /> | ||
| 703 | + </folding> | ||
| 704 | + </state> | ||
| 705 | + </provider> | ||
| 706 | + </entry> | ||
| 707 | + <entry file="file://$PROJECT_DIR$/src/gxb-ide/Ide.js"> | ||
| 708 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 709 | + <state relative-caret-position="323"> | ||
| 710 | + <caret line="19" column="29" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="29" /> | ||
| 711 | + <folding /> | ||
| 712 | + </state> | ||
| 713 | + </provider> | ||
| 714 | + </entry> | ||
| 715 | + <entry file="file://$PROJECT_DIR$/README.md"> | ||
| 716 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 717 | + <state relative-caret-position="170"> | ||
| 718 | + <caret line="14" column="3" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" /> | ||
| 685 | <folding /> | 719 | <folding /> |
| 686 | </state> | 720 | </state> |
| 687 | </provider> | 721 | </provider> |
dist/css/ide.css
| @@ -148,12 +148,24 @@ html, body { | @@ -148,12 +148,24 @@ html, body { | ||
| 148 | .tooltip-inner { | 148 | .tooltip-inner { |
| 149 | background-color: transparent; | 149 | background-color: transparent; |
| 150 | color: #1FB6FF; | 150 | color: #1FB6FF; |
| 151 | - padding: 3px 6px; } | 151 | + padding: 3px 10px; } |
| 152 | 152 | ||
| 153 | .tooltip.top { | 153 | .tooltip.top { |
| 154 | - background: url("../img/toptip.png") no-repeat; | ||
| 155 | - height: 36px; | ||
| 156 | - top: -28px !important; } | 154 | + background: #fff; |
| 155 | + border: 1px solid #1FB6FF; | ||
| 156 | + border-radius: 6px; } | ||
| 157 | + .tooltip.top:before, .tooltip.top:after { | ||
| 158 | + position: absolute; | ||
| 159 | + left: 50%; | ||
| 160 | + top: 100%; | ||
| 161 | + margin-left: -6px; | ||
| 162 | + content: ""; | ||
| 163 | + border: 6px solid transparent; | ||
| 164 | + border-bottom: 0; | ||
| 165 | + border-top: 6px solid #1FB6FF; } | ||
| 166 | + .tooltip.top:after { | ||
| 167 | + margin-top: -1px; | ||
| 168 | + border-top-color: #fff; } | ||
| 157 | 169 | ||
| 158 | .tooltip.top .tooltip-arrow { | 170 | .tooltip.top .tooltip-arrow { |
| 159 | border-top-color: transparent; } | 171 | border-top-color: transparent; } |
dist/css/main.css
| @@ -20,12 +20,24 @@ html, body { | @@ -20,12 +20,24 @@ html, body { | ||
| 20 | .tooltip-inner { | 20 | .tooltip-inner { |
| 21 | background-color: transparent; | 21 | background-color: transparent; |
| 22 | color: #1FB6FF; | 22 | color: #1FB6FF; |
| 23 | - padding: 3px 6px; } | 23 | + padding: 3px 10px; } |
| 24 | 24 | ||
| 25 | .tooltip.top { | 25 | .tooltip.top { |
| 26 | - background: url("../img/toptip.png") no-repeat; | ||
| 27 | - height: 36px; | ||
| 28 | - top: -28px !important; } | 26 | + background: #fff; |
| 27 | + border: 1px solid #1FB6FF; | ||
| 28 | + border-radius: 6px; } | ||
| 29 | + .tooltip.top:before, .tooltip.top:after { | ||
| 30 | + position: absolute; | ||
| 31 | + left: 50%; | ||
| 32 | + top: 100%; | ||
| 33 | + margin-left: -6px; | ||
| 34 | + content: ""; | ||
| 35 | + border: 6px solid transparent; | ||
| 36 | + border-bottom: 0; | ||
| 37 | + border-top: 6px solid #1FB6FF; } | ||
| 38 | + .tooltip.top:after { | ||
| 39 | + margin-top: -1px; | ||
| 40 | + border-top-color: #fff; } | ||
| 29 | 41 | ||
| 30 | .tooltip.top .tooltip-arrow { | 42 | .tooltip.top .tooltip-arrow { |
| 31 | border-top-color: transparent; } | 43 | border-top-color: transparent; } |
dist/gxb-ide/ToolBox.js
| @@ -4,7 +4,8 @@ | @@ -4,7 +4,8 @@ | ||
| 4 | '<audio id="audio"></audio>'+ | 4 | '<audio id="audio"></audio>'+ |
| 5 | '</div>'+ | 5 | '</div>'+ |
| 6 | '<div class="ctrl-wrap">'+ | 6 | '<div class="ctrl-wrap">'+ |
| 7 | - '<div class="tool-item" id="start-recording" data="1" data-toggle="tooltip" data-placement="top" title="开始录制"><img src="" alt="" /></div>'+ | 7 | + '<div class="tool-item" id="prepare-recording" data-toggle="tooltip" data-placement="top" title="点此开始录制"><img src="" alt="" /></div>'+ |
| 8 | + '<div class="tool-item" id="start-recording" data="1" data-toggle="tooltip" data-placement="top" title="<span class=\'tooltip-content-large\'>点此开始录制</span>"><img src="" alt="" /></div>'+ | ||
| 8 | '<div class="tool-item" id="stop-recording" data="1" data-toggle="tooltip" data-placement="top" title="结束录制"><img src="" alt="" /></div>'+ | 9 | '<div class="tool-item" id="stop-recording" data="1" data-toggle="tooltip" data-placement="top" title="结束录制"><img src="" alt="" /></div>'+ |
| 9 | '<div class="tool-item" id="re-recoding" data="1" data-toggle="tooltip" data-placement="top" title="重新录制"><img src="" alt="" /></div>'+ | 10 | '<div class="tool-item" id="re-recoding" data="1" data-toggle="tooltip" data-placement="top" title="重新录制"><img src="" alt="" /></div>'+ |
| 10 | '</div>'+ | 11 | '</div>'+ |
| @@ -58,12 +59,21 @@ | @@ -58,12 +59,21 @@ | ||
| 58 | var toolBox = this.options.el; | 59 | var toolBox = this.options.el; |
| 59 | $(toolBox).html(template) | 60 | $(toolBox).html(template) |
| 60 | 61 | ||
| 62 | + $('#prepare-recording img').attr('src', '../img/ideicon/new-recording.svg'); | ||
| 61 | $('#start-recording img').attr('src', '../img/ideicon/new-recording.svg'); | 63 | $('#start-recording img').attr('src', '../img/ideicon/new-recording.svg'); |
| 62 | $('#stop-recording img').attr('src', '../img/recording.svg'); | 64 | $('#stop-recording img').attr('src', '../img/recording.svg'); |
| 63 | $('#re-recoding img').attr('src', '../img/ideicon/new-recording.svg'); | 65 | $('#re-recoding img').attr('src', '../img/ideicon/new-recording.svg'); |
| 64 | $('#audio-play img').attr('src', '../img/play.svg'); | 66 | $('#audio-play img').attr('src', '../img/play.svg'); |
| 65 | 67 | ||
| 66 | - $('#start-recording').show() | 68 | + // $('#prepare-recording').show(); |
| 69 | + // $('#prepare-recording').tooltip('show'); | ||
| 70 | + // $('#prepare-recording').on('click', function() { | ||
| 71 | + // $(this).hide(); | ||
| 72 | + // $('#start-recording').show(); | ||
| 73 | + // }); | ||
| 74 | + $('#start-recording').show(); | ||
| 75 | + $('#start-recording').tooltip({ html : true }); | ||
| 76 | + $('#start-recording').tooltip('show'); | ||
| 67 | 77 | ||
| 68 | _this.events(); | 78 | _this.events(); |
| 69 | 79 |
dist/gxb-ide/toolBox.css
dist/scss/main.scss
| @@ -21,15 +21,30 @@ html, body{ | @@ -21,15 +21,30 @@ html, body{ | ||
| 21 | .tooltip-inner{ | 21 | .tooltip-inner{ |
| 22 | background-color: transparent; | 22 | background-color: transparent; |
| 23 | color: #1FB6FF; | 23 | color: #1FB6FF; |
| 24 | - padding: 3px 6px; | 24 | + padding: 3px 10px; |
| 25 | } | 25 | } |
| 26 | .tooltip.top{ | 26 | .tooltip.top{ |
| 27 | - background: url('../img/toptip.png') no-repeat; | ||
| 28 | - height: 36px; | ||
| 29 | - top: -28px !important; | ||
| 30 | -} | ||
| 31 | -.tooltip.top .tooltip-arrow{ | ||
| 32 | - // border-top-color: #1FB6FF; | 27 | + // background: url('../img/toptip.png') no-repeat; |
| 28 | + // height: 36px; | ||
| 29 | + // top: -28px !important; | ||
| 30 | + background: #fff; | ||
| 31 | + border: 1px solid #1FB6FF; | ||
| 32 | + border-radius: 6px; | ||
| 33 | + | ||
| 34 | + &:before, &:after { | ||
| 35 | + position: absolute; | ||
| 36 | + left: 50%; | ||
| 37 | + top: 100%; | ||
| 38 | + margin-left: -6px; | ||
| 39 | + content: ""; | ||
| 40 | + border: 6px solid transparent; | ||
| 41 | + border-bottom: 0; | ||
| 42 | + border-top: 6px solid #1FB6FF; | ||
| 43 | + } | ||
| 44 | + &:after { | ||
| 45 | + margin-top: -1px; | ||
| 46 | + border-top-color: #fff; | ||
| 47 | + } | ||
| 33 | } | 48 | } |
| 34 | .tooltip.top .tooltip-arrow{ | 49 | .tooltip.top .tooltip-arrow{ |
| 35 | border-top-color: transparent; | 50 | border-top-color: transparent; |
src/css/ide.css
| @@ -148,12 +148,24 @@ html, body { | @@ -148,12 +148,24 @@ html, body { | ||
| 148 | .tooltip-inner { | 148 | .tooltip-inner { |
| 149 | background-color: transparent; | 149 | background-color: transparent; |
| 150 | color: #1FB6FF; | 150 | color: #1FB6FF; |
| 151 | - padding: 3px 6px; } | 151 | + padding: 3px 10px; } |
| 152 | 152 | ||
| 153 | .tooltip.top { | 153 | .tooltip.top { |
| 154 | - background: url("../img/toptip.png") no-repeat; | ||
| 155 | - height: 36px; | ||
| 156 | - top: -28px !important; } | 154 | + background: #fff; |
| 155 | + border: 1px solid #1FB6FF; | ||
| 156 | + border-radius: 6px; } | ||
| 157 | + .tooltip.top:before, .tooltip.top:after { | ||
| 158 | + position: absolute; | ||
| 159 | + left: 50%; | ||
| 160 | + top: 100%; | ||
| 161 | + margin-left: -6px; | ||
| 162 | + content: ""; | ||
| 163 | + border: 6px solid transparent; | ||
| 164 | + border-bottom: 0; | ||
| 165 | + border-top: 6px solid #1FB6FF; } | ||
| 166 | + .tooltip.top:after { | ||
| 167 | + margin-top: -1px; | ||
| 168 | + border-top-color: #fff; } | ||
| 157 | 169 | ||
| 158 | .tooltip.top .tooltip-arrow { | 170 | .tooltip.top .tooltip-arrow { |
| 159 | border-top-color: transparent; } | 171 | border-top-color: transparent; } |
src/css/main.css
| @@ -20,12 +20,24 @@ html, body { | @@ -20,12 +20,24 @@ html, body { | ||
| 20 | .tooltip-inner { | 20 | .tooltip-inner { |
| 21 | background-color: transparent; | 21 | background-color: transparent; |
| 22 | color: #1FB6FF; | 22 | color: #1FB6FF; |
| 23 | - padding: 3px 6px; } | 23 | + padding: 3px 10px; } |
| 24 | 24 | ||
| 25 | .tooltip.top { | 25 | .tooltip.top { |
| 26 | - background: url("../img/toptip.png") no-repeat; | ||
| 27 | - height: 36px; | ||
| 28 | - top: -28px !important; } | 26 | + background: #fff; |
| 27 | + border: 1px solid #1FB6FF; | ||
| 28 | + border-radius: 6px; } | ||
| 29 | + .tooltip.top:before, .tooltip.top:after { | ||
| 30 | + position: absolute; | ||
| 31 | + left: 50%; | ||
| 32 | + top: 100%; | ||
| 33 | + margin-left: -6px; | ||
| 34 | + content: ""; | ||
| 35 | + border: 6px solid transparent; | ||
| 36 | + border-bottom: 0; | ||
| 37 | + border-top: 6px solid #1FB6FF; } | ||
| 38 | + .tooltip.top:after { | ||
| 39 | + margin-top: -1px; | ||
| 40 | + border-top-color: #fff; } | ||
| 29 | 41 | ||
| 30 | .tooltip.top .tooltip-arrow { | 42 | .tooltip.top .tooltip-arrow { |
| 31 | border-top-color: transparent; } | 43 | border-top-color: transparent; } |
src/gxb-ide/ToolBox.js
| @@ -4,7 +4,8 @@ | @@ -4,7 +4,8 @@ | ||
| 4 | '<audio id="audio"></audio>'+ | 4 | '<audio id="audio"></audio>'+ |
| 5 | '</div>'+ | 5 | '</div>'+ |
| 6 | '<div class="ctrl-wrap">'+ | 6 | '<div class="ctrl-wrap">'+ |
| 7 | - '<div class="tool-item" id="start-recording" data="1" data-toggle="tooltip" data-placement="top" title="开始录制"><img src="" alt="" /></div>'+ | 7 | + '<div class="tool-item" id="prepare-recording" data-toggle="tooltip" data-placement="top" title="点此开始录制"><img src="" alt="" /></div>'+ |
| 8 | + '<div class="tool-item" id="start-recording" data="1" data-toggle="tooltip" data-placement="top" title="<span class=\'tooltip-content-large\'>点此开始录制</span>"><img src="" alt="" /></div>'+ | ||
| 8 | '<div class="tool-item" id="stop-recording" data="1" data-toggle="tooltip" data-placement="top" title="结束录制"><img src="" alt="" /></div>'+ | 9 | '<div class="tool-item" id="stop-recording" data="1" data-toggle="tooltip" data-placement="top" title="结束录制"><img src="" alt="" /></div>'+ |
| 9 | '<div class="tool-item" id="re-recoding" data="1" data-toggle="tooltip" data-placement="top" title="重新录制"><img src="" alt="" /></div>'+ | 10 | '<div class="tool-item" id="re-recoding" data="1" data-toggle="tooltip" data-placement="top" title="重新录制"><img src="" alt="" /></div>'+ |
| 10 | '</div>'+ | 11 | '</div>'+ |
| @@ -58,12 +59,21 @@ | @@ -58,12 +59,21 @@ | ||
| 58 | var toolBox = this.options.el; | 59 | var toolBox = this.options.el; |
| 59 | $(toolBox).html(template) | 60 | $(toolBox).html(template) |
| 60 | 61 | ||
| 62 | + $('#prepare-recording img').attr('src', '../img/ideicon/new-recording.svg'); | ||
| 61 | $('#start-recording img').attr('src', '../img/ideicon/new-recording.svg'); | 63 | $('#start-recording img').attr('src', '../img/ideicon/new-recording.svg'); |
| 62 | $('#stop-recording img').attr('src', '../img/recording.svg'); | 64 | $('#stop-recording img').attr('src', '../img/recording.svg'); |
| 63 | $('#re-recoding img').attr('src', '../img/ideicon/new-recording.svg'); | 65 | $('#re-recoding img').attr('src', '../img/ideicon/new-recording.svg'); |
| 64 | $('#audio-play img').attr('src', '../img/play.svg'); | 66 | $('#audio-play img').attr('src', '../img/play.svg'); |
| 65 | 67 | ||
| 66 | - $('#start-recording').show() | 68 | + // $('#prepare-recording').show(); |
| 69 | + // $('#prepare-recording').tooltip('show'); | ||
| 70 | + // $('#prepare-recording').on('click', function() { | ||
| 71 | + // $(this).hide(); | ||
| 72 | + // $('#start-recording').show(); | ||
| 73 | + // }); | ||
| 74 | + $('#start-recording').show(); | ||
| 75 | + $('#start-recording').tooltip({ html : true }); | ||
| 76 | + $('#start-recording').tooltip('show'); | ||
| 67 | 77 | ||
| 68 | _this.events(); | 78 | _this.events(); |
| 69 | 79 |
src/gxb-ide/toolBox.css
src/scss/main.scss
| @@ -21,15 +21,30 @@ html, body{ | @@ -21,15 +21,30 @@ html, body{ | ||
| 21 | .tooltip-inner{ | 21 | .tooltip-inner{ |
| 22 | background-color: transparent; | 22 | background-color: transparent; |
| 23 | color: #1FB6FF; | 23 | color: #1FB6FF; |
| 24 | - padding: 3px 6px; | 24 | + padding: 3px 10px; |
| 25 | } | 25 | } |
| 26 | .tooltip.top{ | 26 | .tooltip.top{ |
| 27 | - background: url('../img/toptip.png') no-repeat; | ||
| 28 | - height: 36px; | ||
| 29 | - top: -28px !important; | ||
| 30 | -} | ||
| 31 | -.tooltip.top .tooltip-arrow{ | ||
| 32 | - // border-top-color: #1FB6FF; | 27 | + // background: url('../img/toptip.png') no-repeat; |
| 28 | + // height: 36px; | ||
| 29 | + // top: -28px !important; | ||
| 30 | + background: #fff; | ||
| 31 | + border: 1px solid #1FB6FF; | ||
| 32 | + border-radius: 6px; | ||
| 33 | + | ||
| 34 | + &:before, &:after { | ||
| 35 | + position: absolute; | ||
| 36 | + left: 50%; | ||
| 37 | + top: 100%; | ||
| 38 | + margin-left: -6px; | ||
| 39 | + content: ""; | ||
| 40 | + border: 6px solid transparent; | ||
| 41 | + border-bottom: 0; | ||
| 42 | + border-top: 6px solid #1FB6FF; | ||
| 43 | + } | ||
| 44 | + &:after { | ||
| 45 | + margin-top: -1px; | ||
| 46 | + border-top-color: #fff; | ||
| 47 | + } | ||
| 33 | } | 48 | } |
| 34 | .tooltip.top .tooltip-arrow{ | 49 | .tooltip.top .tooltip-arrow{ |
| 35 | border-top-color: transparent; | 50 | border-top-color: transparent; |