Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Commit

Permalink
Merge pull request #282 from HospitalRun/login-updates
Browse files Browse the repository at this point in the history 
Login screen updates
  • Loading branch information
Joel Glovier committed Jan 23, 2016
2 parents 3cfbbbf + 9583a4d commit 7856a6b
Show file tree
Hide file tree
Showing 5 changed files with 208 additions and 118 deletions.
15 changes: 6 additions & 9 deletions app/styles/_bootstrap-theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,9 @@ fieldset[disabled] .btn-primary.active {
}

.alert {
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
border: none;
padding: 12px 12px;
border-radius: 3px;
}

.alert-success {
Expand Down Expand Up @@ -304,11 +304,8 @@ fieldset[disabled] .btn-primary.active {
}

.alert-danger {
background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
background-repeat: repeat-x;
border-color: #dca7a7;
background-color: $red_light;
color: $red_dark;
}

.progress {
Expand Down Expand Up @@ -444,4 +441,4 @@ fieldset[disabled] .btn-primary.active {

.radio input[type="radio"], .radio-inline input[type="radio"], .checkbox input[type="checkbox"], .checkbox-inline input[type="checkbox"] {
margin-left: -18px;
}
}
44 changes: 26 additions & 18 deletions app/styles/_sign_in_screen.scss
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
.signin-logo {
max-width: 200px;
margin: 40px auto;
}

.form-signin {
max-width: 300px;
margin: 0 auto;
position: absolute;
transform: translate(-50%, -50%);
top: 50%;
transform: translate(-50%, 0);
top: 0;
left: 50%;
background: $blue_light3;
padding: 20px;
border-radius: 10px;

.form-signin-heading {
font-weight: 300;
text-transform: uppercase;
letter-spacing: 2px;
text-align: center;
margin: 5px 0 26px;
color: $navy_drk2;
}

.form-signin-alert {
margin-top: 15px;
margin-bottom: 0;
}
.alert { margin-bottom: 15px; }

input { background: white; }
}

.signin-contents {
background: $blue_light3;
width: 300px;
padding: 20px;
border-radius: 10px;
}

.form-signin-heading {
font-weight: 300;
text-transform: uppercase;
letter-spacing: 2px;
text-align: center;
margin: 0 0 20px;
color: $navy_drk2;
font-size: 24px;
}
.form-signin-heading::first-letter { text-transform: uppercase; }
79 changes: 79 additions & 0 deletions app/templates/components/logo-dark-svg.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<svg class="logo-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 200 31.36" enable-background="new 0 0 200 31.36" xml:space="preserve">
<g>
<g>
<path fill="#273647" d="M51.29,25.59h-4.67V14.71H34.95v10.89h-4.67V0.69h4.67V11.4h11.68V0.69h4.67V25.59z"/>
<path fill="#273647" d="M61.71,7.65c1.32,0,2.52,0.21,3.59,0.64c1.07,0.42,1.99,1.03,2.75,1.81c0.76,0.78,1.34,1.73,1.76,2.86
c0.41,1.13,0.62,2.38,0.62,3.77c0,1.4-0.21,2.66-0.62,3.79c-0.41,1.13-1,2.08-1.76,2.88c-0.76,0.79-1.67,1.4-2.75,1.83
c-1.07,0.42-2.27,0.64-3.59,0.64c-1.32,0-2.52-0.21-3.6-0.64c-1.08-0.42-2-1.03-2.76-1.83c-0.76-0.79-1.36-1.75-1.77-2.88
c-0.42-1.13-0.63-2.39-0.63-3.79c0-1.39,0.21-2.65,0.63-3.77c0.42-1.13,1.01-2.08,1.77-2.86c0.76-0.78,1.68-1.38,2.76-1.81
C59.19,7.86,60.39,7.65,61.71,7.65z M61.71,22.58c1.47,0,2.56-0.49,3.26-1.48c0.71-0.99,1.06-2.43,1.06-4.34s-0.35-3.36-1.06-4.36
c-0.71-1-1.79-1.5-3.26-1.5c-1.49,0-2.6,0.5-3.31,1.51c-0.71,1-1.07,2.45-1.07,4.35c0,1.89,0.36,3.34,1.07,4.33
C59.11,22.08,60.21,22.58,61.71,22.58z"/>
<path fill="#273647" d="M83.4,11.37c-0.11,0.18-0.24,0.31-0.36,0.39c-0.13,0.07-0.29,0.11-0.48,0.11c-0.21,0-0.43-0.06-0.66-0.17
c-0.24-0.11-0.51-0.24-0.82-0.39c-0.31-0.14-0.66-0.27-1.06-0.39c-0.4-0.11-0.86-0.17-1.4-0.17c-0.84,0-1.5,0.18-1.98,0.53
c-0.48,0.36-0.72,0.82-0.72,1.39c0,0.38,0.12,0.7,0.37,0.96c0.25,0.26,0.57,0.49,0.98,0.68c0.41,0.2,0.87,0.37,1.39,0.53
c0.52,0.15,1.04,0.32,1.58,0.51c0.54,0.18,1.07,0.39,1.58,0.63c0.52,0.24,0.98,0.53,1.39,0.9c0.41,0.36,0.73,0.8,0.98,1.3
c0.25,0.51,0.37,1.11,0.37,1.83c0,0.85-0.16,1.63-0.47,2.35c-0.31,0.72-0.76,1.34-1.36,1.86c-0.6,0.52-1.33,0.93-2.21,1.22
c-0.88,0.29-1.89,0.44-3.02,0.44c-0.61,0-1.2-0.05-1.78-0.16c-0.58-0.11-1.14-0.26-1.67-0.46c-0.53-0.2-1.03-0.42-1.48-0.69
c-0.45-0.26-0.85-0.55-1.2-0.86l0.98-1.62c0.13-0.2,0.28-0.34,0.45-0.45c0.17-0.1,0.39-0.15,0.65-0.15c0.26,0,0.51,0.07,0.75,0.22
c0.24,0.15,0.51,0.31,0.82,0.48c0.31,0.17,0.67,0.33,1.09,0.48c0.42,0.15,0.95,0.22,1.59,0.22c0.51,0,0.94-0.06,1.3-0.18
c0.36-0.12,0.66-0.28,0.9-0.47c0.24-0.2,0.41-0.42,0.52-0.68c0.11-0.26,0.16-0.53,0.16-0.8c0-0.41-0.12-0.75-0.37-1.02
c-0.25-0.26-0.57-0.49-0.98-0.69c-0.41-0.2-0.87-0.37-1.4-0.53c-0.52-0.15-1.06-0.32-1.6-0.51c-0.55-0.18-1.08-0.4-1.6-0.65
c-0.52-0.25-0.99-0.56-1.4-0.94c-0.41-0.38-0.73-0.84-0.98-1.4c-0.25-0.55-0.37-1.22-0.37-2c0-0.72,0.14-1.41,0.43-2.07
c0.29-0.65,0.71-1.23,1.27-1.71c0.56-0.49,1.25-0.88,2.08-1.17c0.83-0.29,1.79-0.44,2.88-0.44c1.22,0,2.33,0.2,3.32,0.6
c1,0.4,1.83,0.93,2.5,1.58L83.4,11.37z"/>
<path fill="#273647" d="M86.58,31.36V7.92h2.6c0.28,0,0.51,0.06,0.71,0.19c0.2,0.13,0.32,0.32,0.38,0.59l0.34,1.64
c0.71-0.82,1.53-1.48,2.45-1.98c0.92-0.51,2.01-0.76,3.25-0.76c0.96,0,1.85,0.2,2.64,0.6c0.8,0.4,1.49,0.98,2.07,1.75
c0.58,0.76,1.03,1.71,1.34,2.82c0.32,1.12,0.47,2.4,0.47,3.85c0,1.32-0.18,2.54-0.53,3.67c-0.36,1.13-0.86,2.1-1.52,2.93
c-0.66,0.83-1.46,1.47-2.39,1.94s-1.98,0.7-3.14,0.7c-1,0-1.85-0.15-2.54-0.46c-0.69-0.3-1.32-0.73-1.87-1.27v7.23H86.58z
M94.85,10.95c-0.88,0-1.64,0.19-2.26,0.56c-0.63,0.37-1.21,0.9-1.75,1.58v7.92c0.48,0.6,1.01,1.01,1.58,1.25
c0.57,0.24,1.18,0.35,1.83,0.35c0.64,0,1.23-0.12,1.75-0.36c0.52-0.24,0.96-0.61,1.33-1.1c0.36-0.49,0.64-1.12,0.84-1.87
c0.2-0.75,0.29-1.64,0.29-2.66c0-1.03-0.08-1.91-0.25-2.63c-0.17-0.72-0.41-1.3-0.71-1.75c-0.31-0.45-0.69-0.78-1.13-0.98
C95.92,11.06,95.41,10.95,94.85,10.95z"/>
<path fill="#273647" d="M109.85,2.77c0,0.37-0.07,0.71-0.22,1.03c-0.15,0.32-0.35,0.6-0.59,0.84c-0.25,0.24-0.54,0.43-0.87,0.58
c-0.33,0.14-0.69,0.22-1.07,0.22c-0.37,0-0.71-0.07-1.04-0.22c-0.33-0.14-0.61-0.34-0.85-0.58c-0.24-0.24-0.43-0.52-0.58-0.84
c-0.14-0.32-0.22-0.67-0.22-1.03c0-0.38,0.07-0.73,0.22-1.07c0.14-0.33,0.34-0.62,0.58-0.86c0.24-0.24,0.53-0.43,0.85-0.58
c0.33-0.14,0.67-0.22,1.04-0.22c0.38,0,0.73,0.07,1.07,0.22c0.33,0.14,0.62,0.34,0.87,0.58c0.25,0.24,0.44,0.53,0.59,0.86
C109.78,2.04,109.85,2.39,109.85,2.77z M109.22,7.92v17.67h-4.25V7.92H109.22z"/>
<path fill="#273647" d="M118.45,25.87c-1.53,0-2.7-0.43-3.53-1.3c-0.83-0.87-1.24-2.06-1.24-3.59v-9.87h-1.79
c-0.23,0-0.43-0.07-0.59-0.22c-0.17-0.15-0.25-0.37-0.25-0.67V8.53l2.84-0.47l0.9-4.82c0.05-0.23,0.15-0.41,0.32-0.53
c0.17-0.13,0.38-0.19,0.63-0.19h2.2v5.56h4.65v3.03h-4.65v9.58c0,0.55,0.14,0.98,0.41,1.29c0.28,0.31,0.64,0.46,1.1,0.46
c0.26,0,0.48-0.03,0.66-0.09c0.18-0.06,0.33-0.13,0.47-0.2c0.13-0.07,0.25-0.14,0.35-0.2c0.1-0.06,0.21-0.09,0.31-0.09
c0.13,0,0.23,0.03,0.31,0.09c0.08,0.06,0.17,0.16,0.26,0.28l1.27,2.07c-0.62,0.52-1.33,0.91-2.14,1.17
C120.14,25.74,119.31,25.87,118.45,25.87z"/>
<path fill="#273647" d="M138.44,25.59h-1.91c-0.4,0-0.72-0.06-0.95-0.18c-0.23-0.12-0.4-0.36-0.52-0.73l-0.38-1.26
c-0.45,0.4-0.89,0.75-1.32,1.06c-0.43,0.3-0.88,0.56-1.33,0.77c-0.46,0.21-0.95,0.36-1.46,0.47c-0.52,0.1-1.09,0.15-1.72,0.15
c-0.75,0-1.44-0.1-2.07-0.3c-0.63-0.2-1.17-0.5-1.63-0.91c-0.45-0.4-0.81-0.9-1.06-1.5c-0.25-0.6-0.38-1.3-0.38-2.09
c0-0.67,0.17-1.33,0.53-1.98c0.35-0.65,0.93-1.24,1.75-1.76c0.82-0.52,1.9-0.96,3.26-1.3c1.35-0.35,3.04-0.52,5.05-0.52v-1.04
c0-1.19-0.25-2.07-0.75-2.65c-0.5-0.57-1.23-0.86-2.18-0.86c-0.69,0-1.26,0.08-1.72,0.24c-0.46,0.16-0.86,0.34-1.2,0.54
c-0.34,0.2-0.65,0.38-0.94,0.54c-0.29,0.16-0.6,0.24-0.95,0.24c-0.29,0-0.53-0.07-0.74-0.22c-0.21-0.15-0.37-0.33-0.5-0.55
l-0.77-1.36c2.03-1.86,4.48-2.79,7.35-2.79c1.03,0,1.95,0.17,2.76,0.51c0.81,0.34,1.5,0.81,2.06,1.41
c0.56,0.6,0.99,1.32,1.28,2.16c0.29,0.84,0.44,1.76,0.44,2.76V25.59z M130.18,22.94c0.44,0,0.84-0.04,1.21-0.12
c0.37-0.08,0.71-0.2,1.04-0.36c0.33-0.16,0.64-0.35,0.95-0.58c0.3-0.23,0.61-0.51,0.92-0.82V18.1c-1.24,0-2.28,0.08-3.11,0.23
c-0.83,0.16-1.5,0.36-2.01,0.6c-0.51,0.24-0.86,0.53-1.08,0.85c-0.21,0.32-0.32,0.68-0.32,1.06c0,0.75,0.22,1.29,0.66,1.61
C128.89,22.78,129.46,22.94,130.18,22.94z"/>
<path fill="#273647" d="M145.78,0v25.59h-4.25V0H145.78z"/>
</g>
<g>
<path fill="#1ABC9C" d="M152.86,14.18v11.41h-1.82V0.37h6.43c2.91,0,5.08,0.56,6.52,1.68c1.44,1.12,2.16,2.77,2.16,4.95
c0,0.96-0.17,1.84-0.5,2.64c-0.33,0.8-0.81,1.49-1.43,2.09c-0.62,0.6-1.38,1.09-2.25,1.48c-0.88,0.39-1.87,0.64-2.98,0.76
c0.29,0.18,0.54,0.42,0.77,0.71l8.68,10.91h-1.59c-0.19,0-0.35-0.04-0.49-0.11c-0.14-0.07-0.27-0.19-0.4-0.36l-8.07-10.23
c-0.2-0.26-0.42-0.45-0.65-0.55c-0.23-0.11-0.59-0.16-1.08-0.16H152.86z M152.86,12.82h4.38c1.12,0,2.12-0.13,3-0.4
c0.88-0.27,1.63-0.65,2.25-1.15c0.61-0.5,1.08-1.1,1.4-1.8c0.32-0.7,0.48-1.49,0.48-2.37c0-1.79-0.59-3.12-1.76-3.99
c-1.18-0.87-2.89-1.3-5.13-1.3h-4.62V12.82z"/>
<path fill="#1ABC9C" d="M170.85,7.85v11.33c0,1.66,0.38,2.97,1.14,3.91c0.76,0.94,1.93,1.42,3.49,1.42c1.16,0,2.24-0.29,3.24-0.88
c1-0.59,1.9-1.4,2.7-2.45V7.85h1.69v17.73h-0.93c-0.33,0-0.5-0.15-0.51-0.46l-0.16-2.64c-0.82,1.02-1.77,1.84-2.85,2.46
c-1.08,0.62-2.28,0.93-3.6,0.93c-0.99,0-1.85-0.15-2.59-0.46c-0.74-0.31-1.35-0.75-1.84-1.34c-0.49-0.58-0.86-1.28-1.11-2.1
c-0.25-0.82-0.37-1.75-0.37-2.78V7.85H170.85z"/>
<path fill="#1ABC9C" d="M186.06,25.58V7.85h0.93c0.31,0,0.49,0.15,0.53,0.45l0.16,2.67c0.81-1.02,1.75-1.84,2.82-2.47
c1.08-0.62,2.27-0.94,3.59-0.94c0.97,0,1.83,0.15,2.58,0.46c0.74,0.31,1.36,0.75,1.84,1.34c0.49,0.58,0.86,1.28,1.1,2.1
c0.25,0.82,0.37,1.75,0.37,2.78v11.33h-1.69V14.25c0-1.66-0.38-2.97-1.14-3.91c-0.76-0.94-1.92-1.42-3.49-1.42
c-1.16,0-2.25,0.3-3.24,0.9c-1,0.6-1.89,1.42-2.67,2.47v13.29H186.06z"/>
</g>
<g>
<polygon fill="#1ABC9C" points="16.68,9.03 16.68,0.69 8.34,0.69 8.34,9.03 0,9.03 0,17.36 8.34,17.36 8.34,25.7 16.68,25.7
16.68,17.36 25.01,17.36 25.01,9.03 "/>
</g>
</g>
</svg>
Loading

0 comments on commit 7856a6b

Please sign in to comment.