From 32d1a0824b971c724ded6b11c85f6aaf371ab539 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 18 Jun 2013 09:41:57 +0200 Subject: [PATCH] height wip: history tab --- modules/documentHistory/documentHistory.less | 2 +- modules/rng/diffLayout.less | 32 +++++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/modules/documentHistory/documentHistory.less b/modules/documentHistory/documentHistory.less index 57cd63c..9bf078f 100644 --- a/modules/documentHistory/documentHistory.less +++ b/modules/documentHistory/documentHistory.less @@ -29,7 +29,7 @@ } .toolbar { - margin: -15px 0 15px 0; + margin: 0 0 15px 0; white-space:nowrap; word-spacing:0; min-height: 22px; diff --git a/modules/rng/diffLayout.less b/modules/rng/diffLayout.less index bbe51aa..d35c16f 100644 --- a/modules/rng/diffLayout.less +++ b/modules/rng/diffLayout.less @@ -1,12 +1,34 @@ .rng-module-rng-diffLayout { [fnpjs-place=left] { - width: 200px; - margin: 0 20 0 0px; - float: left; + width: 300px; + margin: 0 20px 0 0px; + left: 0; } [fnpjs-place=right] { - width: 700px; - float: right; + left: 320px; + right: 0; + + } + + [fnpjs-place=left], [fnpjs-place=right] { + position: absolute; + top: 0; + bottom: 0; + + overflow-y: scroll; + padding-right: 0; + &::-webkit-scrollbar { + .rng-mixin-scrollbar; + } + &::-webkit-scrollbar-track { + .rng-mixin-scrollbar-track; + } + &::-webkit-scrollbar-thumb { + .rng-mixin-scrollbar-thumb; + } + &::-webkit-scrollbar-thumb:window-inactive { + .rng-mixin-scrollbar-thumb-window-inactive; + } } } \ No newline at end of file -- 2.20.1