Commit 16d99480 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Renamed 'container'-named container to 'card-panel'. 

"container" is too ambiguous - everything is a container.
Not good to have one specific container named "container".
parent f0136405

template/app/History.js

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ Ext.define("Docs.History", { 
            Docs.App.getController('Classes').showGuide(url.key, true);

        }

        else {

            Ext.getCmp('container').layout.setActiveItem(0);

            Ext.getCmp('card-panel').layout.setActiveItem(0);

        }

    },

template/app/controller/Classes.js

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ Ext.define('Docs.controller.Classes', { 
        var cls = clsUrl;

        var member;



        Ext.getCmp('container').layout.setActiveItem(1);

        Ext.getCmp('card-panel').layout.setActiveItem(1);



        // separate class and member name

        var matches = clsUrl.match(/^(.*?)(?:-(.*))?$/);
@@ -219,7 +219,7 @@ Ext.define('Docs.controller.Classes', { 
            success: function(json) {

                this.getViewport().setPageTitle(json.guide.match(/<h1>(.*)<\/h1>/)[1]);

                Ext.getCmp("guide").update(json.guide);

                Ext.getCmp('container').layout.setActiveItem(2);

                Ext.getCmp('card-panel').layout.setActiveItem(2);

                Docs.Syntax.highlight(Ext.get("guide"));

                this.fireEvent('showGuide', name);

            },

template/app/view/Viewport.js

+2 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Ext.define('Docs.view.Viewport', { 
                        listeners: {

                            click: function() {

                                this.setPageTitle("");

                                Ext.getCmp('container').layout.setActiveItem(0);

                                Ext.getCmp('card-panel').layout.setActiveItem(0);

                                Docs.History.push("");

                            },

                            scope: this
@@ -152,11 +152,10 @@ Ext.define('Docs.view.Viewport', { 
                minWidth: 800,

                padding: '20 20 5 0',

                items: {

                    id: 'container',

                    id: 'card-panel',

                    xtype: 'container',

                    layout: 'card',

                    padding: '20',

                    cls: 'container',

                    items: [

                        {

                            autoScroll: true,

template/resources/sass/viewport.scss

+6 −6
Original line number Diff line number Diff line
@@ -291,15 +291,11 @@ a { 
      margin-left: -12px;

      padding: 0.1em 0 0.4em 2em; } } }



.container {

#card-panel {

  background: #fff;

  @include border-radius(5px);

  @include box-shadow(0, 0, 4px, rgba(0, 0, 0, 0.4));

  line-height: 1.4em;

  h3 {

    font-size: 1.2em;

    padding: 1em 0 0.4em 0;

    font-weight: normal; } }

  line-height: 1.4em; }



// Styles for index page

#center-container .class-list {
@@ -382,6 +378,10 @@ a { 
    &.classes {

      clear: both;

      padding: 20px 10px 20px 20px;

      h3 {

        font-size: 1.2em;

        padding: 1em 0 0.4em 0;

        font-weight: normal; }

      .lft {

        float: left;

        width: 250px;