From 94e12c168f5eec300fd23d0de25c7dc93a96c429 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 03 Mar 2014 17:51:21 -0500 Subject: [PATCH] Eliminate Gravatar profile linking and improve api --- src/main/resources/gitblit.css | 303 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 257 insertions(+), 46 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index d10f380..cd5c57b 100644 --- a/src/main/resources/gitblit.css +++ b/src/main/resources/gitblit.css @@ -1,6 +1,6 @@ body { - /* 50px to start the container 10px below the navbar */ - padding-top: 60px; + /* 47px is the header height */ + padding-top: 47px; } footer { @@ -34,6 +34,10 @@ vertical-align: text-bottom; } +a.bugtraq { + font-weight: bold; +} + [class^="icon-"], [class*=" icon-"] i { /* override for a links that look like bootstrap buttons */ vertical-align: text-bottom; @@ -60,6 +64,9 @@ .navbar .brand { padding: 0px 10px 0px 20px; +} +.navbar .btn-navbar { + margin-top: 10px; } .navbar .pull-right { @@ -88,20 +95,26 @@ .navbar-inner { background-color: #002060; - background-repeat: none; background-image: none; - -webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1); - border-bottom: 2px solid #ff9900 !important; + box-shadow: none; + border-bottom: 1px solid #002060 !important; } .navbar ul li:focus, .navbar .active { - background-repeat:no-repeat; - background-image: url(arrow_page.png); - background-position: center bottom; - outline: 0; - padding-bottom:3px; + outline: 0; + padding-bottom: 1px; + border-bottom: 3px solid #ff9900; + margin-bottom: -1px; +} + +ul.nav { + border-color: #ccc; +} + +.nav-tabs > .active > a, +.nav-tabs > .active > a:hover { + border: 1px solid #ccc; + border-bottom-color: transparent; } .navbar .active a { @@ -150,10 +163,28 @@ vertical-align: middle; } +div.reflog td.header { + padding-left: 7px; + vertical-align:middle; +} + +div.reflog td.commits { + padding-left: 7px; +} + +div.reflog tr.commit td { + vertical-align:top; + padding-left: 5px; +} + +div.reflog tr.commit img { + max-width: none; +} + div.dashboardTitle { font-size: 1.75em; - padding-bottom: 5px; - margin-bottom: 10px; + padding: 10px 0px 5px 0px; + margin: 10px 0px; border-bottom: 1px solid #ccc; } @@ -165,12 +196,12 @@ .repositorynavbar { background-color: #fbfbfb; border-bottom: 1px solid #ccc; - margin-top: -8px; margin-bottom: 10px; } .repositorynavbar .title { line-height: 32px; + padding: 5px 0px; } .repositorynavbar .repository { @@ -183,7 +214,8 @@ color: #002060; } -.repositorynavbar .repositorynavbar-inner { +.repositorynavbar .repositorynavbar-inner { + padding-top: 2px; } .repositorynavbar ul { @@ -219,6 +251,14 @@ .repositorynavbar ul li a:hover { background-color: inherit; text-decoration: underline; +} + +@media (max-width: 767px) { + .repositorynavbar { + margin-right: -20px; + margin-left: -20px; + padding: 0px 5px; + } } .btn-appmenu { @@ -464,7 +504,6 @@ border:0px; padding: 0; line-height: 1.35em; - vertical-align:top; } table { @@ -479,6 +518,18 @@ th { vertical-align: middle; text-align: left; +} + +div.featureWelcome { + padding: 15px; + background-color: #fbfbfb; + border: 1px solid #ccc; + border-radius: 5px; +} + +div.featureWelcome div.icon { + color: #ccc; + font-size: 144px; } div.sourceview { @@ -513,21 +564,29 @@ } /* CSS trick to workaround #link topOfWindow offset problem */ -#nums .num { - border-top: 160px solid transparent; - margin-top: -160px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; +#nums .jump { + border-top: 50px solid transparent; + margin-top: -50px; + background: url(arrow_line.png) no-repeat scroll bottom right transparent; +} +#nums .jump:target { + border-left: 7px solid transparent; + margin-right: 3px; +} + +#lines .line { + padding-left: 5px; color: #888; } -#nums span:target { +#nums a:hover { background-color: #ffffbf; color: black; font-weight: bold; + border-top: 1px solid red; border-bottom: 1px solid red; + text-decoration: none; } #lines table { @@ -542,11 +601,6 @@ padding-left: 5px; } -#lines a:hover { - background-color: #ffffbf; - text-decoration: none; -} - #lines tr:hover { background-color: #ffffbf; } @@ -558,7 +612,44 @@ background-color: #fafafa; } +.diffstat { + padding: 1px 5px; + font-size: smaller; + background-color: #f5f5f5; + border: 1px solid #ccc; + color: #ccc; + font-weight:bold; +} +.diffstat-inline { + font-size: smaller; + color: #ccc; + font-weight:bold; +} + +.diffstat .diffstat-total { + color: black; + border-right: 1px solid #ccc; + padding-right: 4px; + margin-right: 2px; +} + +.diffstat-inline .diffstat-total { + color: #999; + padding-right: 2px; +} + +.diffstat-segments { + vertical-align: baseline; +} + +.diffstat-insert { + color: #629E62; +} + +.diffstat-delete { + color: #B9583B; +} h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { color: #888; @@ -755,7 +846,6 @@ padding: 3px; border: 1px solid #ddd; border-bottom: 0; - border-radius: 3px 3px 0 0; font-weight: bold; font-family: Helvetica,arial,freesans,clean,sans-serif; } @@ -773,9 +863,6 @@ margin:0 0 2px; padding:7px 14px; border:1px solid #ddd; - border-radius: 3px; - -webkit-border-radius:3px; - -moz-border-radius:3px;border-radius:3px; } div.header a, div.commitHeader a { @@ -865,6 +952,9 @@ .commit_message { padding: 8px; +} + +.topborder { border: solid #ddd; border-width: 1px 0px 0px; border-radius: 0px; @@ -1102,7 +1192,7 @@ } table.pretty td.icon img { - vertical-align: top; + vertical-align: middle; } table.pretty td { @@ -1118,6 +1208,34 @@ width: 100%; margin-left: 4px !important; margin-bottom: 0px !important; +} + +table.pretty td.graph { + border-right: 1px solid #ddd; + border-bottom: 1px solid #ddd; + padding: 0px; + /*width: 1px;*/ +} + +table.pretty tr.commit { + /* must match branch graph servlet row height definition */ + height: 24px; +} + +@media (min-width: 979px) { + td.ellipsize { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } +} + +@media (max-width: 979px) { + td.ellipsize { + text-overflow: inherit; + overflow: visible; + white-space: wrap; + } } table.comments td { @@ -1178,13 +1296,18 @@ font-weight: bold; background-color: #ffffff !important; padding-top: 0px !important; - margin-bottom: 0 !imporant; + margin-bottom: 0 !important; border: 0 !important; border-radius: 0 !important; line-height: 1em; } table.palette td.pane { padding: 0px; + width: 250px !important; +} + +table.palette td.pane select { + width: 250px !important; } table.gitnotes { @@ -1216,6 +1339,7 @@ } table.annotated { + width: 100%; border:1px solid #ddd; } @@ -1230,6 +1354,24 @@ table.annotated td { padding: 0px; border: 0; +} + +table.annotated td.lineCommit { + padding-left: 5px; + padding-right: 5px; +} + +table.annotated td.lineNumber { + border-right: 1px solid #ddd; + border-left: 1px solid #ddd; + padding-left: 5px; + padding-right: 5px; + text-align: right; +} + +table.annotated td.lineContent { + padding-left: 5px; + font: monospace; } table.activity { @@ -1269,6 +1411,7 @@ td.author { font-style: italic !important; + white-space: nowrap; } td.date { @@ -1276,7 +1419,7 @@ white-space: nowrap; } -span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1 { +span.sha1, span.sha1 a, span.sha1 a span, .commit_message, span.shortsha1, td.sha1 { font-family: consolas, monospace; font-size: 13px; } @@ -1414,14 +1557,67 @@ li.L7, li.L9 { background: #fafafa !important; } +div.docs { + max-width: 880px; +} + +div.docs ul.nav { + margin-bottom: 0px !important; +} + +div.docs div.docnav { + display: inline-block; + padding: 6px 5px 6px 5px; + border-left: 1px solid #ccc; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + border-radius: 0px 0px 3px 3px; + background-color: #ECF1F4; + color: #666; + text-align: left; + margin-top: -10px; +} + +div.docs .content { + margin-top: 10px; +} + +div.docs div.markdown { + margin-top: 10px; +} + +div.markdown { + line-height: 1.4; +} + +div.markdown h1 { + padding: 0px 0px 4px; + border-bottom: 1px solid rgb(221, 221, 221); + margin: 4px 0px 8px; +} + +div.markdown h2 { + padding: 4px 0px; + border-bottom: 1px solid rgb(238, 238, 238); + margin: 4px 0px 8px; +} + +div.markdown h3 { + padding: 8px 0px 4px; +} + +div.markdown li { + line-height: 1.4; +} + div.markdown pre { - background-color: #F5F5F5; - border: 1px solid rgba(0, 0, 0, 0.15); + background-color: rgb(250, 250, 250); + border: 1px solid rgb(221, 221, 221); border-radius: 4px 4px 4px 4px; display: block; font-size: 12px; line-height: 18px; - margin: 0 0 9px; + margin: 9px 0; padding: 8.5px; white-space: pre-wrap; } @@ -1433,18 +1629,33 @@ } div.markdown code { - background-color: #ffffe0; - border: 1px solid orange; + background-color: rgb(250, 250, 250); + border: 1px solid rgb(221, 221, 221); border-radius: 3px; - padding: 0 0.2em; + padding: 0 0.4em; } -div.markdown a { - text-decoration: underline; +div.markdown table { + max-width: 100%; + background-color: transparent; + border-collapse: collapse; + border-spacing: 0px; + font-size: inherit; + border-width: 0px 1px 1px 0px; + border-style: solid solid solid none; + border-color: rgb(221, 221, 221); + border-image: none; + border-collapse: separate; + margin: 10px 0px 20px; } -div.markdown em { - color: #b05000; +div.markdown table td, div.markdown table th { + padding: 8px; + line-height: 20px; + text-align: left; + vertical-align: top; + border-top: 1px solid rgb(221, 221, 221); + border-left: 1px solid rgb(221, 221, 221); } div.markdown table.text th, div.markdown table.text td { -- Gitblit v1.9.1