Skip to content

Commit

Permalink
Overflow ribbon
Browse files Browse the repository at this point in the history
  • Loading branch information
sonsoleslp committed Jul 24, 2018
1 parent c64e1f6 commit 97a0b27
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const categories = {
/* "Embed": { label: i18n.t("vish_search_types.Embed"), type: "embed"},*/
/* "Excursion": {label: i18n.t("vish_search_types.Excursion"), type: "excursion"},*/
"Swf": { label: i18n.t("vish_search_types.Swf"), type: "swf", icon: "flash_on" },
"Link": { label: i18n.t("vish_search_types.Link"), type: "link", icon: "link" },
"Link": { label: i18n.t("vish_search_types.Link"), type: "webapp", icon: "link" },
"Officedoc": { label: i18n.t("vish_search_types.Officedoc"), type: "pdf", icon: "picture_as_pdf" },
"Scormfile": { label: i18n.t("vish_search_types.Scormfile"), type: "scormpackage", icon: "extension" },
"Video": { label: i18n.t("vish_search_types.Video"), type: "video", icon: "videocam" },
Expand Down
8 changes: 5 additions & 3 deletions _editor/components/nav_bar/plugin_ribbon/PluginRibbon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class PluginRibbon extends Component {
name={item.name}
bsSize="large"
draggable="false"
onMouseUp={(e)=>this.clickAddBox(e, item.name)}
onMouseUp={(e)=>{this.clickAddBox(e, item.name);}}
style={(button.iconFromUrl) ? {
padding: '8px 8px 8px 45px',
backgroundImage: 'url(' + clase + ')',
Expand All @@ -69,10 +69,8 @@ export default class PluginRibbon extends Component {
}
return null;
})}

</div>
</div>

</Col>
);
}
Expand Down Expand Up @@ -214,6 +212,9 @@ export default class PluginRibbon extends Component {

if(rib === 'List') {
this.clickAddBox(event, name);

} else {
this.props.onTabHide();
}
}
event.stopPropagation();
Expand Down Expand Up @@ -290,6 +291,7 @@ export default class PluginRibbon extends Component {
}
}
createBox(initialParams, name, inASlide, this.props.onBoxAdded, this.props.boxes);
this.props.onTabHide();
event.stopPropagation();
event.preventDefault();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
background-color: $blueprimary;
border-radius: 0 0 5px 0px;
min-width: 430px;
max-width: 639px;
height: auto;
}

Expand Down
1 change: 1 addition & 0 deletions _editor/containers/EditorApp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ class EditorApp extends Component {
containedViewSelected={containedViews[containedViewSelected] || containedViewSelected }
category={this.state.pluginTab}
hideTab={this.state.hideTab}
onTabHide={()=>{this.setState({ pluginTab: "" });}}
boxes={boxes}
ribbonHeight={ribbonHeight + 'px'} />
</Row>
Expand Down
1 change: 0 additions & 1 deletion sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ $material-font-path: '../node_modules/material-design-icons-font/iconfont/';
@include animacion(width, 0.4s);
}
}

#canvas, #maincontent, #canvasRow {
z-index:0 ;
}
Expand Down

0 comments on commit 97a0b27

Please sign in to comment.