Commit 2fc43893 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge remote-tracking branch 'origin/master'

parents 9cee9e54 aa45fff0

Rakefile

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ task :compress do 
  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/egIframe.html

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
<head>

    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

    <title>Sencha Examples</title>

    <script type="text/javascript" src="extjs/ext-all-debug.js"></script>

    <script type="text/javascript" src="extjs/ext-all.js"></script>

    <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css">

    <style id="iframeCSS" type="text/css"></style>

    <script type="text/javascript">

template/resources/sass/viewport.scss

+5 −1
Original line number Diff line number Diff line
@@ -1046,8 +1046,12 @@ a { 
  }



  .class-overview p, .guide-container p {

    color: #484848;

    margin: 0 0 1em;

  }



  .class-overview p, .guide-container p,

  .class-overview ul, .guide-container ul {

    color: #484848;

    max-width: 900px;

  }

template/welcome.html

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
                    </div>

                    <div class="column">

                        <h3>Upgrading</h3>

                        <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>First, check out our <a href="#!/guide/upgrade">overview guide</a> to see what has changed.</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>