Merge pull request #2437 from mattttt/invite

Added some small styling tweaks to the modals, and adjusted some copy.
This commit is contained in:
Torkel Ödegaard
2015-08-05 10:10:57 +02:00
3 changed files with 13 additions and 5 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
</a> </a>
<h3> <h3>
Add or Invite Users Invite New Users
</h3> </h3>
<div class="modal-tagline"> <div class="modal-tagline">
+3 -4
View File
@@ -11,12 +11,11 @@
<div class="invite-box"> <div class="invite-box">
<h3> <h3>
Hi, {{greeting}}, Welcome to Grafana party. Hello {{greeting}}.
</h3> </h3>
<div class="modal-tagline"> <div class="long-tag modal-tagline">
Beer and wine in the fridge, food out back - <br> <span class="body-copy-emphasis">{{.InvitedBy}}</span> has invited you to join the <span class="highlight-word">{{contextSrv.user.orgName}}</span> organization in Grafana.</br>Please complete the following to accept your invitation and continue:
but first introduce yourself.
</div> </div>
<form name="inviteForm" class="login-form"> <form name="inviteForm" class="login-form">
+9
View File
@@ -277,6 +277,11 @@
} }
} }
.long-tag {
width: 90%;
margin: 0 auto;
}
.confirm-modal { .confirm-modal {
max-width: 500px; max-width: 500px;
@@ -365,6 +370,10 @@
color: @orange; color: @orange;
} }
.body-copy-emphasis {
color: @headingsColor;
}
.signup-page-container { .signup-page-container {
position: fixed; position: fixed;
top: 0; top: 0;