Skip to content

Commit eb9f81f

Browse files
author
Miel Vander Sande
committed
Fixes UI for small window sizes
1 parent 6afe439 commit eb9f81f

File tree

4 files changed

+2903
-2609
lines changed

4 files changed

+2903
-2609
lines changed

common/css/solid.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,7 @@
4848
.progress .level-4{
4949
width: 100%;
5050
}
51+
52+
.xs-header {
53+
margin-top: 0;
54+
}

default-views/auth/login-username-password.hbs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<div class="panel-body">
33
<form method="post" action="/login/password">
44
<div class="form-group">
5-
<label class="control-label" for="username">Username</label>
6-
<input type="text" class="form-control" name="username" id="username" placeholder="alice"/>
5+
<label class="control-label hidden-xs" for="username">Username</label>
6+
<input type="text" class="form-control" name="username" id="username" placeholder="Username"/>
77
</div>
88

99
<div class="form-group">
10-
<div class="pull-right">
10+
<label class="control-label hidden-xs" for="password">Password</label>
11+
<input type="password" class="form-control" name="password" id="password" placeholder="Password"/>
12+
<div class="pull-right">
1113
<a href="/account/password/reset{{#if returnToUrl}}?returnToUrl={{{returnToUrl}}}{{/if}}">
1214
Forgot password?
1315
</a>
1416
</div>
15-
<label class="control-label" for="password">Password</label>
16-
<input type="password" class="form-control" name="password" id="password"/>
1717
</div>
1818

1919
<button type="submit" class="btn btn-primary" id="login">Log In</button>

default-views/auth/login.hbs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@
88
<link rel="stylesheet" href="/common/css/solid.css">
99
</head>
1010
<body>
11-
<div class="container">
12-
<div class="page-header">
11+
<div class="container-fluid">
12+
<div class="page-header hidden-xs hidden-sm">
1313
<h1>Login</h1>
1414
</div>
15+
1516

1617
{{> shared/error}}
1718

18-
<div class="row">
19+
<div class="row visible-xs-inline visible-lg-block visible-md-block visible-sm-block">
1920
<div class="col-md-6">
2021
{{#if enablePassword}}
22+
<h4 class="visible-xs visible-sm xs-header">Login</h4>
2123
{{> auth/login-username-password}}
2224
{{/if}}
2325
<div class="visible-md visible-lg">

0 commit comments

Comments
 (0)