Commit 3c831a20 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

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

parents 480e99d9 44945b8f

template/app/view/Viewport.js

+1 −2
Original line number Diff line number Diff line
@@ -60,14 +60,13 @@ Ext.define('Docs.view.Viewport', { 
                region: 'center',

                layout: 'border',

                minWidth: 800,

                // padding: '4 3',

                items: [

                    {

                        region: 'west',

                        xtype: 'treecontainer',

                        id: 'treecontainer',

                        border: 1,

                        bodyPadding: '14 9',

                        bodyPadding: '10 9 4 9',

                        width: 240

                    },

                    {

template/app/view/cls/Overview.js

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ Ext.define('Docs.view.cls.Overview', { 
    cls: 'class-overview iScroll',

    autoScroll: true,

    border: false,

    bodyPadding: '20 8 20 0',

    bodyPadding: '20 8 20 5',



    initComponent: function() {

        this.addEvents(

template/resources/sass/scrollbars.scss

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
}

.iScroll ::-webkit-scrollbar-track-piece,

.iScroll::-webkit-scrollbar-track-piece {

  margin: 10px 0;

  -webkit-border-radius:0;

  -webkit-border-bottom-right-radius:4px;

  -webkit-border-bottom-left-radius:4px;
@@ -31,7 +32,6 @@ 
}







#treecontainer .iScroll ::-webkit-scrollbar-thumb:vertical,

#treecontainer .iScroll::-webkit-scrollbar-thumb:vertical {

  height:50px;

template/resources/sass/viewport.scss

+7 −4
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ a { 
#videoindex,

#guideindex,

#classindex {

  padding: 10px; }

  padding: 15px 10px 10px 10px; }





  pre, code, kbd, samp, tt {
@@ -1110,12 +1110,12 @@ a { 


  .x-resizable-over .x-resizable-handle-east, .x-resizable-over .x-resizable-handle-west, .x-resizable-pinned .x-resizable-handle-east, .x-resizable-pinned .x-resizable-handle-west {

    background: none;

    border: solid black;

    border: solid #bbb;

    border-width: 0 1px 0 0;

  }



  .x-panel-body-default {

    border-width: 0 1px 0 0;

    border-width: 0;

  }



  #container-1019[role="presentation"] {
@@ -1127,12 +1127,15 @@ a { 
    margin-bottom: 40px;

  }



  #treecontainer .x-panel-body{

  #treecontainer > .x-panel-body {

    background: transparent;

    border-color: #ebebeb;

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

  }



  #treecontainer{

    background: #f8f8f8;

    border: 0;

    background: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 10px);

    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(10px,#f8f8f8));

    background: -webkit-linear-gradient(top, #ffffff 0%,#f8f8f8 10px);

template/welcome.html

+0 −11
Original line number Diff line number Diff line
@@ -40,17 +40,6 @@ 
            </div>

        </div>

    </section>

    <footer>

        <ul class="zero inline-social">

            <li><a href="http://twitter.com/senchainc" class="twitter">Twitter</a></li>

            <li><a href="http://www.facebook.com/senchainc" class="facebook">Facebook</a></li>

            <li><a href="http://senchainc.tumblr.com/" class="tumblr">Tumblr</a></li>

            <li><a href="http://j.mp/sencha-in" class="linkedin">LinkedIn</a></li>

            <li><a href="http://feeds.feedburner.com/SenchaBlog" class="rss">RSS Feed</a></li>

            <li><a href="http://www.vimeo.com/sencha" class="vimeo">Vimeo</a></li>

        </ul>

        <p>&copy; 2011 Sencha</p>

    </footer>

</div>

<div class="news">

    <div class="l">