Skip to content

Commit ff39651

Browse files
author
Matt Swanson
committed
prettify inputs.
1 parent f69e1c9 commit ff39651

5 files changed

Lines changed: 72 additions & 21 deletions

File tree

‎app/controllers/sessions_controller.rb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ class Stringer < Sinatra::Base
99
user = SignInUser.sign_in(params[:password])
1010
if user
1111
session[:user_id] = user.id
12-
12+
1313
redirect to("/")
1414
else
15-
flash.now[:error] = "Invalid username or password"
15+
flash.now[:error] = "That's the wrong password. Try again."
1616
erb :"sessions/new"
1717
end
1818
end
1919

2020
get "/logout" do
21-
flash[:success] = "You have been signed out"
21+
flash[:success] = "You have been signed out!"
2222
session[:user_id] = nil
2323

2424
redirect to("/")

‎app/public/css/flat-ui-no-icons.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ input[type="color"],
707707
input[type="tel"]:focus,
708708
input[type="color"]:focus,
709709
.uneditable-input:focus {
710-
border-color: #F67100;
710+
border-color: #484948;
711711
-webkit-box-shadow: none;
712712
-moz-box-shadow: none;
713713
box-shadow: none; }

‎app/public/css/styles.css‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ hr {
6666
background-color: #7F8281;
6767
}
6868

69+
.btn:focus {
70+
outline:0px !important;
71+
-webkit-appearance:none;
72+
}
73+
6974
#action-bar i {
7075
color: white;
7176
line-height: 18px;
@@ -255,5 +260,47 @@ li.story.open .story-preview {
255260
}
256261

257262
.setup .control-group input {
258-
width: 336px;
263+
width: 210px;
264+
}
265+
266+
.setup .field-icon {
267+
display: block;
268+
color: #BFC9CA;
269+
font-size: 24px;
270+
position: absolute;
271+
right: 13px;
272+
top: 8px;
273+
-webkit-transition: 0.25s;
274+
-moz-transition: 0.25s;
275+
-o-transition: 0.25s;
276+
transition: 0.25s;
277+
}
278+
279+
.setup .control-group input:focus + .field-icon {
280+
color: #484948;
281+
}
282+
283+
.setup .control-group input:focus ~ .field-label {
284+
color: #484948;
285+
}
286+
287+
.setup .field-label {
288+
display: block;
289+
color: #BFC9CA;
290+
position: absolute;
291+
left: 13px;
292+
top: 10px;
293+
-webkit-transition: 0.25s;
294+
-moz-transition: 0.25s;
295+
-o-transition: 0.25s;
296+
transition: 0.25s;
297+
}
298+
299+
.setup #password, .setup #password-confirmation {
300+
padding-left: 100px;
301+
padding-right: 36px;
302+
}
303+
304+
.setup .control-group {
305+
position: relative;
259306
}

‎app/views/first_run/password.erb‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
<hr />
77
<form id="password_setup" method="POST" action="/password">
88
<div class="control-group">
9-
<label for="password">Password</label>
10-
<input type="password" name="password" id="password" />
9+
<input name="password" id="password" type="password" autofocus="autofocus"/ >
10+
<i class="icon-lock field-icon"></i>
11+
<label id="password-label" class="field-label" for="password">Password</label>
1112
</div>
1213
<div class="control-group">
13-
<label for="password">Confirm Password</label>
14-
<input type="password" name="password_confirmation" id="password_confirmation" />
14+
<input name="password_confirmation" id="password-confirmation" type="password" />
15+
<i class="icon-lock field-icon"></i>
16+
<label id="confirm-label" class="field-label" for="password_confirmation">Confirm</label>
1517
</div>
1618

1719
<input type="submit" id="submit" class="btn btn-primary pull-right" value="Next"/>

‎app/views/sessions/new.erb‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
<h1>Login</h1>
2-
<form method="POST" id="login" action="/login">
3-
<div class="control-group">
1+
<div class="setup" id="feed-setup">
2+
<h1>Stringer speaks <span class="orange">RSS</span>.</h1>
3+
<h2>Welcome back, friend.</h2>
4+
5+
<hr />
46

5-
<label for="email">Email</label>
6-
<input name="email" id="email" type="text" />
7-
</div>
8-
<div class="control-group">
9-
<label for="password">Password</label>
10-
<input name="password" id="password" type="password" />
11-
</div>
12-
<input type="submit" value="Login" class="btn btn-primary" />
13-
</form>
7+
<form method="POST" id="login" action="/login">
8+
<div class="control-group">
9+
<input name="password" id="password" type="password" autofocus="autofocus"/ >
10+
<i class="icon-lock field-icon"></i>
11+
<label id="password-label" class="field-label" for="password">Password</label>
12+
</div>
13+
<input type="submit" value="Login" class="btn btn-primary pull-right" />
14+
</form>
15+
</div>

0 commit comments

Comments
 (0)