Fossil SCM

Merge the blitz skin enhancements.

drh 2015-04-03 13:27 trunk merge
Commit 8e9757296ab2539666070d81bbbfe7fd162e406a
Parent 52d746ed1eae3f1…
3 files changed +24 -2 +24 -2 +1 -1
~ skins/blitz/css.txt ~ skins/blitz_no_logo/css.txt ~ src/timeline.c
M skins/blitz/css.txt
+24 -2
--- skins/blitz/css.txt
+++ skins/blitz/css.txt
@@ -1054,26 +1054,48 @@
10541054
 * Displays chronologically-ordered check-ins with a branch graph.
10551055
 ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– */
10561056
 tr.timelineCurrent {
10571057
 border-left: 2px solid orange;
10581058
 background-color: #ffc;
1059
+ border-bottom: 1px solid #ddd;
1060
+ border-right: 1px solid #ddd;
10591061
 }
10601062
10611063
 tr.timelineSelected {
10621064
 border-left: 2px solid orange;
10631065
 background-color: #ffffe8;
1066
+ border-bottom: 1px solid #ddd;
1067
+ border-right: 1px solid #ddd;
10641068
 }
10651069
10661070
 tr.timelineCurrent td.timelineTableCell {
10671071
 }
10681072
10691073
 tr.timelineSpacer {
10701074
 }
1075
+
1076
+tr.timelineBottom td {
1077
+ border-bottom: 0;
1078
+}
10711079
10721080
 div.timelineDate {
1073
- font-weight: bold;
1074
- white-space: nowrap;
1081
+ font-weight: bold;
1082
+ white-space: nowrap;
1083
+}
1084
+
1085
+td.timelineTime {
1086
+ vertical-align: top;
1087
+ text-align: right;
1088
+ white-space: nowrap;
1089
+ border-bottom: 0;
1090
+}
1091
+
1092
+td.timelineGraph {
1093
+ width: 20px;
1094
+ text-align: left;
1095
+ vertical-align: top;
1096
+ border-bottom: 0;
10751097
 }
10761098
10771099
 a.timelineHistLink {
10781100
 text-transform: lowercase;
10791101
 }
10801102
--- skins/blitz/css.txt
+++ skins/blitz/css.txt
@@ -1054,26 +1054,48 @@
1054 * Displays chronologically-ordered check-ins with a branch graph.
1055 ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– */
1056 tr.timelineCurrent {
1057 border-left: 2px solid orange;
1058 background-color: #ffc;
 
 
1059 }
1060
1061 tr.timelineSelected {
1062 border-left: 2px solid orange;
1063 background-color: #ffffe8;
 
 
1064 }
1065
1066 tr.timelineCurrent td.timelineTableCell {
1067 }
1068
1069 tr.timelineSpacer {
1070 }
 
 
 
 
1071
1072 div.timelineDate {
1073 font-weight: bold;
1074 white-space: nowrap;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1075 }
1076
1077 a.timelineHistLink {
1078 text-transform: lowercase;
1079 }
1080
--- skins/blitz/css.txt
+++ skins/blitz/css.txt
@@ -1054,26 +1054,48 @@
1054 * Displays chronologically-ordered check-ins with a branch graph.
1055 ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– */
1056 tr.timelineCurrent {
1057 border-left: 2px solid orange;
1058 background-color: #ffc;
1059 border-bottom: 1px solid #ddd;
1060 border-right: 1px solid #ddd;
1061 }
1062
1063 tr.timelineSelected {
1064 border-left: 2px solid orange;
1065 background-color: #ffffe8;
1066 border-bottom: 1px solid #ddd;
1067 border-right: 1px solid #ddd;
1068 }
1069
1070 tr.timelineCurrent td.timelineTableCell {
1071 }
1072
1073 tr.timelineSpacer {
1074 }
1075
1076 tr.timelineBottom td {
1077 border-bottom: 0;
1078 }
1079
1080 div.timelineDate {
1081 font-weight: bold;
1082 white-space: nowrap;
1083 }
1084
1085 td.timelineTime {
1086 vertical-align: top;
1087 text-align: right;
1088 white-space: nowrap;
1089 border-bottom: 0;
1090 }
1091
1092 td.timelineGraph {
1093 width: 20px;
1094 text-align: left;
1095 vertical-align: top;
1096 border-bottom: 0;
1097 }
1098
1099 a.timelineHistLink {
1100 text-transform: lowercase;
1101 }
1102
M skins/blitz_no_logo/css.txt
+24 -2
--- skins/blitz_no_logo/css.txt
+++ skins/blitz_no_logo/css.txt
@@ -1054,26 +1054,48 @@
10541054
 * Displays chronologically-ordered check-ins with a branch graph.
10551055
 ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– */
10561056
 tr.timelineCurrent {
10571057
 border-left: 2px solid orange;
10581058
 background-color: #ffc;
1059
+ border-bottom: 1px solid #ddd;
1060
+ border-right: 1px solid #ddd;
10591061
 }
