author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:01:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:01:59 (UTC) |
commit | 31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63 (patch) (unidiff) | |
tree | 26200ad3c376ea1208d2a870ebb3b2bc6d7abee6 /cgit.css | |
parent | e66a16cebcdac53b63e77876acef1ca9e4877038 (diff) | |
parent | c2bfd40f8aaaa69a66c6eb729c202e42a43ec166 (diff) | |
download | cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.zip cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.gz cgit-31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63.tar.bz2 |
Merge branch 'jh/graph'
* jh/graph:
ui-log: Move 'Age' column when commit graph is present
ui-log: Line-wrap long commit subjects when showmsg is enabled
ui-log: Colorize commit graph
ui-log: Implement support for commit graphs
ui-log: Change display of full commit messages (and notes)
Conflicts:
cgit.css
-rw-r--r-- | cgit.css | 40 |
1 files changed, 29 insertions, 11 deletions
@@ -132,68 +132,86 @@ table.list tr.logheader { | |||
132 | 132 | ||
133 | table.list tr:hover { | 133 | table.list tr:hover { |
134 | background: #eee; | 134 | background: #eee; |
135 | } | 135 | } |
136 | 136 | ||
137 | table.list tr.nohover:hover { | 137 | table.list tr.nohover:hover { |
138 | background: white; | 138 | background: white; |
139 | } | 139 | } |
140 | 140 | ||
141 | table.list th { | 141 | table.list th { |
142 | font-weight: bold; | 142 | font-weight: bold; |
143 | /* color: #888; | 143 | /* color: #888; |
144 | border-top: dashed 1px #888; | 144 | border-top: dashed 1px #888; |
145 | border-bottom: dashed 1px #888; | 145 | border-bottom: dashed 1px #888; |
146 | */ | 146 | */ |
147 | padding: 0.1em 0.5em 0.05em 0.5em; | 147 | padding: 0.1em 0.5em 0.05em 0.5em; |
148 | vertical-align: baseline; | 148 | vertical-align: baseline; |
149 | } | 149 | } |
150 | 150 | ||
151 | table.list td { | 151 | table.list td { |
152 | border: none; | 152 | border: none; |
153 | padding: 0.1em 0.5em 0.1em 0.5em; | 153 | padding: 0.1em 0.5em 0.1em 0.5em; |
154 | } | 154 | } |
155 | 155 | ||
156 | table.list td.logsubject { | 156 | table.list td.commitgraph { |
157 | font-family: monospace; | 157 | font-family: monospace; |
158 | font-weight: bold; | 158 | white-space: pre; |
159 | } | 159 | } |
160 | 160 | ||
161 | table.list td.logmsg { | 161 | table.list td.commitgraph .column1 { |
162 | font-family: monospace; | 162 | color: #a00; |
163 | white-space: pre; | ||
164 | padding: 1em 0.5em 2em 0.5em; | ||
165 | } | 163 | } |
166 | 164 | ||
167 | table.list td.lognotes-label { | 165 | table.list td.commitgraph .column2 { |
168 | text-align:right; | 166 | color: #0a0; |
169 | vertical-align:top; | 167 | } |
168 | |||
169 | table.list td.commitgraph .column3 { | ||
170 | color: #aa0; | ||
171 | } | ||
172 | |||
173 | table.list td.commitgraph .column4 { | ||
174 | color: #00a; | ||
175 | } | ||
176 | |||
177 | table.list td.commitgraph .column5 { | ||
178 | color: #a0a; | ||
170 | } | 179 | } |
171 | 180 | ||
172 | table.list td.lognotes { | 181 | table.list td.commitgraph .column6 { |
182 | color: #0aa; | ||
183 | } | ||
184 | |||
185 | table.list td.logsubject { | ||
186 | font-family: monospace; | ||
187 | font-weight: bold; | ||
188 | } | ||
189 | |||
190 | table.list td.logmsg { | ||
173 | font-family: monospace; | 191 | font-family: monospace; |
174 | white-space: pre; | 192 | white-space: pre; |
175 | padding: 0em 0.5em 2em 0.5em; | 193 | padding: 0 0.5em; |
176 | } | 194 | } |
177 | 195 | ||
178 | table.list td a { | 196 | table.list td a { |
179 | color: black; | 197 | color: black; |
180 | } | 198 | } |
181 | 199 | ||
182 | table.list td a.ls-dir { | 200 | table.list td a.ls-dir { |
183 | font-weight: bold; | 201 | font-weight: bold; |
184 | color: #00f; | 202 | color: #00f; |
185 | } | 203 | } |
186 | 204 | ||
187 | table.list td a:hover { | 205 | table.list td a:hover { |
188 | color: #00f; | 206 | color: #00f; |
189 | } | 207 | } |
190 | 208 | ||
191 | img { | 209 | img { |
192 | border: none; | 210 | border: none; |
193 | } | 211 | } |
194 | 212 | ||
195 | input#switch-btn { | 213 | input#switch-btn { |
196 | margin: 2px 0px 0px 0px; | 214 | margin: 2px 0px 0px 0px; |
197 | } | 215 | } |
198 | 216 | ||
199 | td#sidebar input.txt { | 217 | td#sidebar input.txt { |