From 1e83907b001a2df3f14a35fc36c47ea8f49155c4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 25 Apr 2011 21:52:38 -0400 Subject: [PATCH] Sprinkled some icons throughout ui. Centralized icon retrieval. --- src/com/gitblit/wicket/resources/gitblit.css | 195 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 176 insertions(+), 19 deletions(-) diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css index 736dbb3..3200381 100644 --- a/src/com/gitblit/wicket/resources/gitblit.css +++ b/src/com/gitblit/wicket/resources/gitblit.css @@ -4,7 +4,11 @@ html, body, table, dl, dt, dd, ol, ul, li, form, a, span, tr, th, td, div, em { font-family: verdana, sans-serif; font-size: 12px; - line-height: 15px; + line-height: 1.35em; + margin: 0; + padding: 0; + border: 0; + outline: 0; } body { @@ -16,9 +20,10 @@ margin-left: auto; margin-top: none; padding: 0px; + background: url(background.png) repeat-x scroll 0 0 #FFFFFF; } -pre, pre.prettyprint, pre.plainprint { +pre, code, pre.prettyprint, pre.plainprint { color: black; font-family: monospace; font-size:12px; @@ -71,6 +76,7 @@ background-color: #D2C3AF; padding: 3px; border: 1px solid #808080; + border-radius: 3px 3px 0 0; } div.header a { @@ -105,7 +111,7 @@ font-weight: bold; font-size: 150%; color: #888; - background-color: #ffffff; + background: transparent; } div.page_header span { @@ -141,7 +147,8 @@ div.page_nav { color: #ddd; background-color: #000070; - padding: 5px; + padding: 7px; + border-radius: 3px; } div.page_nav a { @@ -161,10 +168,30 @@ padding: 2px 5px 7px 5px; } -.repositories_message { - border: solid #bbb; - border-width: 0px 0px 1px; - padding: 8px; +div.search { + color:yellow; + text-align:right; + float:right; + padding:4px 4px 3px 3px; + border-left: 1px solid #8080f0; + margin: 0px; + height: 23px; +} + +div.search input { + vertical-align: top; + background: url(/com/gitblit/wicket/resources/search-icon.png) no-repeat 4px center; + color: #ddd; + background-color: #000070; + border: 1px solid transparent; + padding: 2px 2px 2px 22px; + margin: 0px; +} + +div.search input:hover, div.search input:focus { + color: white; + border-bottom: 1px solid orange; + outline: none; } div.page_path { @@ -182,14 +209,14 @@ div.bug_open, span.bug_open { padding: 2px; - background-color: #800000; + background-color: #803333; color: white; text-align: center; } div.bug_resolved, span.bug_resolved { padding: 2px; - background-color: #008000; + background-color: #408040; color: white; text-align: center; } @@ -208,6 +235,7 @@ div.diff { font-family: monospace; + overflow: auto; } div.diff.header { @@ -270,6 +298,106 @@ font-family: inherit; } +div.diff.add2 { + background-color: #DDFFDD; + font-family: inherit; +} + +div.diff.remove2 { + background-color: #FFDDDD; + font-family: inherit; +} + +div.diff table { + border-right: 1px solid #bbb; + border-bottom: 1px solid #bbb; + width: 100%; +} + +div.diff table th, div.diff table td { + margin: 0px; + padding: 0px; + font-family: monospace; +} + +div.diff table th { + background-color: #faf8dc; + border-left: 1px solid #bbb; + text-align: center; + color: #999; + padding-left: 5px; + padding-right: 5px; + width: 30px; +} + +div.diff table th.header { + background-color: #D2C3AF; + border-right: 0px; + border-bottom: 1px solid #808080; + font-family: inherit; + font-size:0.9em; + color: black; + padding: 2px; + text-align: left; +} + +div.diff table td.hunk_header { + background-color: #dAe2e5 !important; + border-bottom: 1px solid #bac2c5; + color: #555; +} + +div.diff table td { + border-left: 1px solid #bbb; + background-color: #fbfbfb; +} + +td.changeType { + width: 15px; +} + +span.addition, span.modification, span.deletion, span.rename { + border: 1px solid #888; + float: left; + height: 0.8em; + margin: 0.2em 0.5em 0 0; + overflow: hidden; + width: 0.8em; +} + +span.addition { + background-color: #bbffbb; +} + +span.modification { + background-color: #ffdd88; +} + +span.deletion { + background-color: #ff8888; +} + +span.rename { + background-color: #8888ff; +} + +div.commitLegend { + float: right; + padding: 0.4em; + vertical-align:top; + margin: 0px; +} + +div.commitLegend span { + font-size: 0.9em; + vertical-align: top; +} + +div.references { + float: right; + text-align: right; +} + a.list { text-decoration: none; color: #000000; @@ -302,11 +430,39 @@ padding: 8px; } +table.plain td.edit { + padding: 3px; +} + +table.plain td.edit input { + margin: 0px; + outline: 1px solid transparent; + border: 1px solid #ccc; + padding-left:5px; +} + +table.plain td.edit input:focus, table.plain td.edit input:hover{ + border: 1px solid orange; +} + table.pretty, table.repositories, table.comments { margin-bottom:5px; border-spacing: 0px; border-left: 1px solid #bbb; border-right: 1px solid #bbb; +} + +table.pretty, table.comments, table.repositories { + width:100%; +} + +table.pretty td.icon { + padding: 0px 0px 0px 2px; + width: 18px; +} + +table.pretty td.icon img { + vertical-align: top; } table.pretty td { @@ -318,18 +474,19 @@ line-height: 17px; } -table.repositories { - width:100%; -} - table.repositories th { background-color:#D2C3AF; padding: 4px; + border-top: 1px solid #808080; border-bottom: 1px solid #808080; } table.repositories td { - padding: 4px; + padding: 2px; +} + +table.repositories td.icon img { + vertical-align: top; } table.repositories th a { @@ -417,13 +574,13 @@ } span .tagRef, span .headRef, span .remoteRef, span .otherRef { - padding: 0px 4px; + padding: 0px 3px; margin-right:2px; font-family: sans-serif; font-size: 9px; font-weight: normal; border: 1px solid; - color: black; + color: black; } span .tagRef a span, span .headRef a span, span .remoteRef a span, span .otherRef a span { @@ -432,11 +589,11 @@ span .tagRef a, span .headRef a, span .remoteRef a, span .otherRef a { text-decoration: none; - color: black; + color: black !important; } span .tagRef a:hover, span .headRef a:hover, span .remoteRef a:hover, span .otherRef a:hover { - color: black; + color: black !important; text-decoration: underline; } -- Gitblit v1.9.1