From a7317acec01cde855a9f9f3d2da3dcc49d89aa86 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 25 Oct 2013 08:39:56 -0400 Subject: [PATCH] Support for intra-Markdown linking using [[WikiLinks]] syntax (issue-324) --- src/main/resources/gitblit.css | 177 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 137 insertions(+), 40 deletions(-) diff --git a/src/main/resources/gitblit.css b/src/main/resources/gitblit.css index 6074b36..53113ac 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 { @@ -59,7 +59,10 @@ } .navbar .brand { - padding: 10px 20px; + padding: 0px 10px 0px 20px; +} +.navbar .btn-navbar { + margin-top: 10px; } .navbar .pull-right { @@ -88,20 +91,16 @@ .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; } .navbar .active a { @@ -150,10 +149,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 +182,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 +200,8 @@ color: #002060; } -.repositorynavbar .repositorynavbar-inner { +.repositorynavbar .repositorynavbar-inner { + padding-top: 2px; } .repositorynavbar ul { @@ -219,6 +237,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 +490,6 @@ border:0px; padding: 0; line-height: 1.35em; - vertical-align:top; } table { @@ -513,21 +538,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 +575,6 @@ padding-left: 5px; } -#lines a:hover { - background-color: #ffffbf; - text-decoration: none; -} - #lines tr:hover { background-color: #ffffbf; } @@ -558,7 +586,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 +820,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 +837,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 +926,9 @@ .commit_message { padding: 8px; +} + +.topborder { border: solid #ddd; border-width: 1px 0px 0px; border-radius: 0px; @@ -1102,7 +1166,7 @@ } table.pretty td.icon img { - vertical-align: top; + vertical-align: middle; } table.pretty td { @@ -1118,6 +1182,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,7 +1270,7 @@ 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; @@ -1269,6 +1361,7 @@ td.author { font-style: italic !important; + white-space: nowrap; } td.date { @@ -1414,9 +1507,13 @@ li.L7, li.L9 { background: #fafafa !important; } +div.markdown { + max-width: 900px; +} + div.markdown pre { - background-color: #F5F5F5; - border: 1px solid rgba(0, 0, 0, 0.15); + background-color: rgb(251, 251, 251); + border: 1px solid rgb(221, 221, 221); border-radius: 4px 4px 4px 4px; display: block; font-size: 12px; @@ -1433,8 +1530,8 @@ } div.markdown code { - background-color: #ffffe0; - border: 1px solid orange; + background-color: rgb(251, 251, 251); + border: 1px solid rgb(221, 221, 221); border-radius: 3px; padding: 0 0.2em; } -- Gitblit v1.9.1