Commit 1253f9ef authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge remote-tracking branch 'nick/redesign' into redesign

parents 3d4a6c8b ef744179
Loading
Loading
Loading
Loading
+14 −3
Original line number Diff line number Diff line
@@ -85,10 +85,21 @@ Ext.define('Docs.view.HoverMenuButton', {
                clearTimeout(this.hideTimeout);
                this.menu.show();
                // position menu right below button and show it
                var p = this.getEl().getXY();
                var p = this.getEl().getXY(),
                    toolbar = Ext.ComponentQuery.query('classoverview toolbar')[0],
                    leftOffset = p[0]-10,
                    toolbarOffset = toolbar.getEl().getXY(),
                    toolbarWidth = toolbar.getWidth(),
                    menuWidth = this.menu.getEl().getWidth(),
                    pageWidth = Ext.getCmp('doctabs').getWidth();

                if (menuWidth > pageWidth) leftOffset = 0;
                else if ((leftOffset + menuWidth) > pageWidth) leftOffset = pageWidth - menuWidth - 30;
                if (leftOffset < toolbarOffset[0]) leftOffset = toolbarOffset[0];

                this.menu.getEl().setStyle({
                    left: (p[0]-10)+"px",
                    top: (p[1]+23)+"px"
                    left: leftOffset+"px",
                    top: (p[1]+25)+"px"
                });
            },
            mouseout: this.deferHideMenu,
+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ Ext.define('Docs.view.cls.Toolbar', {
    dock: 'top',
    cls: 'member-links',
    padding: '3 5',
    border: 1,
    style: 'border-width: 1px 1px 0px 1px !important;',
    style: 'border-width: 1px !important;',

    /**
     * @cfg {Object} docClass
−962 B
Loading image diff...
−629 B
Loading image diff...
−699 B
Loading image diff...
Loading