Commit e11e2eda authored by Nick Poulden's avatar Nick Poulden
Browse files

Always show close button on tabs

parent ef1afa46

template/app/Application.js

+3 −3
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ Ext.define('Docs.Application', { 
            Docs.initEventTracking();

        }



        // setInterval(function(){

        //     Ext.DomQuery.select('link')[4].href = "resources/css/viewport.css?" + Math.ceil(Math.random() * 100000000)

        // }, 1000)

        setInterval(function(){

            Ext.DomQuery.select('link')[4].href = "resources/css/viewport.css?" + Math.ceil(Math.random() * 100000000)

        }, 1000)

    }



});

template/app/controller/Tabs.js

+3 −3
Original line number Diff line number Diff line
@@ -79,13 +79,13 @@ Ext.define('Docs.controller.Tabs', { 
        cmp.el.addListener('mouseover', function(event, el) {

            Ext.get(el).addCls('ovr');

        }, this, {

            delegate: '.icn'

            delegate: '.close'

        });



        cmp.el.addListener('mouseout', function(event, el) {

            Ext.get(el).removeCls('ovr');

        }, this, {

            delegate: '.icn'

            delegate: '.close'

        });



        cmp.el.addListener('click', function(event, el) {
@@ -104,7 +104,7 @@ Ext.define('Docs.controller.Tabs', { 
                }

            });

        }, this, {

            delegate: '.icn',

            delegate: '.close',

            preventDefault: true

        });

    },

template/app/view/Tabs.js

+2 −1
Original line number Diff line number Diff line
@@ -50,8 +50,9 @@ Ext.define('Docs.view.Tabs', { 
                '<div class="doctab" style="visibility: hidden">',

                    '<div class="l"></div>',

                    '<div class="m">',

                        '<a class="icn {iconCls}" href="#">&nbsp;</a>',

                        '<span class="icn {iconCls}">&nbsp;</span>',

                        '<a class="tabUrl" href="{href}">{text}</a>',

                        '<a class="close" href="#">&nbsp;</a>',

                    '</div>',

                '<div class="r"></div>',

                '</div>'

template/resources/sass/viewport.scss

+19 −9
Original line number Diff line number Diff line
@@ -812,7 +812,8 @@ a { 
    }

    .m {

      z-index: 5;

      padding: 6px 10px 0 6px;

      position: relative;

      padding: 6px 3px 0 6px;

      margin: 0 7px;

      background: url(../images/tab-m.png) repeat-x;

      height: 29px;
@@ -822,6 +823,7 @@ a { 
      font-family: $docs-font;

      font-weight: bold;

      font-size: 11px;

      span,

      a {

        padding-bottom: 5px;

        line-height: 16px;
@@ -829,20 +831,28 @@ a { 
        color: #2e3841;

        white-space: nowrap;

        overflow: hidden;

        float: left;

      }

      a.docClass {

        padding-left: 5px;

      a.tabUrl {

        padding: 0 14px 0 17px;

      }

      a.icn {

      span.icn {

        display: block;

        position: absolute;

        left: 3px;

        padding-left: 15px;

        padding-bottom: 0;

        float: left;

      }

      a.icn.close {

        background: url(../images/x122.png) no-repeat 2px -14px !important;

      }

      a.icn.close.ovr {

        background: url(../images/x122.png) no-repeat 2px 2px !important;

      a.close {

        position: absolute;

        width: 11px;

        height: 11px;

        top: 8px;

        right: 3px;;

        background: url(../images/tab-c.png) no-repeat 0 2px !important;

      }

      a.close.ovr {

        background: url(../images/tab-c.png) no-repeat 0 -10px !important;

      }

    }

  }