Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Pick up the cherrypick merge arrow display fix from trunk. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | rid-renumbering |
| Files: | files | file ages | folders |
| SHA3-256: |
12a022b14ae54fa9d7f40555362b55f1 |
| User & Date: | drh 2019-01-20 23:58:05 |
Context
|
2019-01-21
| ||
| 16:54 | When SQLite detects that the repository associated with a checkout has been replaced by a clone (such that the RID values potentially change) then automatically adjust the content of the checkout database. (check-in: fff37e62 user: drh tags: trunk) | |
|
2019-01-20
| ||
| 23:58 | Pick up the cherrypick merge arrow display fix from trunk. (Closed-Leaf check-in: 12a022b1 user: drh tags: rid-renumbering) | |
| 23:57 | Improved rendering of cherrypick merge arrows, especially on the "ardoise" and "eagle" skins. (check-in: 9c7fdea8 user: drh tags: trunk) | |
| 23:42 | Minor comment changes. (check-in: e2a73756 user: drh tags: rid-renumbering) | |
Changes
Changes to skins/ardoise/css.txt.
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 |
}
.tl-arrow.merge.r {
border-left: 3px solid #bbb
}
.tl-line.merge {
width: 1px
}
.intLink[title="Add indentation"],
.intLink[title="Center align"],
.intLink[title="Dotted list"],
.intLink[title="Left align"],
.intLink[title="Numbered list"],
.intLink[title="Remove formatting"],
.intLink[title="Right align"],
|
> > > > > > > > > > > > > > > > > > > > > > > |
1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 |
}
.tl-arrow.merge.r {
border-left: 3px solid #bbb
}
.tl-line.merge {
width: 1px
}
.tl-arrow.cherrypick {
height: 1px;
border-width: 2px 0;
}
.tl-arrow.cherrypick.l {
border-right: 3px solid #bbb;
}
.tl-arrow.cherrypick.r {
border-left: 3px solid #bbb;
}
.tl-line.cherrypick.h {
width: 0px;
border-top: 1px dashed #bbb;
border-left: 0px dashed #bbb;
background: rgba(255,255,255,0);
}
.tl-line.cherrypick.v {
width: 0px;
border-top: 0px dashed #bbb;
border-left: 1px dashed #bbb;
background: rgba(255,255,255,0);
}
.intLink[title="Add indentation"],
.intLink[title="Center align"],
.intLink[title="Dotted list"],
.intLink[title="Left align"],
.intLink[title="Numbered list"],
.intLink[title="Remove formatting"],
.intLink[title="Right align"],
|
Changes to skins/eagle/css.txt.
217 218 219 220 221 222 223 224 225 226 227 228 229 230 |
border-right: 3px solid #fff;
}
/* right merge arrow */
.tl-arrow.merge.r {
border-left: 3px solid #fff;
}
/* Side-by-side diff */
table.sbsdiff {
background-color: #485D7B;
font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
font-size: 8pt;
border-collapse:collapse;
|
> > > > > > > > > > > > > > > > > > > > > > > > |
217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
border-right: 3px solid #fff;
}
/* right merge arrow */
.tl-arrow.merge.r {
border-left: 3px solid #fff;
}
.tl-arrow.cherrypick {
height: 1px;
border-width: 2px 0;
}
.tl-arrow.cherrypick.l {
border-right: 3px solid #fff;
}
.tl-arrow.cherrypick.r {
border-left: 3px solid #fff;
}
.tl-line.cherrypick.h {
width: 0px;
border-top: 1px dashed #fff;
border-left: 0px dashed #fff;
background: rgba(255,255,255,0);
}
.tl-line.cherrypick.v {
width: 0px;
border-top: 0px dashed #fff;
border-left: 1px dashed #fff;
background: rgba(255,255,255,0);
}
/* Side-by-side diff */
table.sbsdiff {
background-color: #485D7B;
font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
font-size: 8pt;
border-collapse:collapse;
|
Changes to src/default_css.txt.
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
.tl-arrow.cherrypick.r {
border-left: 3px solid #000;
}
.tl-line.cherrypick.h {
width: 0px;
border-top: 1px dashed #000;
border-left: 0px dashed #000;
background: #fff;
}
.tl-line.cherrypick.v {
width: 0px;
border-top: 0px dashed #000;
border-left: 1px dashed #000;
background: #fff;
}
.tl-arrow.warp {
margin-left: 1px;
border-width: 3px 0;
border-left: 7px solid #600000;
}
.tl-line.warp {
|
| | |
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 |
.tl-arrow.cherrypick.r {
border-left: 3px solid #000;
}
.tl-line.cherrypick.h {
width: 0px;
border-top: 1px dashed #000;
border-left: 0px dashed #000;
background: rgba(255,255,255,0);
}
.tl-line.cherrypick.v {
width: 0px;
border-top: 0px dashed #000;
border-left: 1px dashed #000;
background: rgba(255,255,255,0);
}
.tl-arrow.warp {
margin-left: 1px;
border-width: 3px 0;
border-left: 7px solid #600000;
}
.tl-line.warp {
|