Skip to content

Commit

Permalink
Some styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Zach Moazeni committed May 9, 2012
1 parent 580450f commit b0159b4
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 18 deletions.
2 changes: 1 addition & 1 deletion coffee/views.coffee
Expand Up @@ -24,7 +24,7 @@ views["index"] = """

views["show"] = """
<header class="page-header well row">
<div class="span1"><img src="{{user.avatar_url}}" alt="image of {{user.name}}"/></div>
<div class="span1 offset3"><img src="{{user.avatar_url}}" alt="image of {{user.name}}"/></div>
<div class="span5">
<h1>{{user.name}} <a href="{{user.html_url}}">{{user.login}}</a></h1>
<ul>
Expand Down
45 changes: 29 additions & 16 deletions css/site.css
Expand Up @@ -4,12 +4,25 @@ section {
position: relative;
}

/* line 7, ../sass/site.scss */
/* line 8, ../sass/site.scss */
header h1 {
margin-bottom: 15px;
}
/* line 12, ../sass/site.scss */
header ul {
list-style: none;
}
/* line 14, ../sass/site.scss */
header ul li {
margin-bottom: 5px;
}

/* line 20, ../sass/site.scss */
#timeline-container {
position: relative;
}

/* line 11, ../sass/site.scss */
/* line 24, ../sass/site.scss */
#timeline-line {
background-color: #E08989;
height: 100%;
Expand All @@ -20,19 +33,19 @@ section {
left: 428px;
}

/* line 21, ../sass/site.scss */
/* line 34, ../sass/site.scss */
#timeline {
width: 860px;
margin: 0;
list-style: none;
}
/* line 26, ../sass/site.scss */
/* line 39, ../sass/site.scss */
#timeline h1 {
font-size: 14px;
line-height: 14px;
margin-bottom: 10px;
}
/* line 32, ../sass/site.scss */
/* line 45, ../sass/site.scss */
#timeline .item {
width: 388px;
margin: 10px;
Expand All @@ -43,42 +56,42 @@ section {
word-wrap: break-word;
padding: 5px 10px;
}
/* line 42, ../sass/site.scss */
/* line 55, ../sass/site.scss */
#timeline .item ol {
list-style: none;
margin: 0px;
font-size: 12px;
font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
}
/* line 50, ../sass/site.scss */
/* line 63, ../sass/site.scss */
#timeline .gravatar {
height: 80px;
float: left;
}
/* line 55, ../sass/site.scss */
/* line 68, ../sass/site.scss */
#timeline .date {
float: right;
}
/* line 59, ../sass/site.scss */
/* line 72, ../sass/site.scss */
#timeline .prominent {
width: 600px;
text-align: center;
padding-left: 300px;
}
/* line 64, ../sass/site.scss */
/* line 77, ../sass/site.scss */
#timeline .prominent > div {
width: 220px;
}
/* line 69, ../sass/site.scss */
/* line 82, ../sass/site.scss */
#timeline #spinner {
height: 100px;
padding-left: 270px;
}
/* line 74, ../sass/site.scss */
/* line 87, ../sass/site.scss */
#timeline .item, #timeline .prominent {
margin-top: 20px;
}
/* line 78, ../sass/site.scss */
/* line 91, ../sass/site.scss */
#timeline .corner {
display: block;
height: 15px;
Expand All @@ -89,18 +102,18 @@ section {
position: absolute;
margin-top: 8px;
}
/* line 89, ../sass/site.scss */
/* line 102, ../sass/site.scss */
#timeline li[data-align=l] .corner {
background: url("../img/right.png") no-repeat top right;
margin-left: 398px;
}
/* line 94, ../sass/site.scss */
/* line 107, ../sass/site.scss */
#timeline li[data-align=r] .corner {
background: url("../img/left.png") no-repeat top right;
margin-left: -23px;
}

/* line 100, ../sass/site.scss */
/* line 113, ../sass/site.scss */
footer {
clear: both;
}
2 changes: 1 addition & 1 deletion js/views.js
Expand Up @@ -16,7 +16,7 @@

views["index"] = "<form class=\"form-inline\">\n <input type=\"text\" id=\"username-search\" class=\"input-xlarge offset3\" placeholder=\"Enter username...\">\n <button type=\"submit\" class=\"btn btn-large\">gitspect!</button>\n</form>";

views["show"] = "<header class=\"page-header well row\">\n <div class=\"span1\"><img src=\"{{user.avatar_url}}\" alt=\"image of {{user.name}}\"/></div>\n <div class=\"span5\">\n <h1>{{user.name}} <a href=\"{{user.html_url}}\">{{user.login}}</a></h1>\n <ul>\n {{#user.email}}\n <li>Email: <a href=\"mailto:{{user.email}}\">{{user.email}}</a></li>\n {{/user.email}}\n\n {{#user.company}}\n <li>Company: {{user.company}}</li>\n {{/user.company}}\n\n {{#user.created_at}}\n <li>Joined: {{user.created_at_string}}</li>\n {{/user.created_at}}\n </ul>\n </div>\n</header>\n\n<div id=\"timeline-container\" class=\"row offset1\">\n <div id=\"timeline-line\">\n </div>\n\n <ol id=\"timeline\">\n </ol>\n</div>";
views["show"] = "<header class=\"page-header well row\">\n <div class=\"span1 offset3\"><img src=\"{{user.avatar_url}}\" alt=\"image of {{user.name}}\"/></div>\n <div class=\"span5\">\n <h1>{{user.name}} <a href=\"{{user.html_url}}\">{{user.login}}</a></h1>\n <ul>\n {{#user.email}}\n <li>Email: <a href=\"mailto:{{user.email}}\">{{user.email}}</a></li>\n {{/user.email}}\n\n {{#user.company}}\n <li>Company: {{user.company}}</li>\n {{/user.company}}\n\n {{#user.created_at}}\n <li>Joined: {{user.created_at_string}}</li>\n {{/user.created_at}}\n </ul>\n </div>\n</header>\n\n<div id=\"timeline-container\" class=\"row offset1\">\n <div id=\"timeline-line\">\n </div>\n\n <ol id=\"timeline\">\n </ol>\n</div>";

views["spinner"] = "<li id=\"spinner\" class=\"prominent\"></li>";

Expand Down
13 changes: 13 additions & 0 deletions sass/site.scss
Expand Up @@ -4,6 +4,19 @@ section {
position: relative;
}

header {
h1 {
margin-bottom: 15px;
}

ul {
list-style: none;
li {
margin-bottom: 5px;
}
}
}

#timeline-container {
position: relative;
}
Expand Down

0 comments on commit b0159b4

Please sign in to comment.