x/compass-web
Code Issues Proposed changes

Merge "dialogue css updated"

Browse Source
This commit is contained in:
Jenkins 2014-09-04 18:07:32 +00:00 committed by Gerrit Code Review
commit 7f75d76e70
9 changed files with 59 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
v2/assets/css/style.css
View File

@ -308,7 +308,15 @@ button[disabled] {
line-height: 1.5;
padding: 4px 12px;
border-radius:7px !important;
}
.btn-cancel
{
border-color: #909AA1;
background-color: #909AA1 !important;
}
.btn-group > .btn {
border-radius: 7px !important;
}
@ -612,10 +620,25 @@ li.incomplete:before, li.incomplete .step {
.modal-header
{
/*background-color: #EFF3F8;*/
background-image: url('../img/dialogue-bar.jpg');
background-image: url('../img/dialogue-bar1.jpg');
background-size:cover;
/*background-position: 50% 50%;*/
}
.modal-warning-header
{
padding-top: 13px;
padding-bottom: 13px;
}
.modal-warning-body
{
padding-top: 30px;
padding-bottom: 20px;
}
.modal-warning-footer
{
padding-top: 8px;
padding-bottom: 8px;
}
.bkg-fullscreen
{
/*background-color:#EFF3F8;*/
@ -669,7 +692,7 @@ li.incomplete:before, li.incomplete .step {
}
.modal-footer
{
background-image: url('../img/dialogue-bar.jpg');
background-image: url('../img/dialogue-bar1.jpg');
background-size:cover;
}
.modal-title
@ -790,3 +813,23 @@ circle[depth='3'] {
circle[depth='4'] {
fill: #D15B47 !important;
}
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr.success:hover > th {
background-color:rgba(194, 221, 240, 1);
}
.table > thead > tr > td.success,
.table > tbody > tr > td.success,
.table > tfoot > tr > td.success,
.table > thead > tr > th.success,
.table > tbody > tr > th.success,
.table > tfoot > tr > th.success,
.table > thead > tr.success > td,
.table > tbody > tr.success > td,
.table > tfoot > tr.success > td,
.table > thead > tr.success > th,
.table > tbody > tr.success > th,
.table > tfoot > tr.success > th {
background-color:rgba(239, 243, 252, 0.98);
}

BIN
v2/assets/img/dialogue-bar1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
v2/assets/img/smile_face.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

2
v2/src/app/cluster/cluster-create.tpl.html
View File

@ -62,7 +62,7 @@
</form>
</div>
<div class="modal-footer">
<button class="btn btn-default" ng-click="cancel()">Cancel</button>
<button class="btn btn-default btn-cancel" ng-click="cancel()">Cancel</button>
<button class="btn btn-primary" ng-click="ok()" ng-disabled="createClusterForm.$invalid">Create</button>
</div>
</script>

4
v2/src/app/cluster/cluster-overview.tpl.html
View File

@ -143,14 +143,14 @@
</table>
<script type="text/ng-template" id="deleteHostConfirm.html">
<div class="modal-header ng-scope">
<h3 class="modal-title">Create Cluster</h3>
<h3 class="modal-title">Delete Cluster</h3>
</div>
<div class="modal-body" style="padding-top: 30px; padding-bottom: 20px;" >
Are you sure to delete
<strong>{{host.name}}</strong>?
</div>
<div class="modal-footer">
<button class="btn btn-default" ng-click="cancel()">Cancel</button>
<button class="btn btn-default btn-cancel" ng-click="cancel()">Cancel</button>
<button class="btn btn-primary" ng-click="ok()">OK</button>
</div>
</script>

3
v2/src/app/monitoring/overview.tpl.html
View File

@ -15,6 +15,9 @@
</em>
<br>
Cluster Summary
<!--<span class="pull-right">
<image src="assets/img/smile_face.png" width="20" height="20">
</span>-->
</a>
</li>
<li>

8
v2/src/app/wizard/wizard.tpl.html
View File

@ -56,13 +56,13 @@
</div>
<div>
<script type="text/ng-template" id="messagemodal.html">
<div class="modal-header">
<div class="modal-header modal-warning-header">
<h3 class="modal-title">
<i class="ace-icon fa fa-exclamation-triangle orange"></i>
Warning
</h3>
</div>
<div class="modal-body">
<div class="modal-body modal-warning-body">
<span ng-if="warning.message">
{{warning.message}}
</span>
@ -70,8 +70,8 @@
Error occured.
</span>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()">OK</button>
<div class="modal-footer modal-warning-footer">
<button class="btn btn-primary" ng-click="ok()" style="padding-left: 25px; padding-right: 25px; margin-left: 0px; margin-right: -3px;" >OK</button>
</div>
</script>
</div>

4
v2/src/common/findservers/find-new-servers.tpl.html
View File

@ -80,10 +80,10 @@
</td>
<td>
<span ng-if="switch.result == 'success'">
<i class="ace-icon fa fa-smile-o bigger-125 green"></i>
<i class="ace-icon fa fa-check bigger-125 green"></i>
</span>
<span ng-if="switch.result == 'error'">
<i class="ace-icon fa fa-frown-o bigger-125 red"></i>
<i class="ace-icon fa fa-times bigger-125 red"></i>
</span>
<span ng-if="isFindingNewServers && switch.selected && !switch.finished">
<i class="ace-icon fa fa-spinner fa-spin bigger-125 orange"></i>