Permalink
Browse files

css: this should be it...

  • Loading branch information...
1 parent c33bee5 commit a90c501616ff072c9cbfc391aa998e8dca433a65 @Martikos Martikos committed Apr 27, 2013
View
Binary file not shown.
View
Binary file not shown.
View
@@ -28,15 +28,17 @@
<div id="main-frame">
<form id="form1" runat="server">
<header>
+ <table id="header-table">
+ <tr id="header-table-top">
+ <td>
<div id="masthead" class="left">
<h1>Tomslist</h1>
<div id="div-h2">
<h2>Boston University Craigslist</!h2>
</div>
-
- </div>
- <div id="login" class="right">
- <div class="login_frank">
+ </td>
+ <td>
+<div class="login_frank">
<span class="ep">Hello
<asp:LoginView ID="LoginView1" runat="server">
<AnonymousTemplate>
@@ -63,11 +65,15 @@
</LoggedInTemplate>
</asp:LoginView>
</div>
-
- <nav id="navbar" runat="server">
+ </div>
+ </td>
+ </tr>
+ </table>
+ <div id="navbar" class="right">
+ <!--<nav id="navbar" runat="server">-->
<ul class="menu" id="menu" runat="server">
<li>
- <asp:LinkButton runat="server" OnClick="go_search">
+ <asp:LinkButton ID="LinkButton1" runat="server" OnClick="go_search">
<span class="nav_icon">n</span>
<span class="nav_text">Search</span>
</asp:LinkButton>
@@ -106,8 +112,11 @@
</ul>
- </nav>
+ <!-- </nav>-->
</div>
+
+
+
<!--div id="login" class="right">
Login
</div-->
View
@@ -10,7 +10,7 @@
<fieldset>
<a class="login_label">Username</a><asp:TextBox ID="UserName" class="login_field" runat="server"></asp:TextBox><br /><br />
<a class="login_label">Password</a><asp:TextBox ID="Password" class="login_field" runat="server" TextMode="Password"></asp:TextBox> <br /><br />
- <a class="login_label"></a><asp:Button ID="submitLoginBtn" class="login_button" runat="server" CommandName="Login" defaultbutton="SubmitButton" Text="Login" /><br />
+ <a class="login_label"></a><asp:Button ID="submitLoginBtn" class="form_button" runat="server" CommandName="Login" defaultbutton="SubmitButton" Text="Login" /><br />
<asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
</fieldset>
View
@@ -40,7 +40,7 @@ p {
}
header {
- height: 100px;
+ height: 140px;
padding: 30px;
padding-left: 100px;
@@ -80,28 +80,29 @@ hr {
height: 1px;
border: 0;
background-color: #fff;
- //box-shadow: 0px 1px 2px #000;
-
-
height: 10px;
- /*
- border: 0;
- height: 1px;
- background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));
- background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));
- background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));
- background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));
- */
-
}
+#header-table {
+ width: 100%;
+}
+#navbar {
+ text-align: right;
+ background-color: rgba(0,0,0,0.5);
+ //border-radius: 5px;
+ //border: 1px #999 solid;
+ // border: 1px rgba(255, 200, 3,0.5) solid;
+ box-shadow: 0px 0px 3px #ffd303;
+ height: 40px;
+}
+
h1 {
text-align: left;
font-family: 'Lora';
font-family: 'Cookie';
//font-family: 'sosa';
font-weight: 700;
- line-height: 1px;
+ line-height: 10px;
// color: #333;
margin-top: 38px;
color: #fff;
@@ -151,7 +152,7 @@ h2 {
background-color: rgba(255,255,255,1);
margin-top: -10px;
- background: url('../../public/img/bg-middle-top.gif');
+ background: url('../../public/img/bg-middle-top-2.png');
}
#main-frame {
//background-color: #fff;
@@ -160,17 +161,17 @@ h2 {
border-top-left-radius: 10px;
//background-color: rgba(255,255,255,0.2);
//box-shadow: 0px 2px 1px #fff;
- background: url('../../public/img/bg-middle-bottom.gif');
-
+ //background: url('../../public/img/bg-middle-bottom.gif');
+ background: #fff;
}
#main-content {
padding: 30px;
margin: auto;
min-height: 600px;
margin-top: -8px;
- background: url('../../public/img/bg-middle-bottom.gif');
-
+ //background: url('../../public/img/bg-middle-bottom.gif');
+ background: url('../../public/img/cream_dust.png');
}
.login_frank {
text-align: right;
@@ -344,7 +345,7 @@ textarea {
}
.featured {
- width: 300px;
+ width: 370px;
height: 500px;
padding: 10px;
}
@@ -356,6 +357,7 @@ textarea {
height: auto;
border-radius: 3px;
text-align: left;
+ line-height: 16px;
}
div.featured_item_div:hover {
background-color: #ffffff;
@@ -470,14 +472,15 @@ textarea {
#stitch {
border: 2px #ccc dotted;
margin-top: -14px;
+ margin-left: -2px;
height: 10px;
- background: url('../../public/img/bg-middle-top.gif');
+ background: url('../../public/img/bg-middle-top-2.png');
}
#hr-top {
margin-top: -12px;
- margin-left: -6px;
- background: url('../../public/img/bg-hr-1.gif');
+ margin-left: 0px;
+ background: url('../../public/img/bg-hr-2.png');
}
#hr-bottom {
height: 1px;
@@ -494,42 +497,38 @@ nav .menu {
//height: 40px;
}
-#navbar {
- margin-top: 60px;
+.menu {
+ margin-top: 8px;
}
-nav .menu li span.nav_icon {
+.menu li span.nav_icon {
font-family: 'sosa';
font-size: 25px;
}
-nav .menu li {
+.menu li {
list-style: none;
display: inline;
- width: 400px;
+ //width: 400px;
// padding-top: 10px;
- padding-left: 15px;
- padding-right: 0px;
+ padding-left: 0px;
+ padding-right: 19px;
}
- nav .menu li a {
+ .menu li a {
text-decoration: none;
text-shadow: 0px 1px 1px #000;
font-size: 20px;
- // color: #333;
color: #fff;
line-height: 5px;
}
- nav .menu li a:hover {
- // color: #ff6a00;
- // text-shadow: 0px 0px 10px #ffd303 ;
+ .menu li a:hover {
color: #ffd303;
- //text-shadow: 0px 0px 2px rgba(33,33,33,0.2);
}
#search_icon {
font-family: 'sosa';
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a90c501

Please sign in to comment.