Browse Source

Merge branch 'feature/results-styling' into develop

Clean up some results-styling bugs.
tags/v1.0^2
Severyn Kozak 10 years ago
parent
commit
b0c59ba61f
2 changed files with 40 additions and 26 deletions
  1. +26
    -19
      static/js/index.js
  2. +14
    -7
      static/sass/index.sass

+ 26
- 19
static/js/index.js
File diff suppressed because it is too large
View File


+ 14
- 7
static/sass/index.sass View File

@@ -6,9 +6,9 @@
@import variables @import variables


$minSearchFieldsWidth: 490px $minSearchFieldsWidth: 490px
$resultWidth: 800px
// $resultWidth: 400px
$codeWidth: 700px $codeWidth: 700px
$hiddenInfoWidth: 250px
$hiddenInfoWidth: 300px


.ui-datepicker .ui-datepicker
font-size: 70% font-size: 70%
@@ -346,7 +346,7 @@ div#results
div.result div.result
@extend .t3 @extend .t3


width: $resultWidth
// width: $resultWidth
height: 200px height: 200px
margin-bottom: 100% margin-bottom: 100%
pointer-events: auto pointer-events: auto
@@ -369,6 +369,10 @@ div.result
table tr table tr
@include opaque(1.0) @include opaque(1.0)


#tablecontainer
max-width: 70%
overflow: auto !important

div#display-info div#display-info
font-size: 1.3em font-size: 1.3em
padding: 5px 0px 5px 5px padding: 5px 0px 5px 5px
@@ -391,17 +395,20 @@ td#code
#tablecontainer #tablecontainer
width: 100% width: 100%
height: inherit height: inherit
overflow: auto
overflow: hidden
background-color: #49483e background-color: #49483e
position: relative position: relative
z-index: 1 z-index: 1


// &:hover
// overflow: auto

table table
border-collapse: collapse border-collapse: collapse
font-family: monospace font-family: monospace


.linenos .linenos
padding-left: 1%
padding-left: 8px


pre pre
margin-top: 5px margin-top: 5px
@@ -414,7 +421,7 @@ td#code


div#hidden-info div#hidden-info
width: $hiddenInfoWidth width: $hiddenInfoWidth
margin-left: -$hiddenInfoWidth - 200px
margin-left: -$hiddenInfoWidth
height: 100% height: 100%
padding-top: 40px padding-top: 40px
font-size: 1.2em font-size: 1.2em
@@ -425,7 +432,7 @@ div#hidden-info
@include vendor(transition, margin-left 0.2s ease-in-out) @include vendor(transition, margin-left 0.2s ease-in-out)


.display-all & .display-all &
margin-left: 0px
margin-left: -$hiddenInfoWidth / 1.5
padding-left: 20px padding-left: 20px


span span


Loading…
Cancel
Save