css: fixed login div with navbar

bduong · Apr 24, 2013 · 2de45ef · 2de45ef
1 parent 4823179
commit 2de45ef
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 17 deletions.
diff --git a/Views/Layout.master b/Views/Layout.master
@@ -36,6 +36,7 @@
 
             </div>
             <div id="login" class="right">
+                <div class="login_frank">
                             <span class="ep">Hello 
                             <asp:LoginView ID="LoginView1" runat="server">
                                 <AnonymousTemplate>
@@ -50,16 +51,19 @@
 
                                 !<br />
                                 </span>
-                                <asp:LoginView ID="LoginView2" runat="server">
-                                    <AnonymousTemplate>
-                                        <asp:HyperLink ID="RegisterLink" runat="server" NavigateUrl="~/Views/UserRegistration.aspx">Register</asp:HyperLink>
-                                        &nbsp;or
-                                        <asp:HyperLink ID="LoginLink" runat="server" NavigateUrl="~/Views/Login.aspx">Login</asp:HyperLink>
-                                    </AnonymousTemplate>
-                                    <LoggedInTemplate>
-                                        <asp:LoginStatus ID="LoginStatus1" runat="server" OnLoggingOut="LoginStatus1_LoggingOut" />
-                                    </LoggedInTemplate>
-                                </asp:LoginView>
+
+                                    <asp:LoginView ID="LoginView2"  runat="server">
+                                        <AnonymousTemplate>
+                                            <asp:HyperLink ID="RegisterLink" runat="server" NavigateUrl="~/Views/UserRegistration.aspx">Register</asp:HyperLink>
+                                            &nbsp;or
+                                            <asp:HyperLink ID="LoginLink" runat="server" NavigateUrl="~/Views/Login.aspx">Login</asp:HyperLink>
+                                        </AnonymousTemplate>
+                                        <LoggedInTemplate>
+                                            <asp:LoginStatus ID="LoginStatus1" runat="server" OnLoggingOut="LoginStatus1_LoggingOut" />
+                                        </LoggedInTemplate>
+                                    </asp:LoginView>
+                               </div>
+
                                 <nav id="navbar" runat="server">
                                     <ul class="menu" id="menu" runat="server">
                                         <li>

diff --git a/Views/Search.aspx.cs b/Views/Search.aspx.cs
@@ -166,7 +166,8 @@ private void putHighlights()
             location = UserDataService.getUser(userId).location;
         }
 
-        returnList = ListingDataService.getListingsBy("Location", location, 5);
+        /* no limit on the number of items */
+        returnList = ListingDataService.getListingsBy("Location", location);
 
         featured3.InnerHtml = "";
         for (int i = returnList.Count - 1; i >= 0; i--)

diff --git a/public/css/style.css b/public/css/style.css
@@ -174,6 +174,22 @@ h2 {
 
 
 }
+.login_frank {
+    text-align: right;
+    float: right;
+    clear: both;
+}
+    .login_frank a {
+        color: #00a9ff;
+        text-decoration: none;
+    }
+    .login_frank a:hover {
+        color: #fff;
+    }
+    .login_frank a:visited {
+        color: #ffd303;
+    }
+
 
 
 
@@ -380,6 +396,8 @@ div.featured_item_div:hover {
 }
 nav .menu {
     text-align: center; 
+    float: right;
+    clear: both;
     // background-color: #eee;   
     // background: url('../../public/img/bg-middle-top.gif');
     //height: 40px;
@@ -396,18 +414,13 @@ nav .menu li span.nav_icon {
 
 nav .menu li {
 
-
-
-
-
     list-style: none;
     display: inline;
     width: 400px;
 
-
     // padding-top: 10px;
     padding-left: 15px;
-    padding-right: 15px;
+    padding-right: 0px;
 
 
 }