Fossil SCM

Improved rendering of cherrypick merge arrows, especially on the "ardoise" and "eagle" skins.

drh 2019-01-20 23:57 trunk
Commit 9c7fdea89b50654ed8a36e82f2c47c523ad7dfcac48437d53cb97af742b89342
Parent 20431a7cfb2ed46…
3 files changed +23 +24 +2 -2
~ skins/ardoise/css.txt ~ skins/eagle/css.txt ~ src/default_css.txt
M skins/ardoise/css.txt
+23
--- skins/ardoise/css.txt
+++ skins/ardoise/css.txt
@@ -1030,10 +1030,33 @@
10301030
 border-left: 3px solid #bbb
10311031
 }
10321032
 .tl-line.merge {
10331033
 width: 1px
10341034
 }
1035
+.tl-arrow.cherrypick {
1036
+ height: 1px;
1037
+ border-width: 2px 0;
1038
+}
1039
+.tl-arrow.cherrypick.l {
1040
+ border-right: 3px solid #bbb;
1041
+}
1042
+.tl-arrow.cherrypick.r {
1043
+ border-left: 3px solid #bbb;
1044
+}
1045
+.tl-line.cherrypick.h {
1046
+ width: 0px;
1047
+ border-top: 1px dashed #bbb;
1048
+ border-left: 0px dashed #bbb;
1049
+ background: rgba(255,255,255,0);
1050
+}
1051
+.tl-line.cherrypick.v {
1052
+ width: 0px;
1053
+ border-top: 0px dashed #bbb;
1054
+ border-left: 1px dashed #bbb;
1055
+ background: rgba(255,255,255,0);
1056
+}
1057
+
10351058
 .intLink[title="Add indentation"],
10361059
 .intLink[title="Center align"],
10371060
 .intLink[title="Dotted list"],
10381061
 .intLink[title="Left align"],
10391062
 .intLink[title="Numbered list"],
10401063
--- skins/ardoise/css.txt
+++ skins/ardoise/css.txt
@@ -1030,10 +1030,33 @@
1030 border-left: 3px solid #bbb
1031 }
1032 .tl-line.merge {
1033 width: 1px
1034 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1035 .intLink[title="Add indentation"],
1036 .intLink[title="Center align"],
1037 .intLink[title="Dotted list"],
1038 .intLink[title="Left align"],
1039 .intLink[title="Numbered list"],
1040
--- skins/ardoise/css.txt
+++ skins/ardoise/css.txt
@@ -1030,10 +1030,33 @@
1030 border-left: 3px solid #bbb
1031 }
1032 .tl-line.merge {
1033 width: 1px
1034 }
1035 .tl-arrow.cherrypick {
1036 height: 1px;
1037 border-width: 2px 0;
1038 }
1039 .tl-arrow.cherrypick.l {
1040 border-right: 3px solid #bbb;
1041 }
1042 .tl-arrow.cherrypick.r {
1043 border-left: 3px solid #bbb;
1044 }
1045 .tl-line.cherrypick.h {
1046 width: 0px;
1047 border-top: 1px dashed #bbb;
1048 border-left: 0px dashed #bbb;
1049 background: rgba(255,255,255,0);
1050 }
1051 .tl-line.cherrypick.v {
1052 width: 0px;
1053 border-top: 0px dashed #bbb;
1054 border-left: 1px dashed #bbb;
1055 background: rgba(255,255,255,0);
1056 }
1057
1058 .intLink[title="Add indentation"],
1059 .intLink[title="Center align"],
1060 .intLink[title="Dotted list"],
1061 .intLink[title="Left align"],
1062 .intLink[title="Numbered list"],
1063
M skins/eagle/css.txt
+24
--- skins/eagle/css.txt
+++ skins/eagle/css.txt
@@ -219,10 +219,34 @@
219219
220220
 /* right merge arrow */
221221
 .tl-arrow.merge.r {
222222
 border-left: 3px solid #fff;
223223
 }
