Produced by Araxis Merge on 5/9/2017 12:02:59 PM Eastern Daylight 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 | Tue May 9 16:02:59 2017 UTC | ||
| 2 | OSCIF_HEC_v1.4_Sprint23_build4_Apr_2017.zip\CRM_solutions\Managed\North52BPA_1_0_0_506_managed_2013_2015_2016..zip\WebResources | north52_csscodemirrorE97915EA-F187-E511-9E96-00155DF5B00D | Mon Sep 19 18:20:18 2016 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 1 | 335 |
| 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 | /* BASICS */ | |||||
| 2 | ||||||
| 3 | .CodeMirro r { | |||||
| 4 | /* Set h eight, wid th, border s, and glo bal font p roperties here */ | |||||
| 5 | font-fam ily: monos pace; | |||||
| 6 | height: 300px; | |||||
| 7 | color: b lack; | |||||
| 8 | } | |||||
| 9 | ||||||
| 10 | /* PADDING */ | |||||
| 11 | ||||||
| 12 | .CodeMirro r-lines { | |||||
| 13 | padding: 4px 0; /* Vertical padding ar ound conte nt */ | |||||
| 14 | } | |||||
| 15 | .CodeMirro r pre { | |||||
| 16 | padding: 0 4px; /* Horizonta l padding of content */ | |||||
| 17 | } | |||||
| 18 | ||||||
| 19 | .CodeMirro r-scrollba r-filler, .CodeMirro r-gutter-f iller { | |||||
| 20 | backgrou nd-color: white; /* The little square be tween H an d V scroll bars */ | |||||
| 21 | } | |||||
| 22 | ||||||
| 23 | /* GUTTER */ | |||||
| 24 | ||||||
| 25 | .CodeMirro r-gutters { | |||||
| 26 | border-r ight: 1px solid #ddd ; | |||||
| 27 | backgrou nd-color: #f7f7f7; | |||||
| 28 | white-sp ace: nowra p; | |||||
| 29 | } | |||||
| 30 | .CodeMirro r-linenumb ers {} | |||||
| 31 | .CodeMirro r-linenumb er { | |||||
| 32 | padding: 0 3px 0 5 px; | |||||
| 33 | min-widt h: 20px; | |||||
| 34 | text-ali gn: right; | |||||
| 35 | color: # 999; | |||||
| 36 | white-sp ace: nowra p; | |||||
| 37 | } | |||||
| 38 | ||||||
| 39 | .CodeMirro r-gutterma rker { col or: black; } | |||||
| 40 | .CodeMirro r-gutterma rker-subtl e { color: #999; } | |||||
| 41 | ||||||
| 42 | /* CURSOR */ | |||||
| 43 | ||||||
| 44 | .CodeMirro r-cursor { | |||||
| 45 | border-l eft: 1px s olid black ; | |||||
| 46 | border-r ight: none ; | |||||
| 47 | width: 0 ; | |||||
| 48 | } | |||||
| 49 | /* Shown w hen moving in bi-dir ectional t ext */ | |||||
| 50 | .CodeMirro r div.Code Mirror-sec ondarycurs or { | |||||
| 51 | border-l eft: 1px s olid silve r; | |||||
| 52 | } | |||||
| 53 | .cm-fat-cu rsor .Code Mirror-cur sor { | |||||
| 54 | width: a uto; | |||||
| 55 | border: 0; | |||||
| 56 | backgrou nd: #7e7; | |||||
| 57 | } | |||||
| 58 | .cm-fat-cu rsor div.C odeMirror- cursors { | |||||
| 59 | z-index: 1; | |||||
| 60 | } | |||||
| 61 | ||||||
| 62 | .cm-animat e-fat-curs or { | |||||
| 63 | width: a uto; | |||||
| 64 | border: 0; | |||||
| 65 | -webkit- animation: blink 1.0 6s steps(1 ) infinite ; | |||||
| 66 | -moz-ani mation: bl ink 1.06s steps(1) i nfinite; | |||||
| 67 | animatio n: blink 1 .06s steps (1) infini te; | |||||
| 68 | backgrou nd-color: #7e7; | |||||
| 69 | } | |||||
| 70 | @-moz-keyf rames blin k { | |||||
| 71 | 0% {} | |||||
| 72 | 50% { ba ckground-c olor: tran sparent; } | |||||
| 73 | 100% {} | |||||
| 74 | } | |||||
| 75 | @-webkit-k eyframes b link { | |||||
| 76 | 0% {} | |||||
| 77 | 50% { ba ckground-c olor: tran sparent; } | |||||
| 78 | 100% {} | |||||
| 79 | } | |||||
| 80 | @keyframes blink { | |||||
| 81 | 0% {} | |||||
| 82 | 50% { ba ckground-c olor: tran sparent; } | |||||
| 83 | 100% {} | |||||
| 84 | } | |||||
| 85 | ||||||
| 86 | /* Can sty le cursor different in overwri te (non-in sert) mode */ | |||||
| 87 | .CodeMirro r-overwrit e .CodeMir ror-cursor {} | |||||
| 88 | ||||||
| 89 | .cm-tab { display: i nline-bloc k; text-de coration: inherit; } | |||||
| 90 | ||||||
| 91 | .CodeMirro r-ruler { | |||||
| 92 | border-l eft: 1px s olid #ccc; | |||||
| 93 | position : absolute ; | |||||
| 94 | } | |||||
| 95 | ||||||
| 96 | /* DEFAULT THEME */ | |||||
| 97 | ||||||
| 98 | .cm-s-defa ult .cm-he ader {colo r: blue;} | |||||
| 99 | .cm-s-defa ult .cm-qu ote {color : #090;} | |||||
| 100 | .cm-negati ve {color: #d44;} | |||||
| 101 | .cm-positi ve {color: #292;} | |||||
| 102 | .cm-header , .cm-stro ng {font-w eight: bol d;} | |||||
| 103 | .cm-em {fo nt-style: italic;} | |||||
| 104 | .cm-link { text-decor ation: und erline;} | |||||
| 105 | .cm-strike through {t ext-decora tion: line -through;} | |||||
| 106 | ||||||
| 107 | .cm-s-defa ult .cm-ke yword {col or: blue;} | |||||
| 108 | .cm-s-defa ult .cm-at om {color: #219;} | |||||
| 109 | .cm-s-defa ult .cm-nu mber {colo r: #164;} | |||||
| 110 | .cm-s-defa ult .cm-de f {color: #00f;} | |||||
| 111 | .cm-s-defa ult .cm-va riable, | |||||
| 112 | .cm-s-defa ult .cm-pu nctuation, | |||||
| 113 | .cm-s-defa ult .cm-pr operty, | |||||
| 114 | .cm-s-defa ult .cm-op erator {} | |||||
| 115 | .cm-s-defa ult .cm-va riable-2 { color: #05 a;} | |||||
| 116 | .cm-s-defa ult .cm-si nglequote {color: gr een;} | |||||
| 117 | .cm-s-defa ult .cm-dy namicvalue {color: r ed;} | |||||
| 118 | .cm-s-defa ult .cm-co mment {col or: orange ;} | |||||
| 119 | .cm-s-defa ult .cm-st ring {colo r: #a11;} | |||||
| 120 | .cm-s-defa ult .cm-st ring-2 {co lor: #f50; } | |||||
| 121 | .cm-s-defa ult .cm-me ta {color: #555;} | |||||
| 122 | .cm-s-defa ult .cm-qu alifier {c olor: #555 ;} | |||||
| 123 | .cm-s-defa ult .cm-bu iltin {col or: #30a;} | |||||
| 124 | .cm-s-defa ult .cm-br acket {col or: #997;} | |||||
| 125 | .cm-s-defa ult .cm-ta g {color: #170;} | |||||
| 126 | .cm-s-defa ult .cm-at tribute {c olor: #00c ;} | |||||
| 127 | .cm-s-defa ult .cm-hr {color: # 999;} | |||||
| 128 | .cm-s-defa ult .cm-li nk {color: #00c;} | |||||
| 129 | ||||||
| 130 | .cm-s-defa ult .cm-er ror {color : #f00;} | |||||
| 131 | .cm-invali dchar {col or: #f00;} | |||||
| 132 | ||||||
| 133 | .CodeMirro r-composin g { border -bottom: 2 px solid; } | |||||
| 134 | ||||||
| 135 | /* Default styles fo r common a ddons */ | |||||
| 136 | ||||||
| 137 | div.CodeMi rror span. CodeMirror -matchingb racket {co lor: red;} | |||||
| 138 | div.CodeMi rror span. CodeMirror -nonmatchi ngbracket {color: #f 22;} | |||||
| 139 | .CodeMirro r-matching tag { back ground: rg ba(255, 15 0, 0, .3); } | |||||
| 140 | .CodeMirro r-activeli ne-backgro und {backg round: #e8 f2ff;} | |||||
| 141 | ||||||
| 142 | /* STOP */ | |||||
| 143 | ||||||
| 144 | /* The res t of this file conta ins styles related t o the mech anics of | |||||
| 145 | the edi tor. You p robably sh ouldn't to uch them. */ | |||||
| 146 | ||||||
| 147 | .CodeMirro r { | |||||
| 148 | position : relative ; | |||||
| 149 | overflow : hidden; | |||||
| 150 | backgrou nd: white; | |||||
| 151 | } | |||||
| 152 | ||||||
| 153 | .CodeMirro r-scroll { | |||||
| 154 | overflow : scroll ! important; /* Things will brea k if this is overrid den */ | |||||
| 155 | /* 30px is the mag ic margin used to hi de the ele ment's rea l scrollba rs */ | |||||
| 156 | /* See o verflow: h idden in . CodeMirror */ | |||||
| 157 | margin-b ottom: -30 px; margin -right: -3 0px; | |||||
| 158 | padding- bottom: 30 px; | |||||
| 159 | height: 100%; | |||||
| 160 | outline: none; /* Prevent dr agging fro m highligh ting the e lement */ | |||||
| 161 | position : relative ; | |||||
| 162 | } | |||||
| 163 | .CodeMirro r-sizer { | |||||
| 164 | position : relative ; | |||||
| 165 | border-r ight: 30px solid tra nsparent; | |||||
| 166 | } | |||||
| 167 | ||||||
| 168 | /* The fak e, visible scrollbar s. Used to force red raw during scrolling | |||||
| 169 | before actuall sc rolling ha ppens, thu s preventi ng shaking and | |||||
| 170 | flicker ing artifa cts. */ | |||||
| 171 | .CodeMirro r-vscrollb ar, .CodeM irror-hscr ollbar, .C odeMirror- scrollbar- filler, .C odeMirror- gutter-fil ler { | |||||
| 172 | position : absolute ; | |||||
| 173 | z-index: 6; | |||||
| 174 | display: none; | |||||
| 175 | } | |||||
| 176 | .CodeMirro r-vscrollb ar { | |||||
| 177 | right: 0 ; top: 0; | |||||
| 178 | overflow -x: hidden ; | |||||
| 179 | overflow -y: scroll ; | |||||
| 180 | } | |||||
| 181 | .CodeMirro r-hscrollb ar { | |||||
| 182 | bottom: 0; left: 0 ; | |||||
| 183 | overflow -y: hidden ; | |||||
| 184 | overflow -x: scroll ; | |||||
| 185 | } | |||||
| 186 | .CodeMirro r-scrollba r-filler { | |||||
| 187 | right: 0 ; bottom: 0; | |||||
| 188 | } | |||||
| 189 | .CodeMirro r-gutter-f iller { | |||||
| 190 | left: 0; bottom: 0 ; | |||||
| 191 | } | |||||
| 192 | ||||||
| 193 | .CodeMirro r-gutters { | |||||
| 194 | position : absolute ; left: 0; top: 0; | |||||
| 195 | z-index: 3; | |||||
| 196 | } | |||||
| 197 | .CodeMirro r-gutter { | |||||
| 198 | white-sp ace: norma l; | |||||
| 199 | height: 100%; | |||||
| 200 | display: inline-bl ock; | |||||
| 201 | margin-b ottom: -30 px; | |||||
| 202 | /* Hack to make IE 7 behave * / | |||||
| 203 | *zoom:1; | |||||
| 204 | *display :inline; | |||||
| 205 | } | |||||
| 206 | .CodeMirro r-gutter-w rapper { | |||||
| 207 | position : absolute ; | |||||
| 208 | z-index: 4; | |||||
| 209 | backgrou nd: none ! important; | |||||
| 210 | border: none !impo rtant; | |||||
| 211 | } | |||||
| 212 | .CodeMirro r-gutter-b ackground { | |||||
| 213 | position : absolute ; | |||||
| 214 | top: 0; bottom: 0; | |||||
| 215 | z-index: 4; | |||||
| 216 | } | |||||
| 217 | .CodeMirro r-gutter-e lt { | |||||
| 218 | position : absolute ; | |||||
| 219 | cursor: default; | |||||
| 220 | z-index: 4; | |||||
| 221 | } | |||||
| 222 | .CodeMirro r-gutter-w rapper { | |||||
| 223 | -webkit- user-selec t: none; | |||||
| 224 | -moz-use r-select: none; | |||||
| 225 | user-sel ect: none; | |||||
| 226 | } | |||||
| 227 | ||||||
| 228 | .CodeMirro r-lines { | |||||
| 229 | cursor: text; | |||||
| 230 | min-heig ht: 1px; / * prevents collapsin g before f irst draw */ | |||||
| 231 | } | |||||
| 232 | .CodeMirro r pre { | |||||
| 233 | /* Reset some styl es that th e rest of the page m ight have set */ | |||||
| 234 | -moz-bor der-radius : 0; -webk it-border- radius: 0; border-ra dius: 0; | |||||
| 235 | border-w idth: 0; | |||||
| 236 | backgrou nd: transp arent; | |||||
| 237 | font-fam ily: inher it; | |||||
| 238 | font-siz e: inherit ; | |||||
| 239 | margin: 0; | |||||
| 240 | white-sp ace: pre; | |||||
| 241 | word-wra p: normal; | |||||
| 242 | line-hei ght: inher it; | |||||
| 243 | color: i nherit; | |||||
| 244 | z-index: 2; | |||||
| 245 | position : relative ; | |||||
| 246 | overflow : visible; | |||||
| 247 | -webkit- tap-highli ght-color: transpare nt; | |||||
| 248 | } | |||||
| 249 | .CodeMirro r-wrap pre { | |||||
| 250 | word-wra p: break-w ord; | |||||
| 251 | white-sp ace: pre-w rap; | |||||
| 252 | word-bre ak: normal ; | |||||
| 253 | } | |||||
| 254 | ||||||
| 255 | .CodeMirro r-lineback ground { | |||||
| 256 | position : absolute ; | |||||
| 257 | left: 0; right: 0; top: 0; b ottom: 0; | |||||
| 258 | z-index: 0; | |||||
| 259 | } | |||||
| 260 | ||||||
| 261 | .CodeMirro r-linewidg et { | |||||
| 262 | position : relative ; | |||||
| 263 | z-index: 2; | |||||
| 264 | overflow : auto; | |||||
| 265 | } | |||||
| 266 | ||||||
| 267 | .CodeMirro r-widget { } | |||||
| 268 | ||||||
| 269 | .CodeMirro r-code { | |||||
| 270 | outline: none; | |||||
| 271 | } | |||||
| 272 | ||||||
| 273 | /* Force c ontent-box sizing fo r the elem ents where we expect it */ | |||||
| 274 | .CodeMirro r-scroll, | |||||
| 275 | .CodeMirro r-sizer, | |||||
| 276 | .CodeMirro r-gutter, | |||||
| 277 | .CodeMirro r-gutters, | |||||
| 278 | .CodeMirro r-linenumb er { | |||||
| 279 | -moz-box -sizing: c ontent-box ; | |||||
| 280 | box-sizi ng: conten t-box; | |||||
| 281 | } | |||||
| 282 | ||||||
| 283 | .CodeMirro r-measure { | |||||
| 284 | position : absolute ; | |||||
| 285 | width: 1 00%; | |||||
| 286 | height: 0; | |||||
| 287 | overflow : hidden; | |||||
| 288 | visibili ty: hidden ; | |||||
| 289 | } | |||||
| 290 | ||||||
| 291 | .CodeMirro r-cursor { position: absolute; } | |||||
| 292 | .CodeMirro r-measure pre { posi tion: stat ic; } | |||||
| 293 | ||||||
| 294 | div.CodeMi rror-curso rs { | |||||
| 295 | visibili ty: hidden ; | |||||
| 296 | position : relative ; | |||||
| 297 | z-index: 3; | |||||
| 298 | } | |||||
| 299 | div.CodeMi rror-dragc ursors { | |||||
| 300 | visibili ty: visibl e; | |||||
| 301 | } | |||||
| 302 | ||||||
| 303 | .CodeMirro r-focused div.CodeMi rror-curso rs { | |||||
| 304 | visibili ty: visibl e; | |||||
| 305 | } | |||||
| 306 | ||||||
| 307 | .CodeMirro r-selected { backgro und: #d9d9 d9; } | |||||
| 308 | .CodeMirro r-focused .CodeMirro r-selected { backgro und: #d7d4 f0; } | |||||
| 309 | .CodeMirro r-crosshai r { cursor : crosshai r; } | |||||
| 310 | .CodeMirro r-line::se lection, . CodeMirror -line > sp an::select ion, .Code Mirror-lin e > span > span::sel ection { b ackground: #d7d4f0; } | |||||
| 311 | .CodeMirro r-line::-m oz-selecti on, .CodeM irror-line > span::- moz-select ion, .Code Mirror-lin e > span > span::-mo z-selectio n { backgr ound: #d7d 4f0; } | |||||
| 312 | ||||||
| 313 | .cm-search ing { | |||||
| 314 | backgrou nd: #ffa; | |||||
| 315 | backgrou nd: rgba(2 55, 255, 0 , .4); | |||||
| 316 | } | |||||
| 317 | ||||||
| 318 | /* IE7 hac k to preve nt it from returning funny off setTops on the spans */ | |||||
| 319 | .CodeMirro r span { * vertical-a lign: text -bottom; } | |||||
| 320 | ||||||
| 321 | /* Used to force a b order mode l for a no de */ | |||||
| 322 | .cm-force- border { p adding-rig ht: .1px; } | |||||
| 323 | ||||||
| 324 | @media pri nt { | |||||
| 325 | /* Hide the cursor when prin ting */ | |||||
| 326 | .CodeMir ror div.Co deMirror-c ursors { | |||||
| 327 | visibi lity: hidd en; | |||||
| 328 | } | |||||
| 329 | } | |||||
| 330 | ||||||
| 331 | /* See iss ue #2901 * / | |||||
| 332 | .cm-tab-wr ap-hack:af ter { cont ent: ''; } | |||||
| 333 | ||||||
| 334 | /* Help us ers use ma rkselectio n to safel y style te xt backgro und */ | |||||
| 335 | span.CodeM irror-sele ctedtext { backgroun d: none; } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.