From fe7c01a8bd76dff240e74bb770212911e227ba59 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 03 Feb 2012 17:24:51 -0500 Subject: [PATCH] Return to Users page after add/edit team --- resources/bootstrap.gb.css | 196 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 174 insertions(+), 22 deletions(-) diff --git a/resources/bootstrap.gb.css b/resources/bootstrap.gb.css index 2ea2b5c..7df3743 100644 --- a/resources/bootstrap.gb.css +++ b/resources/bootstrap.gb.css @@ -1,5 +1,37 @@ -.topbar{ +body, input, select { + color: #202020; +} + +ul, ol { + margin-bottom: 10px !important; +} + +hr { + margin-top: 10px; + margin-bottom: 10px; +} + +.settings h3 { + margin-bottom: 0.5em; + border-bottom: 2px solid #000080 !important; +} + +.page-header h1, .page-header h2 { + color: #0069D6; +} + +.topbar { height:40px !important; +} + +.topbar a { + color: white; + text-shadow: none; + outline: 0; +} + +.nav a:hover { + color: #abd4ff !important; } .topbar-inner,.topbar .fill{ @@ -18,6 +50,64 @@ -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; +} + +.topbar ul li:focus, .topbar .active { + background-repeat:no-repeat; + background-image: url(arrow_page.png); + background-position: center bottom; + outline: 0; +} + +.topbar .active a { + background-color: transparent !important; + outline: 0; +} + +.topbar div>ul a.menu:hover,.nav a.menu:hover,.topbar div>ul .dropdown-toggle:hover,.nav .dropdown-toggle:hover { + background: inherit; + outline: 0; +} + +.topbar div>ul li.open .menu,.nav li.open .menu,.topbar div>ul .dropdown.open .dropdown-toggle,.nav .dropdown.open .dropdown-toggle { + background: #ddd; + color: black !important; + font-weight: bold; + border-radius: 3px 3px 0px 0px; + margin-left:1px; +} + +.topbar div > ul .menu-dropdown, .nav .menu-dropdown, .topbar div > ul .dropdown-menu, .nav .dropdown-menu { + background-color: #ddd; +} + +.topbar div > ul .menu-dropdown .divider, .nav .menu-dropdown .divider, .topbar div > ul .dropdown-menu .divider, .nav .dropdown-menu .divider { + background-color: #bbb; + border-color: #eee; +} + +.topbar div > ul .menu-dropdown .selected, .nav .menu-dropdown .selected, .topbar div > ul .dropdown-menu .selected, .nav .dropdown-menu .selected { + background-image: url("bullet_blue.png"); + background-repeat: no-repeat; + background-position: left; +} + +.topbar div > ul .menu-dropdown li a, .nav .menu-dropdown li a, .topbar div > ul .dropdown-menu li a, .nav .dropdown-menu li a { + color: #555; + text-shadow: none; + outline: 0; +} + +.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a { + padding: 4px 22px; +} + +topbar div>ul .menu-dropdown li a:hover,.nav .menu-dropdown li a:hover,.topbar div>ul .dropdown-menu li a:hover,.nav .dropdown-menu li a:hover{ + background-color: #000070; + background-repeat:no-repeat; + background-image:none; + text-decoration:underline; + color: white !important; } .breadcrumb { @@ -51,6 +141,7 @@ font-size:12px; border:0px; padding: 0; + line-height: 1.35em; } table { @@ -59,6 +150,10 @@ pre.prettyprint ol { padding-left:25px; +} + +h1 small, h2 small, h3 small, h4 small, h5 small, h6 small { + color: #888; } .age0, .age1, .age2 { @@ -85,7 +180,7 @@ a.list { text-decoration: none; - color: #000000; + color: inherit; } a.list.subject { @@ -123,9 +218,30 @@ font-size: 11px; } +span.repositorySwatch { + border-radius: 3px; + padding: 2px 5px; + color: #ffffff; +} +span.repositorySwatch a { + color: inherit; +} + img.inlineIcon { padding-left: 1px; padding-right: 1px; +} + +img.overview { + float:right; + border:1px solid #CCCCCC; +} + +img.gravatar { + background-color: #ffffff; + border: 1px solid #ddd; + border-radius: 5px; + padding: 2px; } div.header, div.commitHeader, table.repositories th { @@ -197,37 +313,47 @@ -webkit-border-radius:0;-moz-border-radius:0x;border-radius:0; vertical-align: top; background: url(search-icon.png) no-repeat 4px center; - color: #ddd; background-color: transparent; border: 1px solid transparent; + outline: none; padding: 2px 2px 2px 22px; + text-shadow: none; margin: 0px; + + color: #ddd; } div.search input:hover, div.search input:focus { - background: url(search-icon.png) no-repeat 4px center; - color: white; + background-color: transparent; + border: 1px solid transparent; + padding: 2px 2px 2px 22px; + text-shadow: none; + + color: #ddd; border-bottom: 1px solid #ff9900; - outline: none; } -div.search input:focused { - background: url(search-icon.png) no-repeat 4px center; +div.search input:focus { color: white; - border-bottom: 1px solid #ff9900; - outline: none; - padding: 0 !important; } -div.commit_message { - font-family: monospace; +/* div.search input:focused { */ +/* background-color: transparent; */ +/* border: 1px solid transparent; */ +/* padding: 2px 2px 2px 22px; */ +/* text-shadow: none; */ +/* } */ + +div.login input:focus { + background-color: rgba(255, 255, 255, 0.6); + text-shadow: none; + color: white; +} + +pre.commit_message { padding: 8px; border: solid #ccc; border-width: 1px 0px 0px; -} - -div.commit_message a { - font-family: monospace; } div.bug_open, span.bug_open { @@ -435,6 +561,7 @@ } table.pretty { + border:1px solid #ddd; border-radius: 0 0 3px 3px; } @@ -459,6 +586,7 @@ } table.repositories { + border:1px solid #ddd; border-spacing: 0px; } @@ -489,8 +617,8 @@ color: black; background-color: #ddd; padding-left: 5px; - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; + border-top: 1px solid #aaa; + border-bottom: 1px solid #aaa; } table.palette { border:0; width: 0 !important; } @@ -534,8 +662,7 @@ } table.annotated { - width: 100%; - border: 1px solid #bbb; + border:1px solid #ddd; } table.annotated tr.even { @@ -543,13 +670,18 @@ } table.annotated tr.odd { - background-color: #fdfbdf; + background-color: #f5f5f5; } table.annotated td { padding: 0px; border: 0; } + +tr th a { background-position: right; padding-right: 15px; background-repeat:no-repeat; } +tr th.wicket_orderDown a {background-image: url(arrow_down.png); } +tr th.wicket_orderUp a { background-image: url(arrow_up.png); } +tr th.wicket_orderNone a { background-image: url(arrow_off.png); } tr.light { background-color: #ffffff; @@ -606,6 +738,10 @@ width: 13em; } +span.help-inline { + color: #777; +} + span.metricsTitle { font-size: 2em; } @@ -659,8 +795,24 @@ border-color: #00cc33; } +table .palette td.buttons button { + -webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px; + border: 1px solid #ccc !important; + padding: 10px; + margin-bottom: 10px; +} + +table .palette td.buttons button:hover { + border: 1px solid #0069D6 !important; +} + +table .palette td.buttons button:active { + border: 1px solid orange !important; +} + .feedbackPanelERROR, .feedbackPanelINFO { list-style: none; + line-height: 35px; } .feedbackPanelINFO span, .feedbackPanelERROR span { -- Gitblit v1.9.1