Fossil SCM
Force inheritance of the HTML-mode diff font-size and line-height attributes to fix misalignment in some browsers.
Commit
cf911e442538368edecef540f45a3d15bd5d363668ba3e12bad727fd3ebeb171
Parent
d4b167bd9756de9…
1 file changed
+20
+20
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -204,16 +204,22 @@ | ||
| 204 | 204 | @ |
| 205 | 205 | @ table.diff { |
| 206 | 206 | @ width: 100%; |
| 207 | 207 | @ border-spacing: 0; |
| 208 | 208 | @ border: 1px solid black; |
| 209 | +@ line-height: inherit; | |
| 210 | +@ font-size: inherit; | |
| 209 | 211 | @ } |
| 210 | 212 | @ table.diff td { |
| 211 | 213 | @ vertical-align: top; |
| 214 | +@ line-height: inherit; | |
| 215 | +@ font-size: inherit; | |
| 212 | 216 | @ } |
| 213 | 217 | @ table.diff pre { |
| 214 | 218 | @ margin: 0 0 0 0; |
| 219 | +@ line-height: inherit; | |
| 220 | +@ font-size: inherit; | |
| 215 | 221 | @ } |
| 216 | 222 | @ td.diffln { |
| 217 | 223 | @ width: 1px; |
| 218 | 224 | @ text-align: right; |
| 219 | 225 | @ padding: 0 1em 0 0; |
| @@ -222,25 +228,37 @@ | ||
| 222 | 228 | @ padding-bottom: 0.4em; |
| 223 | 229 | @ } |
| 224 | 230 | @ td.diffsep { |
| 225 | 231 | @ width: 1px; |
| 226 | 232 | @ padding: 0 0.3em 0 1em; |
| 233 | +@ line-height: inherit; | |
| 234 | +@ font-size: inherit; | |
| 235 | +@ } | |
| 236 | +@ td.diffsep pre { | |
| 237 | +@ line-height: inherit; | |
| 238 | +@ font-size: inherit; | |
| 227 | 239 | @ } |
| 228 | 240 | @ td.difftxt pre { |
| 229 | 241 | @ overflow-x: auto; |
| 230 | 242 | @ } |
| 231 | 243 | @ td.diffln ins { |
| 232 | 244 | @ background-color: #a0e4b2; |
| 233 | 245 | @ text-decoration: none; |
| 246 | +@ line-height: inherit; | |
| 247 | +@ font-size: inherit; | |
| 234 | 248 | @ } |
| 235 | 249 | @ td.diffln del { |
| 236 | 250 | @ background-color: #ffc0c0; |
| 237 | 251 | @ text-decoration: none; |
| 252 | +@ line-height: inherit; | |
| 253 | +@ font-size: inherit; | |
| 238 | 254 | @ } |
| 239 | 255 | @ td.difftxt del { |
| 240 | 256 | @ background-color: #ffe8e8; |
| 241 | 257 | @ text-decoration: none; |
| 258 | +@ line-height: inherit; | |
| 259 | +@ font-size: inherit; | |
| 242 | 260 | @ } |
| 243 | 261 | @ td.difftxt del > del { |
| 244 | 262 | @ background-color: #ffc0c0; |
| 245 | 263 | @ text-decoration: none; |
| 246 | 264 | @ font-weight: bold; |
| @@ -251,10 +269,12 @@ | ||
| 251 | 269 | @ font-weight: bold; |
| 252 | 270 | @ } |
| 253 | 271 | @ td.difftxt ins { |
| 254 | 272 | @ background-color: #dafbe1; |
| 255 | 273 | @ text-decoration: none; |
| 274 | +@ line-height: inherit; | |
| 275 | +@ font-size: inherit; | |
| 256 | 276 | @ } |
| 257 | 277 | @ td.difftxt ins > ins { |
| 258 | 278 | @ background-color: #a0e4b2; |
| 259 | 279 | @ text-decoration: none; |
| 260 | 280 | @ font-weight: bold; |
| 261 | 281 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -204,16 +204,22 @@ | |
| 204 | @ |
| 205 | @ table.diff { |
| 206 | @ width: 100%; |
| 207 | @ border-spacing: 0; |
| 208 | @ border: 1px solid black; |
| 209 | @ } |
| 210 | @ table.diff td { |
| 211 | @ vertical-align: top; |
| 212 | @ } |
| 213 | @ table.diff pre { |
| 214 | @ margin: 0 0 0 0; |
| 215 | @ } |
| 216 | @ td.diffln { |
| 217 | @ width: 1px; |
| 218 | @ text-align: right; |
| 219 | @ padding: 0 1em 0 0; |
| @@ -222,25 +228,37 @@ | |
| 222 | @ padding-bottom: 0.4em; |
| 223 | @ } |
| 224 | @ td.diffsep { |
| 225 | @ width: 1px; |
| 226 | @ padding: 0 0.3em 0 1em; |
| 227 | @ } |
| 228 | @ td.difftxt pre { |
| 229 | @ overflow-x: auto; |
| 230 | @ } |
| 231 | @ td.diffln ins { |
| 232 | @ background-color: #a0e4b2; |
| 233 | @ text-decoration: none; |
| 234 | @ } |
| 235 | @ td.diffln del { |
| 236 | @ background-color: #ffc0c0; |
| 237 | @ text-decoration: none; |
| 238 | @ } |
| 239 | @ td.difftxt del { |
| 240 | @ background-color: #ffe8e8; |
| 241 | @ text-decoration: none; |
| 242 | @ } |
| 243 | @ td.difftxt del > del { |
| 244 | @ background-color: #ffc0c0; |
| 245 | @ text-decoration: none; |
| 246 | @ font-weight: bold; |
| @@ -251,10 +269,12 @@ | |
| 251 | @ font-weight: bold; |
| 252 | @ } |
| 253 | @ td.difftxt ins { |
| 254 | @ background-color: #dafbe1; |
| 255 | @ text-decoration: none; |
| 256 | @ } |
| 257 | @ td.difftxt ins > ins { |
| 258 | @ background-color: #a0e4b2; |
| 259 | @ text-decoration: none; |
| 260 | @ font-weight: bold; |
| 261 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -204,16 +204,22 @@ | |
| 204 | @ |
| 205 | @ table.diff { |
| 206 | @ width: 100%; |
| 207 | @ border-spacing: 0; |
| 208 | @ border: 1px solid black; |
| 209 | @ line-height: inherit; |
| 210 | @ font-size: inherit; |
| 211 | @ } |
| 212 | @ table.diff td { |
| 213 | @ vertical-align: top; |
| 214 | @ line-height: inherit; |
| 215 | @ font-size: inherit; |
| 216 | @ } |
| 217 | @ table.diff pre { |
| 218 | @ margin: 0 0 0 0; |
| 219 | @ line-height: inherit; |
| 220 | @ font-size: inherit; |
| 221 | @ } |
| 222 | @ td.diffln { |
| 223 | @ width: 1px; |
| 224 | @ text-align: right; |
| 225 | @ padding: 0 1em 0 0; |
| @@ -222,25 +228,37 @@ | |
| 228 | @ padding-bottom: 0.4em; |
| 229 | @ } |
| 230 | @ td.diffsep { |
| 231 | @ width: 1px; |
| 232 | @ padding: 0 0.3em 0 1em; |
| 233 | @ line-height: inherit; |
| 234 | @ font-size: inherit; |
| 235 | @ } |
| 236 | @ td.diffsep pre { |
| 237 | @ line-height: inherit; |
| 238 | @ font-size: inherit; |
| 239 | @ } |
| 240 | @ td.difftxt pre { |
| 241 | @ overflow-x: auto; |
| 242 | @ } |
| 243 | @ td.diffln ins { |
| 244 | @ background-color: #a0e4b2; |
| 245 | @ text-decoration: none; |
| 246 | @ line-height: inherit; |
| 247 | @ font-size: inherit; |
| 248 | @ } |
| 249 | @ td.diffln del { |
| 250 | @ background-color: #ffc0c0; |
| 251 | @ text-decoration: none; |
| 252 | @ line-height: inherit; |
| 253 | @ font-size: inherit; |
| 254 | @ } |
| 255 | @ td.difftxt del { |
| 256 | @ background-color: #ffe8e8; |
| 257 | @ text-decoration: none; |
| 258 | @ line-height: inherit; |
| 259 | @ font-size: inherit; |
| 260 | @ } |
| 261 | @ td.difftxt del > del { |
| 262 | @ background-color: #ffc0c0; |
| 263 | @ text-decoration: none; |
| 264 | @ font-weight: bold; |
| @@ -251,10 +269,12 @@ | |
| 269 | @ font-weight: bold; |
| 270 | @ } |
| 271 | @ td.difftxt ins { |
| 272 | @ background-color: #dafbe1; |
| 273 | @ text-decoration: none; |
| 274 | @ line-height: inherit; |
| 275 | @ font-size: inherit; |
| 276 | @ } |
| 277 | @ td.difftxt ins > ins { |
| 278 | @ background-color: #a0e4b2; |
| 279 | @ text-decoration: none; |
| 280 | @ font-weight: bold; |
| 281 |