Permalink
Browse files

added logo, changed nav bar

  • Loading branch information...
1 parent 385fc1b commit f9736b7f664f3efb20ad5f7698ddad1a411a5317 @sukhada committed Mar 15, 2013
Showing with 44 additions and 20 deletions.
  1. +2 −0 home.html
  2. +8 −3 reddit.js
  3. BIN reddit.png
  4. +34 −17 styles.css
View
@@ -11,6 +11,8 @@
</head>
<body>
<nav>
+ <a href="#" id="pic"></a>
+ <span id="apptitle">customReddit</span>
<li><a href="#" id="open">Add Subreddit+</a></li>
<span id="refresh">Refresh</span>
</nav>
View
@@ -154,7 +154,7 @@ function frontPage(result) {
var height = $("li").each(function() {
var height = $(this).outerHeight();
$(this).children("span.upvotes").css("height", (height+15)+'px');
- $(this).children("span.upvotes").css("line-height", (height+15)+'px');
+ $(this).children("span.upvotes").css("line-height", (height)+'px');
});
}
@@ -201,8 +201,13 @@ function fixMargins() {
}
window.onload = function() {
- $(".image").css("max-width", $(window).width());
- $(".image").css("max-width", $(window).height());
+ if ($(window).width < 704) {
+ $(".image").css("max-width", $(window).width());
+ $(".image").css("max-width", $(window).height());
+ }
+ else {
+ $(".image").css("max-width", 500);
+ }
console.log($(window).width());
if (localStorage.getItem('subreddits')) {
if (localStorage.getItem('lastItems')) {
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -6,7 +6,7 @@ body {
#posts {
list-style-type: none;
padding-top: 60px;
- margin:0;
+ margin:0 auto;
display: none;
}
@@ -63,7 +63,7 @@ span.color {
position: fixed;
background-color: white;
top: 0;
- left: 0;
+ right: 0;
background: #f9f9f9;
background-image: -webkit-linear-gradient(top, #f9f9f9, #e9e9e9);
background-image: -moz-linear-gradient(top, #f9f9f9, #e9e9e9);
@@ -94,7 +94,7 @@ span.color {
border-width: 0 8px 8px;
content: "";
display: block;
- left: 25px;
+ left: 70px;
position: absolute;
top: -8px;
width: 0;
@@ -106,7 +106,7 @@ span.color {
border-width: 0 8px 8px;
content: "";
display: block;
- left: 25px;
+ left: 70px;
position: absolute;
top: -7px;
width: 0;
@@ -174,25 +174,21 @@ nav {
nav li a{
text-decoration: none;
- font: 18px 'Open Sans' white;
-}
-
-
-nav li a:hover .modal {
- display: block;
-}
-nav a {
+ font: 12px 'Open Sans' white;
+ font-weight: bold;
color: white;
- margin-top: 23px;
- float: left;
+ margin-top: 31px;
+ float: right;
+ margin-right: 5px;
}
nav span {
color: white;
- font: 15px 'Open Sans' white;
+ font: 12px 'Open Sans' white;
+ font-weight: bold;
float: right;
- margin-top: 12px;
- margin-right: 5px;
+ margin-top: 16px;
+ margin-right: 45px;
}
#loadmore {
@@ -257,4 +253,25 @@ img {
}
}
}
+}
+
+.new {
+width: 30px;
+display: inline;
+}
+
+#pic{
+ background: url(reddit.png);
+ width: 32px;
+ height: 43px;
+ float: left;
+ margin-top: 2px;
+ margin-left: 2px;
+}
+
+#apptitle {
+ float: left;
+ font: 30px 'Open Sans' white;
+ font-weight: bold;
+ margin-top: 10px;
}

0 comments on commit f9736b7

Please sign in to comment.