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

Merge remote-tracking branch 'origin/master'

parents 47efaeed 1e7f1589

Rakefile

+3 −0
Original line number Diff line number Diff line
@@ -285,7 +285,10 @@ task :compress do 
  system "mkdir #{OUT_DIR}/extjs/builds"

  system "cp #{EXT_DIR}/builds/ext-core.js #{OUT_DIR}/extjs/builds/ext-core.js"

  system "cp #{EXT_DIR}/resources/css/ext-all.css #{OUT_DIR}/extjs/resources/css"

  system "cp #{EXT_DIR}/release-notes.html #{OUT_DIR}/extjs"

  system "cp -r #{EXT_DIR}/examples #{OUT_DIR}/extjs"

  system "cp -r #{EXT_DIR}/overview #{OUT_DIR}/extjs"

  system "cp -r #{EXT_DIR}/welcome #{OUT_DIR}/extjs"

  system "cp -r #{EXT_DIR}/resources/themes/images/default #{OUT_DIR}/extjs/resources/themes/images"

end

template/resources/sass/viewport.scss

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ a { 




#treecontainer {

  a { color: #000; }

  .x-grid-cell {

    background: none; }

  .x-grid-cell-inner {

template/welcome.html

+2 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ 
                        </ul>

                        <p><a href="http://www.sencha.com/products/extjs4-preview/" class="more-icon">Learn more on sencha.com</a></p>

                        <p><a href="#!/api" class="more-icon">API Docs</a></p>

                        <p><a href="release-notes.html" class="more-icon">Release Notes</a></p>

                        <p><a href="extjs/release-notes.html" class="more-icon">Release Notes</a></p>

                    </div>

                    <div class="column">

                        <h3>Upgrading</h3>

                        <p>First, check out our <a href="overview/index.html">overview guide</a> to see what has changed. <span class="meta">A more thorough upgrade guide is under development.</span></p>

                        <p>First, check out our <a href="extjs/overview/index.html">overview guide</a> to see what has changed. <span class="meta">A more thorough upgrade guide is under development.</span></p>



                        <p>Sencha also offers <a href="http://www.sencha.com/training/">training courses</a> and <a href="http://www.sencha.com/support/services/">professional services</a> for companies wishing to use Ext JS 4.</p>

                    </div>