Produced by Araxis Merge on 12/7/2018 11:36:22 AM Central Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\SCRUB\MHED\MHED\VATS 2.3.0\var-utility-web-2.3.0@19406cb7810\app\libs\sass-bootstrap\sass | _tables.scss | Thu Sep 13 18:55:48 2018 UTC |
| 2 | C:\MHED-scrubbed\MHED\MHED\VATS 2.3.0\var-utility-web-2.3.0@19406cb7810\app\libs\sass-bootstrap\sass | _tables.scss | Fri Dec 7 13:49:42 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 486 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | // | |
| 2 | // Tables | |
| 3 | // ------- ---------- ---------- ---------- ---------- --- | |
| 4 | ||
| 5 | ||
| 6 | table { | |
| 7 | max-widt h: 100%; | |
| 8 | backgrou nd-color: $table-bg; | |
| 9 | } | |
| 10 | th { | |
| 11 | text-ali gn: left; | |
| 12 | } | |
| 13 | ||
| 14 | ||
| 15 | // Baselin e styles | |
| 16 | ||
| 17 | .table { | |
| 18 | width: 1 00%; | |
| 19 | margin-b ottom: $li ne-height- computed; | |
| 20 | // Cells | |
| 21 | > thead, | |
| 22 | > tbody, | |
| 23 | > tfoot { | |
| 24 | > tr { | |
| 25 | > th , | |
| 26 | > td { | |
| 27 | pa dding: $ta ble-cell-p adding; | |
| 28 | li ne-height: $line-hei ght-base; | |
| 29 | ve rtical-ali gn: top; | |
| 30 | bo rder-top: 1px solid $table-bor der-color; | |
| 31 | } | |
| 32 | } | |
| 33 | } | |
| 34 | // Botto m align fo r column h eadings | |
| 35 | > thead > tr > th { | |
| 36 | vertic al-align: bottom; | |
| 37 | border -bottom: 2 px solid $ table-bord er-color; | |
| 38 | } | |
| 39 | // Remov e top bord er from th ead by def ault | |
| 40 | > captio n + thead, | |
| 41 | > colgro up + thead , | |
| 42 | > thead: first-chil d { | |
| 43 | > tr:f irst-child { | |
| 44 | > th , | |
| 45 | > td { | |
| 46 | bo rder-top: 0; | |
| 47 | } | |
| 48 | } | |
| 49 | } | |
| 50 | // Accou nt for mul tiple tbod y instance s | |
| 51 | > tbody + tbody { | |
| 52 | border -top: 2px solid $tab le-border- color; | |
| 53 | } | |
| 54 | ||
| 55 | // Nesti ng | |
| 56 | .table { | |
| 57 | backgr ound-color : $body-bg ; | |
| 58 | } | |
| 59 | } | |
| 60 | ||
| 61 | ||
| 62 | // Condens ed table w / half pad ding | |
| 63 | ||
| 64 | .table-con densed { | |
| 65 | > thead, | |
| 66 | > tbody, | |
| 67 | > tfoot { | |
| 68 | > tr { | |
| 69 | > th , | |
| 70 | > td { | |
| 71 | pa dding: $ta ble-conden sed-cell-p adding; | |
| 72 | } | |
| 73 | } | |
| 74 | } | |
| 75 | } | |
| 76 | ||
| 77 | ||
| 78 | // Bordere d version | |
| 79 | // | |
| 80 | // Add bor ders all a round the table and between al l the colu mns. | |
| 81 | ||
| 82 | .table-bor dered { | |
| 83 | border: 1px solid $table-bor der-color; | |
| 84 | > thead, | |
| 85 | > tbody, | |
| 86 | > tfoot { | |
| 87 | > tr { | |
| 88 | > th , | |
| 89 | > td { | |
| 90 | bo rder: 1px solid $tab le-border- color; | |
| 91 | } | |
| 92 | } | |
| 93 | } | |
| 94 | > thead > tr { | |
| 95 | > th, | |
| 96 | > td { | |
| 97 | bord er-bottom- width: 2px ; | |
| 98 | } | |
| 99 | } | |
| 100 | } | |
| 101 | ||
| 102 | ||
| 103 | // Zebra-s triping | |
| 104 | // | |
| 105 | // Default zebra-str ipe styles (alternat ing gray a nd transpa rent backg rounds) | |
| 106 | ||
| 107 | .table-str iped { | |
| 108 | > tbody > tr:nth-c hild(odd) { | |
| 109 | > td, | |
| 110 | > th { | |
| 111 | back ground-col or: $table -bg-accent ; | |
| 112 | } | |
| 113 | } | |
| 114 | } | |
| 115 | ||
| 116 | ||
| 117 | // Hover e ffect | |
| 118 | // | |
| 119 | // Placed here since it has to come afte r the pote ntial zebr a striping | |
| 120 | ||
| 121 | .table-hov er { | |
| 122 | > tbody > tr:hover { | |
| 123 | > td, | |
| 124 | > th { | |
| 125 | back ground-col or: $table -bg-hover; | |
| 126 | } | |
| 127 | } | |
| 128 | } | |
| 129 | ||
| 130 | ||
| 131 | // Table c ell sizing | |
| 132 | // | |
| 133 | // Reset d efault tab le behavio r | |
| 134 | ||
| 135 | table col[ class*="co l-"] { | |
| 136 | float: n one; | |
| 137 | display: table-col umn; | |
| 138 | } | |
| 139 | table { | |
| 140 | td, | |
| 141 | th { | |
| 142 | &[clas s*="col-"] { | |
| 143 | floa t: none; | |
| 144 | disp lay: table -cell; | |
| 145 | } | |
| 146 | } | |
| 147 | } | |
| 148 | ||
| 149 | ||
| 150 | // Table b ackgrounds | |
| 151 | // | |
| 152 | // Exact s electors b elow requi red to ove rride `.ta ble-stripe d` and pre vent | |
| 153 | // inherit ance to ne sted table s. | |
| 154 | ||
| 155 | .table { | |
| 156 | > thead, | |
| 157 | > tbody, | |
| 158 | > tfoot { | |
| 159 | > tr { | |
| 160 | > td .active, | |
| 161 | > th .active, | |
| 162 | &.ac tive > td, | |
| 163 | &.ac tive > th { | |
| 164 | ba ckground-c olor: $tab le-bg-acti ve; | |
| 165 | } | |
| 166 | } | |
| 167 | } | |
| 168 | } | |
| 169 | ||
| 170 | // Generat e the cont extual var iants | |
| 171 | @include t able-row-v ariant('su ccess', $s tate-succe ss-bg, $st ate-succes s-border); | |
| 172 | @include t able-row-v ariant('da nger', $st ate-danger -bg, $stat e-danger-b order); | |
| 173 | @include t able-row-v ariant('wa rning', $s tate-warni ng-bg, $st ate-warnin g-border); | |
| 174 | ||
| 175 | ||
| 176 | // Respons ive tables | |
| 177 | // | |
| 178 | // Wrap yo ur tables in `.table -responsiv e` and we' ll make th em mobile friendly | |
| 179 | // by enab ling horiz ontal scro lling. Onl y applies <768px. Ev erything a bove that | |
| 180 | // will di splay n DNS y. | |
| 181 | ||
| 182 | @media (ma x-width: $ screen-xs- max) { | |
| 183 | .table-r esponsive { | |
| 184 | width: 100%; | |
| 185 | margin -bottom: ( $line-heig ht-compute d * 0.75); | |
| 186 | overfl ow-y: hidd en; | |
| 187 | overfl ow-x: scro ll; | |
| 188 | -ms-ov erflow-sty le: -ms-au tohiding-s crollbar; | |
| 189 | border : 1px soli d $table-b order-colo r; | |
| 190 | -webki t-overflow -scrolling : touch; | |
| 191 | ||
| 192 | // Tig hten up sp acing | |
| 193 | > .tab le { | |
| 194 | marg in-bottom: 0; | |
| 195 | ||
| 196 | // E nsure the content do esn't wrap | |
| 197 | > th ead, | |
| 198 | > tb ody, | |
| 199 | > tf oot { | |
| 200 | > tr { | |
| 201 | > th, | |
| 202 | > td { | |
| 203 | white-sp ace: nowra p; | |
| 204 | } | |
| 205 | } | |
| 206 | } | |
| 207 | } | |
| 208 | ||
| 209 | // Spe cial overr ides for t he bordere d tables | |
| 210 | > .tab le-bordere d { | |
| 211 | bord er: 0; | |
| 212 | ||
| 213 | // N uke the ap propriate borders so that the parent can handle th em | |
| 214 | > th ead, | |
| 215 | > tb ody, | |
| 216 | > tf oot { | |
| 217 | > tr { | |
| 218 | > th:first -child, | |
| 219 | > td:first -child { | |
| 220 | border-l eft: 0; | |
| 221 | } | |
| 222 | > th:last- child, | |
| 223 | > td:last- child { | |
| 224 | border-r ight: 0; | |
| 225 | } | |
| 226 | } | |
| 227 | } | |
| 228 | ||
| 229 | // O nly nuke t he last ro w's bottom -border in `tbody` a nd `tfoot` since | |
| 230 | // c hances are there wil l be only one `tr` i n a `thead ` and that would | |
| 231 | // r emove the border alt ogether. | |
| 232 | > tb ody, | |
| 233 | > tf oot { | |
| 234 | > tr:last-ch ild { | |
| 235 | > th, | |
| 236 | > td { | |
| 237 | border-b ottom: 0; | |
| 238 | } | |
| 239 | } | |
| 240 | } | |
| 241 | ||
| 242 | } | |
| 243 | } | |
| 244 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.