Merge remote-tracking branch 'origin/open1223' into open-1338

Resolve merge conflicts due to whitespace changes.
This commit is contained in:
larkin
2015-06-29 12:08:16 -07:00
25 changed files with 547 additions and 215 deletions

View File

@@ -102,11 +102,20 @@
td, .td {
border-top: 1px solid $tabularColorBorder;
min-width: 110px;
color: $colorTelemFresh;
padding: $tabularTdPadTB $tabularTdPadLR;
vertical-align: top;
&.numeric {
text-align: right;
}
&.s-cell-type-value {
text-align: right;
.l-cell-contents {
@include border-radius($smallCr);
padding-left: $itemPadLR;
padding-right: $itemPadLR;
}
}
}
}
&.filterable {