Merge master into bitbucket

This commit is contained in:
Joseph Schorr 2015-04-30 15:52:08 -04:00
commit b96e35b28c
44 changed files with 695 additions and 110 deletions

View file

@ -1,3 +1,10 @@
a:active {
outline: none !important;
}
a:focus {
outline: none !important;
}
.co-options-menu .fa-gear {
color: #999;
@ -879,6 +886,7 @@
}
.cor-title-link {
font-weight: 300;
line-height: 30px;
margin-top: 22px;
margin-bottom: 10px;

View file

@ -26,3 +26,9 @@
margin-right: 8px;
vertical-align: middle;
}
.repo-panel-changes .multiselect-dropdown {
display: inline-block;
margin-left: 10px;
min-width: 200px;
}

View file

@ -67,4 +67,8 @@
.repo-panel-info-element .builds-list {
min-height: 200px;
}
.repo-panel-info-element .copy-box {
vertical-align: middle;
}

View file

@ -48,7 +48,7 @@ nav.navbar-default .navbar-nav>li>a.active {
right: 0px;
top: -50px;
z-index: 4;
height: 83px;
height: 56px;
transition: top 0.3s cubic-bezier(.23,.88,.72,.98);
background: white;
box-shadow: 0px 1px 16px #444;
@ -71,7 +71,7 @@ nav.navbar-default .navbar-nav>li>a.active {
color: #ccc;
margin-right: 10px;
position: absolute;
top: 34px;
top: 20px;
left: 14px;
}
@ -84,9 +84,9 @@ nav.navbar-default .navbar-nav>li>a.active {
}
.header-bar-element .search-box .search-box-wrapper input {
font-size: 28px;
font-size: 18px;
width: 100%;
padding: 10px;
padding: 6px;
border: 0px;
}
@ -94,7 +94,7 @@ nav.navbar-default .navbar-nav>li>a.active {
position: absolute;
left: 0px;
right: 0px;
top: -130px;
top: -106px;
z-index: 3;
transition: top 0.4s cubic-bezier(.23,.88,.72,.98), height 0.25s ease-in-out;
@ -104,7 +104,7 @@ nav.navbar-default .navbar-nav>li>a.active {
}
.header-bar-element .search-results.loading, .header-bar-element .search-results.results {
top: 130px;
top: 106px;
}
.header-bar-element .search-results.loading {
@ -153,7 +153,7 @@ nav.navbar-default .navbar-nav>li>a.active {
margin-right: 4px;
}
.header-bar-element .search-results li .description {
.header-bar-element .search-results li .result-description {
overflow: hidden;
text-overflow: ellipsis;
max-height: 24px;
@ -161,6 +161,11 @@ nav.navbar-default .navbar-nav>li>a.active {
display: inline-block;
color: #aaa;
vertical-align: middle;
margin-top: 2px;
}
.header-bar-element .search-results li .description img {
display: none;
}
.header-bar-element .search-results li .score:before {

View file

@ -94,7 +94,12 @@
white-space: nowrap;
}
.logs-view-element .side-controls .filter-input {
vertical-align: middle;
}
.logs-view-element .side-controls {
float: none !important;
text-align: right;
margin-bottom: 20px;
}

View file

@ -0,0 +1,42 @@
.multiselect-dropdown .dropdown,
.multiselect-dropdown .dropdown .btn-dropdown,
.multiselect-dropdown .dropdown .dropdown-menu {
width: 100%;
}
.multiselect-dropdown .dropdown .btn-dropdown {
text-align: left;
position: relative;
padding-right: 16px;
}
.multiselect-dropdown .dropdown .btn-dropdown .caret {
position: absolute;
top: 14px;
right: 10px;
}
.multiselect-dropdown .none {
color: #ccc;
margin-right: 10px;
}
.multiselect-dropdown .dropdown-menu {
padding: 10px;
}
.multiselect-dropdown .dropdown-menu .menu-item {
padding: 4px;
}
.multiselect-dropdown .dropdown-menu .menu-item .co-checkable-item {
margin-right: 6px;
}
.multiselect-dropdown .dropdown-menu .menu-item .menu-item-template {
vertical-align: middle;
}
.multiselect-dropdown .selected-item-template {
margin-right: 10px;
}

View file

@ -0,0 +1,35 @@
.namespace-selector-dropdown .namespace {
padding: 6px;
padding-left: 10px;
cursor: pointer;
font-size: 14px;
color: black;
}
.namespace-selector-dropdown .namespace-item {
position: relative;
}
.namespace-selector-dropdown .namespace-item .fa {
position: absolute;
right: 12px;
top: 12px;
color: #aaa;
}
.namespace-selector-dropdown .avatar {
margin-right: 4px;
}
.namespace-selector-dropdown a.namespace {
color: black !important;
}
.namespace-selector-dropdown .namespace-item.disabled .avatar {
-webkit-filter: grayscale(1);
opacity: 0.5;
}
.namespace-selector-dropdown .namespace-item .tooltip-inner {
min-width: 200px;
}

View file

@ -90,9 +90,7 @@
.new-repo-listing .description {
font-size: 0.91em;
padding-top: 13px;
}
.new-repo-listing .description {
padding-left: 11px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;

View file

@ -50,9 +50,7 @@
}
@media (max-width: 767px) {
.repository-view .repo-star {
position: absolute;
top: 16px;
left: -16px;
.repository-view .cor-title-content {
padding-top: 8px;
}
}

View file

@ -548,38 +548,6 @@ i.toggle-icon:hover {
float: right;
}
.namespace-selector-dropdown .namespace {
padding: 6px;
padding-left: 10px;
cursor: pointer;
font-size: 14px;
color: black;
}
.namespace-selector-dropdown .namespace-item {
position: relative;
}
.namespace-selector-dropdown .namespace-item .fa {
position: absolute;
right: 12px;
top: 12px;
color: #aaa;
}
.namespace-selector-dropdown a.namespace {
color: black !important;
}
.namespace-selector-dropdown .namespace-item.disabled img {
-webkit-filter: grayscale(1);
opacity: 0.5;
}
.namespace-selector-dropdown .namespace-item .tooltip-inner {
min-width: 200px;
}
.notification-primary {
background: #428bca;
color: white;