Skip to content

Commit

Permalink
Merge #38713
Browse files Browse the repository at this point in the history
38713: ui: copy update for Login Page r=celiala a=celiala

This is follow-up copy fixes from #38140:

* In #38140 [Version on Login Page], a helpful blurb was removed. This PR puts helpful blurb back into login page.

Login Page, Before:
<img width="500" alt="Login Before" src="https://user-images.githubusercontent.com/3051672/60745990-a66bf500-9f4a-11e9-8bdc-d950f3c1ce8a.png">

Login Page, After:
<img width="500" alt="Login After" src="https://user-images.githubusercontent.com/3051672/60745993-a7048b80-9f4a-11e9-9932-4fab7d5a60c3.png">


Co-authored-by: Celia La <celiala456@gmail.com>
  • Loading branch information
craig[bot] and celiala committed Jul 9, 2019
2 parents dae4310 + a6f6d54 commit 813b014
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/ui/src/views/login/loginPage.styl
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
.logo
height 32px
position relative
margin-bottom 80px
margin-bottom 74px

.input-text
width 100%
Expand Down Expand Up @@ -98,7 +98,7 @@
margin 12px 0

.info-box
margin-top 36px
margin-top 0px

.login-note-box
&__sql-command
Expand Down
4 changes: 4 additions & 0 deletions pkg/ui/src/views/login/loginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ class LoginPage extends React.Component<LoginPageProps & WithRouterProps, LoginP
<img className="logo" alt="CockroachDB" src={logo} />
<InfoBox>
<h4 className="login-note-box__heading">Note:</h4>
<p>
A user with a password is required to log in to the UI
on secure clusters.
</p>
<p className="login-note-box__blurb">
Create a user with this SQL command:
</p>
Expand Down

0 comments on commit 813b014

Please sign in to comment.