# HG changeset patch # User Steve Losh # Date 1276400959 14400 # Node ID a150f425c074698ba1ff308c76409a4db3663ac6 # Parent fcbf8d764330a4c7b686dbde0c5b036b6fa400d8 web: style the signoff list diff -r fcbf8d764330 -r a150f425c074 review/static/style.css --- a/review/static/style.css Sat Jun 12 23:12:15 2010 -0400 +++ b/review/static/style.css Sat Jun 12 23:49:19 2010 -0400 @@ -147,6 +147,10 @@ body .disabled { display: none; } +body .avatar img { + height: 52px; + width: 52px; +} form .field { position: relative; } @@ -158,13 +162,13 @@ } form .field label.infield { display: block; - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Consolas, "Courier New", monospace; position: absolute; top: 5px; left: 5px; } form .field textarea { - font-family: Menlo, Monaco, Consolas, "Courier New", monospace; + font-family: Monaco, Consolas, "Courier New", monospace; padding: 5px; -webkit-border-radius: 2px; -moz-border-radius: 2px; @@ -199,7 +203,7 @@ } #index .content table tr td.node .hash { color: #888888; - font: normal 11px Menlo, Monaco, Consolas, "Courier New", monospace; + font: normal 11px Monaco, Consolas, "Courier New", monospace; } #index .content table tr td.stats { text-align: right; @@ -373,9 +377,81 @@ -moz-box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.02); -webkit-box-shadow: 0px 5px 5px rgba(0, 0, 0, 0.02); } +#changeset .content .review-level-comments { + background-color: #faf9ef; + border: 1px solid #ccc; + margin-bottom: 14px; +} +#changeset .content .review-level-comments .comment { + padding: 10px 10px 12px; + border-top: 1px solid #fff; + border-bottom: 1px solid #ddd; +} +#changeset .content .review-level-comments .comment:first-child { + border-top: none; +} +#changeset .content .review-level-comments .comment:last-child { + border-bottom: none; +} +#changeset .content .review-level-comments .comment img { + float: right; +} +#changeset .content .review-level-comments .comment .message { + background-color: #fefefd; + border: 1px solid #eee; + font-family: Monaco, Consolas, "Courier New", monospace; + font-size: 12px; + padding: 10px; + width: 650px; +} #changeset .content .add-review-comment { margin-bottom: 40px; } +#changeset .content .signoffs { + background-color: #faf9ef; + border: 1px solid #ccc; + margin-bottom: 14px; +} +#changeset .content .signoffs .signoff { + padding: 10px 10px 12px; + border-top: 1px solid #fff; + border-bottom: 1px solid #ddd; +} +#changeset .content .signoffs .signoff:first-child { + border-top: none; +} +#changeset .content .signoffs .signoff:last-child { + border-bottom: none; +} +#changeset .content .signoffs .signoff .avatar { + float: right; +} +#changeset .content .signoffs .signoff .signoff-opinion { + float: right; + font: bold 52px/1 "Helvetica Neue", HelveticaNeue, Arial, Helvetica, sans-serif; + text-transform: capitalize; + margin-right: 15px; +} +#changeset .content .signoffs .signoff .signoff-opinion.yes { + color: #568019; +} +#changeset .content .signoffs .signoff .signoff-opinion.no { + color: #c00; +} +#changeset .content .signoffs .signoff .signoff-opinion.neutral { + color: #bab994; +} +#changeset .content .signoffs .signoff .author .opinion { + font-weight: bold; +} +#changeset .content .signoffs .signoff .message { + background-color: #fefefd; + border: 1px solid #eee; + font-family: Monaco, Consolas, "Courier New", monospace; + font-size: 12px; + padding: 10px; + width: 500px; +} #changeset .content .add-signoff { margin-bottom: 40px; } diff -r fcbf8d764330 -r a150f425c074 review/static/style.less --- a/review/static/style.less Sat Jun 12 23:12:15 2010 -0400 +++ b/review/static/style.less Sat Jun 12 23:49:19 2010 -0400 @@ -1,5 +1,5 @@ @font-normal: "Helvetica Neue", HelveticaNeue, Arial, Helvetica, sans-serif; -@font-mono: Menlo, Monaco, Consolas, "Courier New", monospace; +@font-mono: Monaco, Consolas, "Courier New", monospace; @c-cream: #edecc7; @c-green: #648239; @@ -11,6 +11,7 @@ @c-light: #888888; @c-metal: #eaeaea; +@c-soft-cream: lighten(@c-cream, 12%); @content-width: 800px; @content-background: rgb(250, 250, 250); @@ -178,6 +179,10 @@ .disabled { display: none; } + .avatar img { + height: 52px; + width: 52px; + } } form { @@ -308,17 +313,88 @@ border: 1px solid #ccc; .border-radius(3px); padding: 15px 10px; - background-color: lighten(@c-cream, 12%); + background-color: @c-soft-cream; .box-shadow(0px, 5px, 5px, rgba(0, 0, 0, 0.02); } } + .review-level-comments { + background-color: @c-soft-cream; + border: 1px solid #ccc; + margin-bottom: 14px; + .comment { + padding: 10px 10px 12px; + border-top: 1px solid #fff; + border-bottom: 1px solid #ddd; + + &:first-child { + border-top: none; + } + &:last-child { + border-bottom: none; + } + img { + float: right; + } + .message { + background-color: lighten(@c-soft-cream, 4%); + border: 1px solid #eee; + font-family: @font-mono; + font-size: 12px; + padding: 10px; + width: 650px; + } + } + } .add-review-comment { margin-bottom: 40px; - } + .signoffs { + background-color: @c-soft-cream; + border: 1px solid #ccc; + margin-bottom: 14px; + + .signoff { + padding: 10px 10px 12px; + border-top: 1px solid #fff; + border-bottom: 1px solid #ddd; + + &:first-child { + border-top: none; + } + &:last-child { + border-bottom: none; + } + .avatar { + float: right; + } + .signoff-opinion { + float: right; + font: bold 52px/1 @font-normal; + text-transform: capitalize; + margin-right: 15px; + + &.yes { color: saturate(@c-green - #111, 20%); } + &.no { color: #c00; } + &.neutral { color: @c-cream - #333; } + } + .author { + .opinion { + font-weight: bold; + } + } + .message { + background-color: lighten(@c-soft-cream, 4%); + border: 1px solid #eee; + font-family: @font-mono; + font-size: 12px; + padding: 10px; + width: 500px; + } + } + } .add-signoff { margin-bottom: 40px; diff -r fcbf8d764330 -r a150f425c074 review/templates/changeset.html --- a/review/templates/changeset.html Sat Jun 12 23:12:15 2010 -0400 +++ b/review/templates/changeset.html Sat Jun 12 23:49:19 2010 -0400 @@ -10,18 +10,26 @@
{{ "\n".join(rev.description().splitlines()[1:]).strip() }}
{% endif %} - {% for comment in rcset.review_level_comments() %} -
- {{ macros.gravatar(comment, utils) }} -
-
- {{ utils['templatefilters'].person(comment.author) }} - said: -
-
{{ comment.message }}
+ {% with %} + {% set comments = rcset.review_level_comments() %} + + {% if comments %} +
+ {% for comment in comments %} +
+ {{ macros.gravatar(comment, utils) }} +
+
+ {{ utils['templatefilters'].person(comment.author) }} + said: +
+
{{ comment.message }}
+
+
+ {% endfor %}
-
- {% endfor %} + {% endif %} + {% endwith %} {% if not read_only %}
@@ -39,18 +47,28 @@

Signoffs

- {% for signoff in rcset.signoffs %} -
- {{ macros.gravatar(signoff, utils) }} -
-
- {{ utils['templatefilters'].person(signoff.author) }} - signed off as {{ signoff.opinion or "neutral" }} on this changeset, saying: -
-
{{ signoff.message }}
+ {% with %} + {% set signoffs = rcset.signoffs %} + + {% if signoffs %} +
+ {% for signoff in signoffs %} +
+ {{ macros.gravatar(signoff, utils) }} +
{{ signoff.opinion or "meh" }}
+ +
+
+ {{ utils['templatefilters'].person(signoff.author) }} + signed off as {{ signoff.opinion or "neutral" }} on this changeset, saying: +
+
{{ signoff.message }}
+
+
+ {% endfor %}
-
- {% endfor %} + {% endif %} + {% endwith %} {% if not read_only %}