Browse files

CSS

  • Loading branch information...
1 parent 81e50e7 commit 1cba5c47cb384a30550d96bcf30a63b003df86aa @snissim snissim committed Feb 8, 2012
View
5 CodeProse.Shifter/content/base.css
@@ -9,6 +9,9 @@ h1
padding: .2em;
margin: 0;
}
+h2 {
+ margin: 0;
+}
#calendar .fc-event
{
cursor: pointer;
@@ -47,7 +50,7 @@ h1
width: 250px;
float: left;
}
-.cart h1
+.cart .ui-widget-header
{
border: none;
border-radius: 10px 10px 0px 0px;
View
8 CodeProse.Shifter/content/topnav.js
@@ -3,7 +3,13 @@
$(function () {
user = { name: "Raul Aso" }; // get from cookie
- $('<div id="topnav" class="ui-widget-header"><a href="default">Home</a> <a href="view-calendar">View</a> <a href="assign-shifts">Manage</a></div>')
+ $('<div id="topnav" class="ui-widget-header">' +
+ '<a href="default">Home</a> ' +
+ '<a href="view-calendar">Calendar</a> ' +
+ '<a href="manage-shifts">Shifts</a> ' +
+ '<a href="manage-members">Members</a> ' +
+ '<a href="assign-shifts">Schedule</a>' +
+ '</div>')
.append($('<div id="user" />').text(user.name))
.prependTo("body");
});
View
7 CodeProse.Shifter/layouts/base.cshtml
@@ -12,6 +12,11 @@
</head>
<body>
@Html.Partial("partials/topnav.cshtml", Model)
- @RenderBody()
+ <div id="content">
+ @RenderBody()
+ </div>
+ <script type="text/javascript">
+ $("input[type=button]").button();
+ </script>
</body>
</html>
View
6 CodeProse.Shifter/partials/news-feed.cshtml
@@ -1,7 +1,9 @@
-<div>
+<h2 class="ui-widget-header">
+ News Feed</h2>
+<div class="ui-widget-content">
<ul id="news-feed">
<li>Raul wants to give up his Feb 15 9am-12pm shift</li>
<li>Ryan wants to trade for his Feb 12 2pm-5pm shift</li>
<li>Sam picked up the Feb 14 9am-12pm shift from Raul (is this necessary?)</li>
</ul>
-</div>
+</div>
View
28 CodeProse.Shifter/wireframes/assign-shifts.htm
@@ -44,11 +44,11 @@
});
});
</script>
- <div id="content" class="ui-widget-content">
+ <div id="content">
<div id="products">
- <h1 class="ui-widget-header">
- Members</h1>
- <div id="catalog">
+ <h2 class="ui-widget-header">
+ Members</h2>
+ <div id="catalog" class="ui-widget-content">
<ul>
<li>Samuel Nissim</li>
<li>James Gray</li>
@@ -63,26 +63,26 @@ <h1 class="ui-widget-header">
</div>
</div>
<div id="shift1" class="cart cart-float">
- <h1 class="ui-widget-header">
- 11am-2pm</h1>
+ <h2 class="ui-widget-header">
+ 11am-2pm</h2>
<div class="ui-widget-content">
<ul>
<li class="placeholder">Drag members here</li>
</ul>
</div>
</div>
<div id="shift2" class="cart cart-float">
- <h1 class="ui-widget-header">
- 2pm-5pm</h1>
+ <h2 class="ui-widget-header">
+ 2pm-5pm</h2>
<div class="ui-widget-content">
<ul>
<li class="placeholder">Drag members here</li>
</ul>
</div>
</div>
<div id="shift1" class="cart cart-float">
- <h1 class="ui-widget-header">
- 5pm-8pm</h1>
+ <h2 class="ui-widget-header">
+ 5pm-8pm</h2>
<div class="ui-widget-content">
<ul>
<li class="placeholder">Drag members here</li>
@@ -91,14 +91,6 @@ <h1 class="ui-widget-header">
</div>
<div style="clear: both;">
</div>
- <div>
- <h2>
- Actions</h2>
- <ul>
- <li><a href="manage-shifts">Manage Shifts</a></li>
- <li><a href="manage-members">Manage Members</a></li>
- </ul>
- </div>
</div>
</body>
</html>
View
16 CodeProse.Shifter/wireframes/default.htm
@@ -10,12 +10,16 @@
<link rel="stylesheet" type="text/css" href="../content/base.css" />
</head>
<body>
- <div id="content" class="ui-widget-content">
- <ul id="news-feed">
- <li>Raul wants to give up his Feb 15 9am-12pm shift</li>
- <li>Ryan wants to trade for his Feb 12 2pm-5pm shift</li>
- <li>Sam picked up the Feb 14 9am-12pm shift from Raul (is this necessary?)</li>
- </ul>
+ <div id="content">
+ <h2 class="ui-widget-header">
+ News Feed</h2>
+ <div class="ui-widget-content">
+ <ul id="news-feed">
+ <li>Raul wants to give up his Feb 15 9am-12pm shift</li>
+ <li>Ryan wants to trade for his Feb 12 2pm-5pm shift</li>
+ <li>Sam picked up the Feb 14 9am-12pm shift from Raul (is this necessary?)</li>
+ </ul>
+ </div>
</div>
</body>
</html>
View
2 CodeProse.Shifter/wireframes/manage-shifts.htm
@@ -16,6 +16,8 @@
$("#addShift").click(function () {
$("#shiftList").append("<li>" + formatShiftName() + "</li>");
});
+
+ $("input[type=button]").button();
});
function formatShiftName() {

0 comments on commit 1cba5c4

Please sign in to comment.