Skip to content

Commit 176af4d

Browse files
author
Rafael Staib
committed
Add final version
1 parent cd0ace6 commit 176af4d

35 files changed

+444
-202
lines changed

JSteps.v11.suo

0 Bytes
Binary file not shown.

JSteps/Content/examples.css

Lines changed: 45 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
background: #eee;
143143
display: block;
144144
margin: 0.5em;
145-
min-height: 30em;
145+
min-height: 35em;
146146
overflow: hidden;
147147
position: relative;
148148
width: auto;
@@ -156,8 +156,8 @@
156156
{
157157
display: inline;
158158
float: left;
159-
margin: 0 0 0.5em 2.5%;
160-
width: 67.5%;
159+
margin: 0 2.5% 0.5em 2.5%;
160+
width: 65%;
161161
}
162162

163163
.wizard > .content > .body
@@ -188,22 +188,33 @@
188188

189189
.wizard > .content > .body input
190190
{
191+
display: block;
191192
border: 1px solid #ccc;
192193
}
193194

195+
.wizard > .content > .body input[type="checkbox"]
196+
{
197+
display: inline-block;
198+
}
199+
194200
.wizard > .content > .body input.error
195201
{
196202
background: rgb(251, 227, 228);
197203
border: 1px solid #fbc2c4;
198204
color: #8a1f11;
199205
}
200206

207+
.wizard > .content > .body label
208+
{
209+
display: inline-block;
210+
margin-bottom: 0.5em;
211+
}
212+
201213
.wizard > .content > .body label.error
202214
{
203215
color: #8a1f11;
204216
display: inline-block;
205-
margin: 0 0 1em 1.5em;
206-
vertical-align: middle;
217+
margin-left: 1.5em;
207218
}
208219

209220
.wizard > .actions
@@ -218,6 +229,8 @@
218229
{
219230
display: inline;
220231
float: right;
232+
margin: 0 2.5%;
233+
width: 95%;
221234
}
222235

223236
.wizard > .actions > ul
@@ -231,6 +244,11 @@
231244
margin: 0 0.5em;
232245
}
233246

247+
.wizard.vertical > .actions > ul > li
248+
{
249+
margin: 0 0 0 1em;
250+
}
251+
234252
.wizard > .actions a,
235253
.wizard > .actions a:hover,
236254
.wizard > .actions a:active
@@ -272,7 +290,7 @@
272290
{
273291
position: relative;
274292
display: block;
275-
width: 600px;
293+
width: 100%;
276294
}
277295

278296
.tabcontrol > .steps > ul
@@ -285,33 +303,42 @@
285303

286304
.tabcontrol > .steps > ul > li
287305
{
288-
background: #edecec;
289-
border: 1px solid #bbb;
290306
float: left;
291-
margin: 5px -1px 0 0;
307+
margin: 5px 2px 0 0;
308+
padding: 1px;
309+
310+
-webkit-border-top-left-radius: 5px;
311+
-webkit-border-top-right-radius: 5px;
312+
-moz-border-radius-topleft: 5px;
313+
-moz-border-radius-topright: 5px;
314+
border-top-left-radius: 5px;
315+
border-top-right-radius: 5px;
292316
}
293317

294318
.tabcontrol > .steps > ul > li:hover
295319
{
296-
background: #fff;
320+
background: #edecec;
321+
border: 1px solid #bbb;
322+
padding: 0;
297323
}
298324

299325
.tabcontrol > .steps > ul > li.current
300326
{
301327
background: #fff;
328+
border: 1px solid #bbb;
302329
border-bottom: 0 none;
303-
padding-bottom: 1px;
330+
padding: 0 0 1px 0;
304331
margin-top: 0;
305332
}
306333

307334
.tabcontrol > .steps > ul > li > a
308335
{
336+
color: #5f5f5f;
309337
display: inline-block;
310-
font: 1em/1em Arial, Verdana, sans-serif;
311338
border: 0 none;
312339
margin: 0;
313340
padding: 10px 30px;
314-
color: #5f5f5f;
341+
text-decoration: none;
315342
}
316343

317344
.tabcontrol > .steps > ul > li > a:hover
@@ -328,8 +355,8 @@
328355
{
329356
position: relative;
330357
display: inline-block;
331-
width: 600px;
332-
height: 300px;
358+
width: 100%;
359+
height: 35em;
333360
overflow: hidden;
334361
border-top: 1px solid #bbb;
335362
padding-top: 20px;
@@ -339,9 +366,9 @@
339366
{
340367
float: left;
341368
position: absolute;
342-
width: 580px;
343-
height: 280px;
344-
padding: 10px;
369+
width: 95%;
370+
height: 95%;
371+
padding: 2.5%;
345372
}
346373

347374
.tabcontrol > .content > .body ul

JSteps/Controllers/ExamplesController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public async Task<ActionResult> AsyncContent()
1919
{
2020
await Task.Delay(2000);
2121

22-
return Json(new { title = "Async", content = "Async Result " + DateTime.UtcNow.ToString() });
22+
return Content("<p>To test async loading again press \"Next\" and then go back to the first step.</p><p>I deactivated content cache for this demo so that you can try it again and again.</p>");
2323
}
2424

2525
public ActionResult EmbeddedContent()

0 commit comments

Comments
 (0)