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

Update sortableTable styles to be consistent #4509

Merged
merged 1 commit into from
Oct 4, 2016
Merged

Update sortableTable styles to be consistent #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,8 @@ class SearchTab extends ImmutableComponent {
<div className='sectionTitle' data-l10n-id='searchSettings' />
<SortableTable headings={['default', 'searchEngine', 'engineGoKey']} rows={this.searchProviders}
defaultHeading='searchEngine'
addHoverClass onClick={this.hoverCallback.bind(this)} />
addHoverClass onClick={this.hoverCallback.bind(this)}
columnClassNames={['default', 'searchEngine', 'engineGoKey']} />
<div className='sectionTitle' data-l10n-id='locationBarSettings' />
<SettingsList>
<SettingCheckbox dataL10nId='showOpenedTabMatches' prefKey={settings.OPENED_TAB_SUGGESTIONS} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
Expand Down
3 changes: 0 additions & 3 deletions less/about/history.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ body {
}

.sortableTable {
border-spacing: 0px;
cursor: default;

// Time visited
.time {
font-size: 11pt;
Expand Down
81 changes: 47 additions & 34 deletions less/about/preferences.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ body {

.sectionTitle {
color: @braveOrange;
cursor: default;
font-size: 1.2em;
margin-bottom: 0.7em;
-webkit-user-select: none;
}

.prefTabContainer {
Expand Down Expand Up @@ -522,6 +524,16 @@ table.sortableTable {
color: @braveOrange;
font-weight: 800;
}

.default {
width: 150px;
}
.searchEngine {
width: 304px !important;
}
.engineGoKey {
width: 250px;
}
}

.paymentsMessage {
Expand Down Expand Up @@ -558,41 +570,42 @@ table.sortableTable {
}

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

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

.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;
font-weight: 600;
position: absolute;
top: 0;
line-height: 30px;
z-index: 9;
background: @veryLightGray;
}
}
}
}
height: 500px;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was MOSTLY just a spacing issue (everything was off by 1 space; git didn't intelligently realize that)

position: relative;

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

.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;
}
}
}
}
}

.modal .dialog.paymentHistory .sectionTitle {
Expand Down
14 changes: 7 additions & 7 deletions less/about/siteDetails.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
}

.searchInput {
float: right;
padding: 5px;
margin-top: -35px;
float: right;
padding: 5px;
margin-top: -35px;
}

.searchInputClear {
float: right;
padding: 8px;
margin-top: -39px;
color: #999;
float: right;
padding: 8px;
margin-top: -39px;
color: #999;
}
11 changes: 9 additions & 2 deletions less/sortableTable.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ table.sort {
table.sortableTable {
width: 100%;
border: solid 1px @lightGray;
border-radius: @borderRadius;
border-bottom-left-radius: @borderRadius;
border-bottom-right-radius: @borderRadius;
margin-bottom: 40px;
box-shadow: @softBoxShadow;
cursor: default;
border-spacing: 0;

tr {
height: 1.7em;
Expand All @@ -32,7 +35,11 @@ table.sortableTable {
font-weight: 300;
padding: 8px;
box-sizing: border-box;
-webkit-user-select: none;

.th-inner {
display: inline-block;
-webkit-user-select: none;
}

&:after {
font-family: FontAwesome;
Expand Down