Skip to content
This repository was archived by the owner on Feb 5, 2020. It is now read-only.

Commit 321237e

Browse files
authored
Merge pull request #635 from ggreer/fix-link
Fix link
2 parents 5e41140 + 683c5e8 commit 321237e

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

installer/assets/frontend/lib/mochi/mochi.css

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,11 @@ ul > li {
556556
pointer-events: none;
557557
opacity: .65; }
558558

559+
.btn-flat {
560+
box-shadow: none !important;
561+
text-shadow: none !important;
562+
}
563+
559564
.btn-default {
560565
color: #666;
561566
background-color: #fff;
@@ -583,19 +588,26 @@ ul > li {
583588
.btn-primary.disabled, .btn-primary.disabled:hover, .btn-primary.disabled:focus, .btn-primary.disabled.focus, .btn-primary.disabled:active, .btn-primary.disabled.active, .btn-primary[disabled], .btn-primary[disabled]:hover, .btn-primary[disabled]:focus, .btn-primary[disabled].focus, .btn-primary[disabled]:active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary, fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:focus, fieldset[disabled] .btn-primary.focus, fieldset[disabled] .btn-primary:active, fieldset[disabled] .btn-primary.active {
584589
background-color: #f04c5c; }
585590

586-
.btn-flat {
587-
box-shadow: none !important;
588-
text-shadow: none !important;
589-
}
591+
.btn-info {
592+
color: #52A3D9;
593+
background-color: #fff;
594+
border: 1px solid #52A3D9; }
595+
.btn-info:hover, .btn-info:focus, .btn-info.focus, .btn-info:active, .btn-info.active {
596+
color: #fff;
597+
background-color: #52A3D9; }
598+
.btn-info:active, .btn-info.active {
599+
background-image: none; }
600+
.btn-info.disabled, .btn-info.disabled:hover, .btn-info.disabled:focus, .btn-info.disabled.focus, .btn-info.disabled:active, .btn-info.disabled.active, .btn-info[disabled], .btn-info[disabled]:hover, .btn-info[disabled]:focus, .btn-info[disabled].focus, .btn-info[disabled]:active, .btn-info[disabled].active, fieldset[disabled] .btn-info, fieldset[disabled] .btn-info:hover, fieldset[disabled] .btn-info:focus, fieldset[disabled] .btn-info.focus, fieldset[disabled] .btn-info:active, fieldset[disabled] .btn-info.active {
601+
background-color: #fff; }
590602

591603
.btn-warning {
592604
color: #DC415E;
593605
background-color: #fff;
594606
border: solid 1px #DC415E;
595607
text-shadow: 0 0 3px rgba(0, 0, 0, 0.25); }
596608
.btn-warning:hover, .btn-warning:focus, .btn-warning.focus, .btn-warning:active, .btn-warning.active {
597-
color: #DC415E;
598-
background-color: #e6e6e6; }
609+
color: #fff;
610+
background-color: #DC415E; }
599611
.btn-warning:active, .btn-warning.active {
600612
background-image: none; }
601613
.btn-warning.disabled, .btn-warning.disabled:hover, .btn-warning.disabled:focus, .btn-warning.disabled.focus, .btn-warning.disabled:active, .btn-warning.disabled.active, .btn-warning[disabled], .btn-warning[disabled]:hover, .btn-warning[disabled]:focus, .btn-warning[disabled].focus, .btn-warning[disabled]:active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning, fieldset[disabled] .btn-warning:hover, fieldset[disabled] .btn-warning:focus, fieldset[disabled] .btn-warning.focus, fieldset[disabled] .btn-warning:active, fieldset[disabled] .btn-warning.active {

installer/frontend/components/dry-run.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const DryRun = () => <div className="row">
77
<div className="form-group">
88
Your cluster assets have been created. You can download these assets and customize underlying infrastructure as needed.
99
Note: changes to Kubernetes manifests or Tectonic components run in the cluster are not supported.
10-
&nbsp;<a href="https://coreos.com/tectonic/docs/latest/install/aws/manual-boot"
10+
&nbsp;<a href="https://coreos.com/tectonic/docs/latest/install/aws/manual-boot.html"
1111
onClick={TectonicGA.sendDocsEvent} target="_blank">
1212
Read more here.&nbsp;&nbsp;<i className="fa fa-external-link" />
1313
</a>

installer/frontend/components/tf-poweron.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,14 @@ class TF_PowerOn extends React.Component {
129129
</div>;
130130
}
131131

132+
const tfButtonClasses = classNames("btn btn-flat", {disabled: terraformRunning, 'btn-warning': tfError, 'btn-info': !tfError});
132133
const tfButtons = <div className="row">
133134
<div className="col-xs-12">
134-
<button className={classNames("btn btn-warning btn-flat", {disabled: terraformRunning})} onClick={() => this.destroy()}>
135-
Destroy Cluster
135+
<button className={tfButtonClasses} onClick={() => this.destroy()}>
136+
<i className="fa fa-trash"></i>&nbsp;&nbsp;Destroy Cluster
136137
</button>&nbsp;&nbsp;&nbsp;&nbsp;
137-
<button className={classNames("btn btn-warning btn-flat", {disabled: terraformRunning})} onClick={() => this.retry()}>
138-
Retry Terraform Apply
138+
<button className={tfButtonClasses} onClick={() => this.retry()}>
139+
<i className="fa fa-exclamation-triangle"></i>&nbsp;&nbsp;Retry Terraform Apply
139140
</button>
140141
</div>
141142
</div>;

0 commit comments

Comments
 (0)