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

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

parents 41b25146 629e22c0

Rakefile

+13 −1
Original line number Diff line number Diff line
@@ -131,11 +131,23 @@ task :base_live_docs do 
              },

              showMember: function(cls, anchor) {

                  _gaq.push(['_trackEvent', 'Classes', 'Member', cls + ' - ' + anchor]);

              },

              }

          });

          Docs.App.getController('Guides').addListener({

              showGuide: function(guide) {

                  _gaq.push(['_trackEvent', 'Guides', 'Show', guide]);

              }

          });

          Docs.App.getController('Videos').addListener({

              showVideo: function(video) {

                  _gaq.push(['_trackEvent', 'Video', 'Show', video]);

              }

          });

          Docs.App.getController('Examples').addListener({

              showExample: function(example) {

                  _gaq.push(['_trackEvent', 'Example', 'Show', example]);

              }

          });

      }

    </script>

  EOHTML

template/resources/sass/print.scss

0 → 100644
+5 −0
Original line number Diff line number Diff line 
.logo { padding: 0; }

.logo a { color: #000; font-size: 1.4em; }

.members .member a.side { display: none; }

.members .member { padding: 5px; }

.members h3.members-title { padding: 5px; }
 
 No newline at end of file

template/resources/sass/welcome.scss

+3 −3
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ $docs-monospace-font: "Menlo", "Courier New", Courier, monospace; 
  }



  .auto_columns {

    overflow: hidden;

    width: 100%;

    &::after {

      clear: both;
@@ -108,6 +107,7 @@ $docs-monospace-font: "Menlo", "Courier New", Courier, monospace; 
    width: 48%;

    padding-right: 2%;

    float: left;

    position: relative;

    // ExtJS switches everything to border-box, revert it.

    box-sizing: content-box;

  }
@@ -209,8 +209,8 @@ $docs-monospace-font: "Menlo", "Courier New", Courier, monospace; 


  .feature-img {

    position: absolute;

    right: 50px;

    top: -50px;

    right: 20px;

    top: -100px;

  }



  footer {