Merge branch 'touchdown' of ssh://bitbucket.org/yackob03/quay into touchdown

This commit is contained in:
Jake Moshenko 2014-05-07 16:00:51 -04:00
commit 8ff411e440
4 changed files with 17 additions and 8 deletions

View file

@ -12,7 +12,7 @@
nav.navbar {
border: 0px;
border-radius: 0px;
background-image: linear-gradient(to bottom, #274766 0%,#366492 100%)
background-image: linear-gradient(to bottom, #535C66 0%,#6E8194 100%);
}
nav.navbar-default .navbar-nav>li>a {
@ -27,7 +27,7 @@ nav.navbar-default .navbar-nav>li>a {
.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:hover, .navbar-default .navbar-nav>.open>a:focus {
cursor: pointer;
background: transparent !important;
background: rgba(255, 255, 255, 0.4) !important;
color: white;
}
@ -1212,6 +1212,10 @@ i.toggle-icon:hover {
text-decoration: none;
}
.landing-page .help-block {
color: #C9C9C9;
}
.landing-page {
color: #555;
}
@ -1228,8 +1232,13 @@ i.toggle-icon:hover {
background: rgba(255, 255, 255, 0.4);
}
.landing-page .nav .open>a, .landing-page .nav .open>a:hover, .landing-page .nav .open>a:focus {
background: transparent;
.landing-page .nav .user-view {
color: #428bca !important;
font-weight: bold;
}
.landing-page .user-tool {
color: white;
}
.landing {
@ -1254,7 +1263,7 @@ i.toggle-icon:hover {
right: 0px;
background-color: #1d1d1d;
background-image: url(../img/landing-back-pattern-fast.jpg);
background-image: url(../img/landing-back.jpg);
background-repeat: no-repeat;
background-size: cover;
}

View file

@ -34,7 +34,7 @@
</li>
<li class="dropdown" ng-switch-when="false">
<a href="javascript:void(0)" class="dropdown-toggle user-dropdown" data-toggle="dropdown">
<a href="javascript:void(0)" class="dropdown-toggle user-dropdown user-view" data-toggle="dropdown">
<img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=32&d=identicon" />
{{ user.username }}
<span class="badge user-notification notification-animated"
@ -71,7 +71,7 @@
</ul>
</li>
<li ng-switch-default>
<a href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
<a class="user-view" href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
</li>
</ul>
</div><!-- /.navbar-collapse -->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 886 KiB

After

Width:  |  Height:  |  Size: 869 KiB

View file

@ -227,7 +227,7 @@
<div class="attribute">
<p><a href="https://twitter.com/quayio">@quayio</a> has awesome support. <a href="https://twitter.com/search?q=%23awesomeTool&amp;src=hash">#awesomeTool</a> <a href="https://twitter.com/search?q=%23awesomeTeam&amp;src=hash">#awesomeTeam</a></p>
<span class="info-wrap">
<span class="avatar"><img src="https://pbs.twimg.com/profile_images/441681582097563649/c1Hen0hx_bigger.jpeg"></span>
<span class="avatar"><img src="https://pbs.twimg.com/profile_images/463168904320122880/lQG69Wqk_bigger.jpeg"></span>
<span class="info">
<span class="author">Jon Morehouse (@JonMorehouse)</span>
<a href="https://twitter.com/JonMorehouse/statuses/441719785055739904">March 6, 2014</a>