224
+
225
+.tl-arrow.cherrypick {
226
+ height: 1px;
227
+ border-width: 2px 0;
228
+}
229
+.tl-arrow.cherrypick.l {
230
+ border-right: 3px solid #fff;
231
+}
232
+.tl-arrow.cherrypick.r {
233
+ border-left: 3px solid #fff;
234
+}
235
+.tl-line.cherrypick.h {
236
+ width: 0px;
237
+ border-top: 1px dashed #fff;
238
+ border-left: 0px dashed #fff;
239
+ background: rgba(255,255,255,0);
240
+}
241
+.tl-line.cherrypick.v {
242
+ width: 0px;
243
+ border-top: 0px dashed #fff;
244
+ border-left: 1px dashed #fff;
245
+ background: rgba(255,255,255,0);
246
+}
247
+
224248
225249
 /* Side-by-side diff */
226250
 table.sbsdiff {
227251
 background-color: #485D7B;
228252
 font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
229253
--- skins/eagle/css.txt
+++ skins/eagle/css.txt
@@ -219,10 +219,34 @@
219
220 /* right merge arrow */
221 .tl-arrow.merge.r {
222 border-left: 3px solid #fff;
223 }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
224
225 /* Side-by-side diff */
226 table.sbsdiff {
227 background-color: #485D7B;
228 font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
229
--- skins/eagle/css.txt
+++ skins/eagle/css.txt
@@ -219,10 +219,34 @@
219
220 /* right merge arrow */
221 .tl-arrow.merge.r {
222 border-left: 3px solid #fff;
223 }
224
225 .tl-arrow.cherrypick {
226 height: 1px;
227 border-width: 2px 0;
228 }
229 .tl-arrow.cherrypick.l {
230 border-right: 3px solid #fff;
231 }
232 .tl-arrow.cherrypick.r {
233 border-left: 3px solid #fff;
234 }
235 .tl-line.cherrypick.h {
236 width: 0px;
237 border-top: 1px dashed #fff;
238 border-left: 0px dashed #fff;
239 background: rgba(255,255,255,0);
240 }
241 .tl-line.cherrypick.v {
242 width: 0px;
243 border-top: 0px dashed #fff;
244 border-left: 1px dashed #fff;
245 background: rgba(255,255,255,0);
246 }
247
248
249 /* Side-by-side diff */
250 table.sbsdiff {
251 background-color: #485D7B;
252 font-family: fixed, Dejavu Sans Mono, Monaco, Lucida Console, monospace;
253
M src/default_css.txt
+2 -2
--- src/default_css.txt
+++ src/default_css.txt
@@ -173,17 +173,17 @@
173173
 }
174174
 .tl-line.cherrypick.h {
175175
 width: 0px;
176176
 border-top: 1px dashed #000;
177177
 border-left: 0px dashed #000;
178
- background: #fff;
178
+ background: rgba(255,255,255,0);
179179
 }
180180
 .tl-line.cherrypick.v {
181181
 width: 0px;
182182
 border-top: 0px dashed #000;
183183
 border-left: 1px dashed #000;
184
- background: #fff;
184
+ background: rgba(255,255,255,0);
185185
 }
186186
 .tl-arrow.warp {
187187
 margin-left: 1px;
188188
 border-width: 3px 0;
189189
 border-left: 7px solid #600000;
190190
--- src/default_css.txt
+++ src/default_css.txt
@@ -173,17 +173,17 @@
173 }
174 .tl-line.cherrypick.h {
175 width: 0px;
176 border-top: 1px dashed #000;
177 border-left: 0px dashed #000;
178 background: #fff;
179 }
180 .tl-line.cherrypick.v {
181 width: 0px;
182 border-top: 0px dashed #000;
183 border-left: 1px dashed #000;
184 background: #fff;
185 }
186 .tl-arrow.warp {
187 margin-left: 1px;
188 border-width: 3px 0;
189 border-left: 7px solid #600000;
190
--- src/default_css.txt
+++ src/default_css.txt
@@ -173,17 +173,17 @@
173 }
174 .tl-line.cherrypick.h {
175 width: 0px;
176 border-top: 1px dashed #000;
177 border-left: 0px dashed #000;
178 background: rgba(255,255,255,0);
179 }
180 .tl-line.cherrypick.v {
181 width: 0px;
182 border-top: 0px dashed #000;
183 border-left: 1px dashed #000;
184 background: rgba(255,255,255,0);
185 }
186 .tl-arrow.warp {
187 margin-left: 1px;
188 border-width: 3px 0;
189 border-left: 7px solid #600000;
190

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button