css: prevent new UI css from breaking old css

This also breaks css out into directives.
This commit is contained in:
Jimmy Zelinskie 2015-02-24 14:43:04 -05:00
parent e082b61b26
commit 758158391c
4 changed files with 160 additions and 106 deletions

View file

@ -0,0 +1,131 @@
.repo-panel-title-row .repo-circle {
color: #999;
display: inline-block;
position: relative;
background: #eee;
padding: 4px;
border-radius: 50%;
display: inline-block;
width: 46px;
height: 46px;
}
.repo-panel-title-row .repo-circle .fa-hdd-o {
font-size: 1.7em;
}
.repo-panel-title-row .repo-circle.no-background .fa-hdd-o {
font-size: 1.7em;
}
.repo-panel-title-row .repo-circle .fa-lock {
width: 16px;
height: 16px;
line-height: 16px;
font-size: 12px !important;
}
.repo-panel-title-row .repo-circle.no-background .fa-lock {
bottom: 5px;
right: 2px;
}
.empty-primary-msg {
font-size: 18px;
margin-bottom: 30px;
text-align: center;
}
.empty-secondary-msg {
font-size: 14px;
color: #999;
text-align: center;
margin-bottom: 10px;
}
.repo-list-title {
margin-bottom: 30px;
margin-top: 10px;
line-height: 24px;
font-size: 18px;
}
.repo-list-title a {
font-size: 18px;
margin: 0;
display: inline-block;
}
.repo-list-title i {
display: inline-block;
margin-right: 5px;
}
.repo-list-title .starred {
color: #ffba6d;
}
.repo-panel {
padding: 20px;
border: 1px solid #eee;
margin-bottom: 30px;
}
.repo-panel-title-row {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.panel-body.starred {
background: -moz-linear-gradient(top, rgba(255,240,188,1) 0%, rgba(255,255,255,0.5) 5%, rgba(255,255,255,0.49) 51%, rgba(255,255,255,0) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,240,188,1)), color-stop(5%,rgba(255,255,255,0.5)), color-stop(51%,rgba(255,255,255,0.49)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* W3C */
}
.star-icon {
color: #ddd;
display: block;
font-size: 1.2em;
text-align: right;
line-height: 2em;
}
.star-icon:hover {
cursor: pointer;
cursor: hand;
}
.star-icon.starred {
color: #ffba6d;
}
.new-repo-listing {
display: block;
border-bottom: 1px solid #eee;
font-size: 14px;
line-height: normal;
padding-bottom: 30px;
}
.new-repo-listing .description {
font-size: 0.91em;
padding-top: 13px;
}
.new-repo-listing .description {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.repo-panel-repo-link {
font-size: 1.2em;
}
.repo-list-grid {
padding-top: 10px;
}

View file

@ -0,0 +1,7 @@
.repo-list-sidebar .button-bar-right {
margin-bottom: 20px;
}
.repo-list-sidebar .panel .panel-body .fa-gear {
float: right;
}

View file

@ -909,8 +909,6 @@ i.toggle-icon:hover {
} }
.repo-circle { .repo-circle {
color: #999;
display: inline-block;
position: relative; position: relative;
background: #eee; background: #eee;
padding: 4px; padding: 4px;
@ -918,6 +916,7 @@ i.toggle-icon:hover {
display: inline-block; display: inline-block;
width: 46px; width: 46px;
height: 46px; height: 46px;
text-align: center;
} }
.repo-circle.no-background { .repo-circle.no-background {
@ -928,11 +927,11 @@ i.toggle-icon:hover {
} }
.repo-circle .fa-hdd-o { .repo-circle .fa-hdd-o {
font-size: 1.7em; font-size: 36px;
} }
.repo-circle.no-background .fa-hdd-o { .repo-circle.no-background .fa-hdd-o {
font-size: 1.7em; font-size: 30px;
} }
.repo-circle .fa-lock { .repo-circle .fa-lock {
@ -940,18 +939,18 @@ i.toggle-icon:hover {
bottom: -2px; bottom: -2px;
right: -4px; right: -4px;
background: rgb(253, 191, 191); background: rgb(253, 191, 191);
width: 16px; width: 20px;
display: inline-block; display: inline-block;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
height: 16px; height: 20px;
line-height: 16px; line-height: 21px;
font-size: 12px !important; font-size: 16px !important;
} }
.repo-circle.no-background .fa-lock { .repo-circle.no-background .fa-lock {
bottom: 5px; bottom: -2px;
right: 7px; right: -6px;
color: #444; color: #444;
} }
@ -2457,49 +2456,10 @@ p.editable:hover i {
cursor: pointer; cursor: pointer;
} }
.empty-primary-msg {
font-size: 18px;
margin-bottom: 30px;
text-align: center;
}
.empty-secondary-msg {
font-size: 14px;
color: #999;
text-align: center;
margin-bottom: 10px;
}
.repo-list { .repo-list {
margin-bottom: 40px; margin-bottom: 40px;
} }
.repo-list-title {
margin-bottom: 30px;
margin-top: 10px;
line-height: 24px;
font-size: 18px;
}
.repo-list-title a {
font-size: 18px;
margin: 0;
display: inline-block;
}
.repo-list-title i {
display: inline-block;
margin-right: 5px;
}
.repo-list-sidebar .button-bar-right {
margin-bottom: 20px;
}
.repo-list-sidebar .panel .panel-body .fa-gear {
float: right;
}
.repo-list .button-bar-right { .repo-list .button-bar-right {
float: right; float: right;
} }
@ -2519,47 +2479,11 @@ p.editable:hover i {
margin-right: 10px; margin-right: 10px;
} }
.repo-panel {
padding: 20px;
border: 1px solid #eee;
margin-bottom: 30px;
}
.repo-panel-title-row {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.panel-body.starred {
background: -moz-linear-gradient(top, rgba(255,240,188,1) 0%, rgba(255,255,255,0.5) 5%, rgba(255,255,255,0.49) 51%, rgba(255,255,255,0) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,240,188,1)), color-stop(5%,rgba(255,255,255,0.5)), color-stop(51%,rgba(255,255,255,0.49)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(255,240,188,1) 0%,rgba(255,255,255,0.5) 5%,rgba(255,255,255,0.49) 51%,rgba(255,255,255,0) 100%); /* W3C */
}
.star-icon {
color: #ddd;
display: block;
font-size: 1.2em;
text-align: right;
line-height: 2em;
}
.star-icon:hover {
cursor: pointer;
cursor: hand;
}
.star-icon.starred {
color: #ffba6d;
}
.repo-listing { .repo-listing {
display: block; display: block;
margin-bottom: 20px;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 10px;
font-size: 14px; font-size: 14px;
line-height: normal; line-height: normal;
} }
@ -2573,19 +2497,18 @@ p.editable:hover i {
margin-bottom: 0px; margin-bottom: 0px;
} }
.repo-panel-repo-link { .repo-listing a {
font-size: 1.2em; font-size: 1.5em;
}
.repo-listing i {
color: #999;
display: inline-block;
margin-right: 6px;
} }
.repo-listing .description { .repo-listing .description {
font-size: 0.91em; padding-left: 44px;
padding-top: 13px;
}
.repo-listing .description p:last-child {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} }

View file

@ -1,9 +1,9 @@
<div class="resource-view" resource="repositories"> <div class="resource-view" resource="repositories">
<div class="repo-listing"> <div class="new-repo-listing">
<!-- Titles --> <!-- Titles -->
<div ng-if="starred" class="repo-list-title"> <div ng-if="starred" class="repo-list-title">
<i class="fa fa-star starred" style="color:#ffba6d"></i> <i class="fa fa-star starred"></i>
Starred Starred
</div> </div>
<div ng-if="!starred && user.username == namespace.username" class="repo-list-title"> <div ng-if="!starred && user.username == namespace.username" class="repo-list-title">
@ -50,13 +50,6 @@
<div class="empty-primary-msg">This namespace doesn't have any viewable repositories.</div> <div class="empty-primary-msg">This namespace doesn't have any viewable repositories.</div>
<div class="empty-secondary-msg">Either no repositories exist yet or you may not have permission to view any. If you have permission, try <a href="/new">creating a new repository</a>.</div> <div class="empty-secondary-msg">Either no repositories exist yet or you may not have permission to view any. If you have permission, try <a href="/new">creating a new repository</a>.</div>
</div> </div>
<!-- HR -->
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<hr>
</div>
</div>
</div> </div>
</div> </div>