Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Ledger list should not have maximum height #4616

Merged
merged 1 commit into from
Oct 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions js/about/preferences.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const {passwordManagers, extensionIds} = require('../constants/passwordManagers'
const aboutActions = require('./aboutActions')
const getSetting = require('../settings').getSetting
const SortableTable = require('../components/sortableTable')
const FixedHeaderTable = require('../components/fixedHeaderTable')
const Button = require('../components/button')
const searchProviders = require('../data/searchProviders')
const moment = require('moment')
Expand Down Expand Up @@ -259,7 +258,7 @@ class LedgerTable extends ImmutableComponent {
return null
}
return <div id='ledgerTable'>
<FixedHeaderTable
<SortableTable
headings={['rank', 'publisher', 'include', 'views', 'timeSpent', 'percentage']}
defaultHeading='rank'
overrideDefaultStyle
Expand Down
20 changes: 0 additions & 20 deletions js/components/fixedHeaderTable.js

This file was deleted.

41 changes: 6 additions & 35 deletions less/about/preferences.less
Original file line number Diff line number Diff line change
Expand Up @@ -571,45 +571,16 @@ table.sortableTable {
td {
padding: 0 15px;
}
}

.fixed-table-container {
height: 500px;
position: relative;

.table-header {
height: 30px;
background: @veryLightGray;
position: absolute;
top: 0;
right: 0;
left: 0;
}
.th-inner {
font-weight: bold;

.fixed-table-container-inner {
overflow-x: hidden;
overflow-y: auto;
height: 100%;

table {
width: 100%;
overflow-x: hidden;
overflow-y: auto;

.th-inner {
color: @darkGray;
cursor: default;
font-weight: 600;
position: absolute;
top: 0;
line-height: 30px;
z-index: 9;
background: @veryLightGray;
-webkit-user-select: none;
}
&:hover {
cursor: pointer;
text-decoration: underline;
}
}
}

}

.modal .dialog.paymentHistory .sectionTitle {
Expand Down