Permalink
Browse files

some cleaning up of the search forms

  • Loading branch information...
1 parent 06516bb commit af35ebd1edd278742024e628aaeaccf37161f9d9 @kimballfrank kimballfrank committed Nov 3, 2012
Showing with 70 additions and 20 deletions.
  1. +52 −9 webapp/public/css/kitchenly.css
  2. +5 −5 webapp/routes/index.js
  3. +13 −6 webapp/views/search.jade
@@ -140,16 +140,40 @@ h4.result-title {
margin-top: 20px;
}
-#navbar-main .navbar-inner {
+#navbar-secondary input, #navbar-secondary .add-on {
+ top: -1px;
+ position: relative;
+}
+
+#navbar-main .navbar-inner, #navbar-secondary .navbar-inner {
padding-right: 0px;
+ padding-left: 0px;
+
+}
+
+#navbar-secondary .navbar-inner {
+
+}
+
+#navbar-main .navbar-form {
+ margin-left: 5px;
}
-.navbar-form {
- margin-left: -16px;
+#navbar-main .navbar-form div {
+ margin-right: 3px;
+}
+
+#navbar-main #guest-number-picker .btn{
+ width: 160px;
+ text-align: left;
}
-.navbar-form div {
- margin-right: 4px;
+#navbar-secondary .navbar-form {
+ margin-left: 8px;
+}
+
+#navbar-secondary .navbar-form div {
+ margin-right: 6px;
}
#navbar-main input {
@@ -176,21 +200,40 @@ h4.result-title {
background: #2B2B29;
margin-left: 0px;
padding: 20px;
+ padding-bottom: 32px;
margin-bottom: 68px;
-
}
#guest-number-picker .btn{
- width: 160px;
+ /* width: 160px;*/
text-align: left;
-
+}
+
+#search-button {
+ margin-left: 0;
+}
+
+.footer-contain {
+ display: none;
+}
+
+.footer {
+ padding-left: 16px;
+ padding-top: 22px;
+ background: #fff;
+ height: 54px;
}
a.social-link {
text-decoration: none;
font-size: 42px;
- color: #fff;
+ line-height: 42px;
+ color: #333;
margin: 6px;
+ display: inline-block;
+ padidng: 0px;
+ margin: 0px;
+ margin-right: 12px;
}
a:hover.social-link {
@@ -15,10 +15,10 @@ exports.index = function(req, res){
*/
exports.index = function(req, res) {
- res.render('index', { title: "hello" });
+ var viewData = { title: 'kitchen.ly - turn your kitchen into a restaurant' };
+ res.render('index', viewData);
};
-
// Get the search results page.
exports.search = function(req, res) {
// couchdb.getAllUsers(function(users) {
@@ -40,9 +40,9 @@ exports.user = function(req, res) {
});
};*/
-exports.index = function(req, res) {
- res.render('index', { title: "hello" });
-};
+//exports.index = function(req, res) {
+// res.render('index', { title: "hello" });
+//};
/***********************************
User Page
@@ -1,7 +1,13 @@
-header.site-header(role="page-header")
- div.container
- h1.kitchenly-branding
- a(href="/") kitchen.ly
+header.site-header
+ div.container
+ h1.kitchenly-branding.tk-mic-32-new-web.pull-left
+ a(href='/') kitchen.ly
+ div.pull-right
+ ul#user-nav.unstyled.nav.nav-pills
+ li.pull-left
+ a.sign-up-link(href='/') Sign Up
+ li.pull-left
+ a.sign-in-link(href='/') Login
div.page-contain.container
div#navbar-secondary.navbar.navbar-inverse
@@ -18,7 +24,7 @@ div.page-contain.container
i.icon-calendar
div#guest-number-picker.btn-group.pull-left
- button.btn.dropdown-toggle(data-toggle="dropdown") 2 guests
+ button.btn.dropdown-toggle.span2(data-toggle="dropdown") 2 guests
i.icon-user.pull-right
ul.dropdown-menu
li
@@ -38,7 +44,8 @@ div.page-contain.container
li
a(href="#") 8 Guests
- button.btn.btn-primary.pull-left(type="submit") Search for Dinner
+ div#search-button.btn-group.pull-left
+ button.btn.btn-primary.span2(type="submit") Search for Dinner
div.search-results-contain
div.map

0 comments on commit af35ebd

Please sign in to comment.