wip

go1t · go1t · commit ab896b740a2c · 2016-07-18T23:22:08.000-07:00
diff --git a/src/client/app/modules/components/search-form.jsx b/src/client/app/modules/components/search-form.jsx
@@ -73,7 +73,9 @@ export class SearchForm extends React.Component {
   }
 
   updateSearch(params, hashes = [], append = false) {
-    this.resultView.scrollTop = 0;
+    if (!append) {
+      this.resultView.scrollTop = 0;
+    }
     if(!params.searchStringRegEx) {
       // Escape regex characters
       params.searchString = params.searchString.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
@@ -140,7 +142,7 @@ export class SearchForm extends React.Component {
                 </span>
               </div> : null
           }
-          <div className="Results" ref={(ref) => this.resultView = this.resultView || ref} >
+          <div className="Results no-scroll-bar" ref={(ref) => this.resultView = this.resultView || ref} >
             { (results.length > 0) ?
               <ConnectedInfiniteScroll loadMore={() => this.loadMore(hashes)} hasMore={searchString || location}>
                 {
diff --git a/src/client/sass/index.scss b/src/client/sass/index.scss
@@ -15,6 +15,10 @@ html {
   background-color: #21252b;
 }
 
+body {
+  overflow: hidden;
+}
+
 input[type="submit"],
 input[type="reset"],
 input[type="button"],
@@ -85,8 +89,11 @@ button {
   }
 }
 
-.prism-show-language-label {
-  display: none !important;
+.no-scroll-bar {
+  padding-right: 30px;
+  margin-right: -30px;
+  padding-bottom: 30px;
+  margin-bottom: -30px;
 }
 
 .pulse:before {
diff --git a/src/client/sass/partials/_code.scss b/src/client/sass/partials/_code.scss
@@ -1,6 +1,6 @@
 .SnippetContainer {
   margin-bottom: 24px;
-  overflow-x: hidden;
+  overflow: hidden;
 
   pre {
     @include display-flex;
@@ -20,16 +20,18 @@
 .Snippet-code {
   background: #2b303b;
   border: 1px solid #181a1f;
+  overflow: hidden;
 
   .hljs {
-    margin: 16px;
     font-family: 'Inconsolata', monospace;
     font-size: 15px;
     line-height: 20px;
-    margin-left: 48px;
     padding: 0;
     background: none;
     z-index: 1;
+    margin: 16px 0;
+    padding-left: 64px;
+    padding-bottom: 25px;
   }
 }
 
diff --git a/src/client/sass/partials/_full-view.scss b/src/client/sass/partials/_full-view.scss
@@ -2,7 +2,7 @@
   background-color: #1b1d23;
   @include flex(3);
   height: 100%;
-  overflow: scroll;
+  overflow-y: scroll;
 
   pre {
     background: #1b1d23 !important;
@@ -16,7 +16,12 @@
 
   .SnippetContainer {
     margin-top: 56px;
+
+    .hljs {
+      margin-bottom: 0;
+    }
   }
+
 }
 
 .Header {
diff --git a/src/client/sass/partials/_search.scss b/src/client/sass/partials/_search.scss
@@ -5,7 +5,7 @@
   padding: 11px 16px;
   color: #ddd;
   height: 100%;
-  overflow: scroll;
+  overflow-y: hidden;
   box-sizing: border-box;
   border-right: 1px solid #15191c;
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ export class SearchForm extends React.Component {`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`updateSearch(params, hashes = [], append = false) {`
`76`		`- this.resultView.scrollTop = 0;`
	`76`	`+ if (!append) {`
	`77`	`+ this.resultView.scrollTop = 0;`
	`78`	`+ }`
`77`	`79`	`if(!params.searchStringRegEx) {`
`78`	`80`	`// Escape regex characters`
`79`	`81`	`params.searchString = params.searchString.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\\|]/g, "\\$&");`
`@@ -140,7 +142,7 @@ export class SearchForm extends React.Component {`
`140`	`142`	`</span>`
`141`	`143`	`</div> : null`
`142`	`144`	`}`
`143`		`- <div className="Results" ref={(ref) => this.resultView = this.resultView \|\| ref} >`
	`145`	`+ <div className="Results no-scroll-bar" ref={(ref) => this.resultView = this.resultView \|\| ref} >`
`144`	`146`	`{ (results.length > 0) ?`
`145`	`147`	`<ConnectedInfiniteScroll loadMore={() => this.loadMore(hashes)} hasMore={searchString \|\| location}>`
`146`	`148`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ html {`
`15`	`15`	`background-color: #21252b;`
`16`	`16`	`}`
`17`	`17`
	`18`	`+body {`
	`19`	`+ overflow: hidden;`
	`20`	`+}`
	`21`	`+`
`18`	`22`	`input[type="submit"],`
`19`	`23`	`input[type="reset"],`
`20`	`24`	`input[type="button"],`
`@@ -85,8 +89,11 @@ button {`
`85`	`89`	`}`
`86`	`90`	`}`
`87`	`91`
`88`		`-.prism-show-language-label {`
`89`		`- display: none !important;`
	`92`	`+.no-scroll-bar {`
	`93`	`+ padding-right: 30px;`
	`94`	`+ margin-right: -30px;`
	`95`	`+ padding-bottom: 30px;`
	`96`	`+ margin-bottom: -30px;`
`90`	`97`	`}`
`91`	`98`
`92`	`99`	`.pulse:before {`