10601062
10611063
 tr.timelineSelected {
10621064
 border-left: 2px solid orange;
10631065
 background-color: #ffffe8;
1066
+ border-bottom: 1px solid #ddd;
1067
+ border-right: 1px solid #ddd;
10641068
 }
10651069
10661070
 tr.timelineCurrent td.timelineTableCell {
10671071
 }
10681072
10691073
 tr.timelineSpacer {
10701074
 }
1075
+
1076
+tr.timelineBottom td {
1077
+ border-bottom: 0;
1078
+}
10711079
10721080
 div.timelineDate {
1073
- font-weight: bold;
1074
- white-space: nowrap;
1081
+ font-weight: bold;
1082
+ white-space: nowrap;
1083
+}
1084
+
1085
+td.timelineTime {
1086
+ vertical-align: top;
1087
+ text-align: right;
1088
+ white-space: nowrap;
1089
+ border-bottom: 0;
1090
+}
1091
+
1092
+td.timelineGraph {
1093
+ width: 20px;
1094
+ text-align: left;
1095
+ vertical-align: top;
1096
+ border-bottom: 0;
10751097
 }
10761098
10771099
 a.timelineHistLink {
10781100
 text-transform: lowercase;
10791101
 }
10801102
--- skins/blitz_no_logo/css.txt
+++ skins/blitz_no_logo/css.txt
@@ -1054,26 +1054,48 @@
1054 * Displays chronologically-ordered check-ins with a branch graph.
1055 ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– */
1056 tr.timelineCurrent {
1057 border-left: 2px solid orange;
1058 background-color: #ffc;
 
 
1059 }
1060
1061 tr.timelineSelected {
1062 border-left: 2px solid orange;
1063 background-color: #ffffe8;
 
 
1064 }
1065
1066 tr.timelineCurrent td.timelineTableCell {
1067 }
1068
1069 tr.timelineSpacer {
1070 }
 
 
 
 
1071
1072 div.timelineDate {
1073 font-weight: bold;
1074 white-space: nowrap;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1075 }
1076
1077 a.timelineHistLink {
1078 text-transform: lowercase;
1079 }
1080
--- skins/blitz_no_logo/css.txt
+++ skins/blitz_no_logo/css.txt
@@ -1054,26 +1054,48 @@
1054 * Displays chronologically-ordered check-ins with a branch graph.
1055 ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––– */
1056 tr.timelineCurrent {
1057 border-left: 2px solid orange;
1058 background-color: #ffc;
1059 border-bottom: 1px solid #ddd;
1060 border-right: 1px solid #ddd;
1061 }
1062
1063 tr.timelineSelected {
1064 border-left: 2px solid orange;
1065 background-color: #ffffe8;
1066 border-bottom: 1px solid #ddd;
1067 border-right: 1px solid #ddd;
1068 }
1069
1070 tr.timelineCurrent td.timelineTableCell {
1071 }
1072
1073 tr.timelineSpacer {
1074 }
1075
1076 tr.timelineBottom td {
1077 border-bottom: 0;
1078 }
1079
1080 div.timelineDate {
1081 font-weight: bold;
1082 white-space: nowrap;
1083 }
1084
1085 td.timelineTime {
1086 vertical-align: top;
1087 text-align: right;
1088 white-space: nowrap;
1089 border-bottom: 0;
1090 }
1091
1092 td.timelineGraph {
1093 width: 20px;
1094 text-align: left;
1095 vertical-align: top;
1096 border-bottom: 0;
1097 }
1098
1099 a.timelineHistLink {
1100 text-transform: lowercase;
1101 }
1102
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -587,11 +587,11 @@
587587
 int w;
588588
 /* style is not moved to css, because this is
589589
 ** a technical div for the timeline graph
590590
 */
591591
 w = pGraph->mxRail*pGraph->iRailPitch + 28;
592
- @ <tr><td></td><td>
592
+ @ <tr class="timelineBottom"><td></td><td>
593593
 @ <div id="grbtm" style="width:%d(w)px;"></div>
594594
 @ </td><td></td></tr>
595595
 }
596596
 }
597597
 @ </table>
598598
--- src/timeline.c
+++ src/timeline.c
@@ -587,11 +587,11 @@
587 int w;
588 /* style is not moved to css, because this is
589 ** a technical div for the timeline graph
590 */
591 w = pGraph->mxRail*pGraph->iRailPitch + 28;
592 @ <tr><td></td><td>
593 @ <div id="grbtm" style="width:%d(w)px;"></div>
594 @ </td><td></td></tr>
595 }
596 }
597 @ </table>
598
--- src/timeline.c
+++ src/timeline.c
@@ -587,11 +587,11 @@
587 int w;
588 /* style is not moved to css, because this is
589 ** a technical div for the timeline graph
590 */
591 w = pGraph->mxRail*pGraph->iRailPitch + 28;
592 @ <tr class="timelineBottom"><td></td><td>
593 @ <div id="grbtm" style="width:%d(w)px;"></div>
594 @ </td><td></td></tr>
595 }
596 }
597 @ </table>
598

Keyboard Shortcuts

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