Commit df79e7ef authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Fix class overview toolbar for ExtJS 4.1. 

First I'm constraining the styles of the main class-overview container
inside the body-area - otherwise the styles will also have unpredictable
effects on toolbar (especially the styles for tables as in 4.1 the
search field inside toolbar is wrapped in two tables).

Secondly the search field styles are applied differently as the DOM that
makes up the field has changed considerably.  At the moment this results
in the field looking a bit different in 4.1.  Needs more work...

Also added width to the trigger-field which otherwise would change its
width when trigger is shown/hidden.
parent 1da94d9b

template/app/view/cls/Toolbar.js

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Ext.define('Docs.view.cls.Toolbar', { 
                hideTrigger: true,

                emptyText: 'Filter class members',

                enableKeyEvents: true,

                width: 150,

                listeners: {

                    keyup: function(cmp) {

                        this.fireEvent("filter", cmp.getValue(), this.getShowFlags());

template/resources/sass/_toolbar.scss

+9 −7
Original line number Diff line number Diff line
@@ -10,18 +10,20 @@ 


// The reset (X) button in filter-class-members text box

.member-filter {

    height: 20px;

    border-style: solid;

    border-color: #bebebe;

    border-width: 1px;

    margin-left: -1px;

    background: white url('../images/text-bg.gif') repeat-x 0 0;

  .x-form-trigger.reset {

    background: url(../images/x12.png) no-repeat 2px 3px;

    padding: 0;

    margin: 0;

    border: 0; }

  .x-form-trigger-wrap {

    height: 20px;

    border-style: solid;

    border-color: #bebebe;

    border-width: 1px 1px 1px 0;

    margin-left: -1px;

    background: url('../images/text-bg.gif'); } }

  input {

    background: transparent;

    border: none; } }





// Backgrounds for two states of the expand/collapse all button.

template/resources/sass/viewport.scss

+56 −54
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
    font-weight: normal; } }



.class-overview, .guide-container, .comment-index {

  // Style only the body area, or the toolbar will get styled too

  .x-panel-body {

    min-height: 100px;

    .clr {

      clear: both; }
@@ -80,7 +82,7 @@ 
      i, em {

        font-style: normal; } }

    pre.prettyprint {

    padding: 10px 12px; } }

      padding: 10px 12px; } } }



@import "class_overview";