Browse files

Layout change, consistent for Riddle and TS.

  • Loading branch information...
1 parent bb12e37 commit ad5f622c8cf90fe9679f6e09dfe89102740cc3f7 @pat pat committed Jan 10, 2010
Showing with 167 additions and 77 deletions.
  1. +13 −4 _layouts/riddle.html
  2. +14 −9 _layouts/ts_en.html
  3. +14 −9 _layouts/ts_fr.html
  4. BIN images/bg-content.gif
  5. BIN images/ts.gif
  6. +126 −55 styles/ts.css
View
17 _layouts/riddle.html
@@ -8,16 +8,25 @@
<meta name="author" content="Pat Allan" />
<meta name="description" content="Riddle: An API for Sphinx, written in and for Ruby." />
<link rel="stylesheet" type="text/css" href="/styles/reset.css" media="all" />
- <link rel="stylesheet" type="text/css" href="/styles/riddle.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="/styles/ts.css" media="all" />
<link rel="stylesheet" type="text/css" href="/styles/syntax.css" media="all" />
<link rel="Shortcut Icon" type="image/ico" href="/favicon.ico" />
</head>
<body>
+ <div id="navigation">
+ <div class="wrapper">
+ <a href="http://freelancing-gods.com/" id="logo">freelancing-gods<span>.com</span></a>
+ <ul>
+ <li><a href="/ts/en">Thinking Sphinx</a></li>
+ <li class="selected"><a href="/riddle">Riddle</a></li>
+ </ul>
+ </div>
+ </div>
+
<div id="header">
<div class="wrapper">
- <h1>
- <a href="/riddle" title="Riddle">Riddle</a>
- </h1>
+ <h1 class="riddle"><a href="/riddle" title="Riddle">Riddle</a></h1>
+ <p>A Ruby API for Sphinx.</p>
</div><!-- /.wrapper -->
</div><!-- /#header -->
View
23 _layouts/ts_en.html
@@ -13,17 +13,22 @@
<link rel="Shortcut Icon" type="image/ico" href="/favicon.ico" />
</head>
<body>
+ <div id="navigation">
+ <div class="wrapper">
+ <a href="http://freelancing-gods.com/" id="logo">freelancing-gods<span>.com</span></a>
+ <ul>
+ <li class="selected"><a href="/ts/en">Thinking Sphinx</a></li>
+ <li><a href="/riddle">Riddle</a></li>
+ <li class="english lang active"><a href="/ts/en">English</a></li>
+ <li class="french lang"><a href="/ts/fr">French</a></li>
+ </ul>
+ </div>
+ </div>
+
<div id="header">
<div class="wrapper">
- <h1>
- <a href="/ts/en" title="Thinking Sphinx">Thinking Sphinx</a>
- </h1>
- <div id="language">
- <ul>
- <li><a href="/ts/fr" title="French">French</a></li>
- <li class="selected"><a href="/ts/en" title="English">English</a></li>
- </ul>
- </div>
+ <h1 class="riddle"><a href="/ts/en" title="Thinking Sphinx">Thinking Sphinx</a></h1>
+ <p>A Ruby connector between Sphinx and ActiveRecord.</p>
</div><!-- /.wrapper -->
</div><!-- /#header -->
View
23 _layouts/ts_fr.html
@@ -13,17 +13,22 @@
<link rel="Shortcut Icon" type="image/ico" href="/favicon.ico" />
</head>
<body>
+ <div id="navigation">
+ <div class="wrapper">
+ <a href="http://freelancing-gods.com/" id="logo">freelancing-gods<span>.com</span></a>
+ <ul>
+ <li class="selected"><a href="/ts/en">Thinking Sphinx</a></li>
+ <li><a href="/riddle">Riddle</a></li>
+ <li class="english lang"><a href="/ts/en">English</a></li>
+ <li class="french lang active"><a href="/ts/fr">French</a></li>
+ </ul>
+ </div>
+ </div>
+
<div id="header">
<div class="wrapper">
- <h1>
- <a href="/ts/fr" title="Thinking Sphinx">Thinking Sphinx</a>
- </h1>
- <div id="language">
- <ul>
- <li class="selected"><a href="/ts/fr" title="French">French</a></li>
- <li><a href="/ts/en" title="English">English</a></li>
- </ul>
- </div>
+ <h1 class="riddle"><a href="/ts/en" title="Thinking Sphinx">Thinking Sphinx</a></h1>
+ <p>A Ruby connector between Sphinx and ActiveRecord.</p>
</div><!-- /.wrapper -->
</div><!-- /#header -->
View
BIN images/bg-content.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN images/ts.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
181 styles/ts.css
@@ -2,22 +2,25 @@ body {
margin: 0 0 1em 0;
font-size: 14px;
line-height: 1.4286;
- color: #363642;
- background: #222C38;
+ color: #555;
+ background: #fff;
font-family: "Helvetica Neue", Arial, Verdana, sans-serif;
}
a {
- color: #195190;
+ color: #3366cc;
outline: none;
+ text-decoration: underline;
}
a:visited {
- color: #195190;
+ color: #666;
+
}
a:hover {
- color: #999;
+ color: #66cc33;
+ text-decoration: none;
}
p, ul, blockquote, pre, td, th, label {
@@ -57,20 +60,28 @@ code {
.wrapper {
width: 960px;
- background: #fff;
margin: 0 auto;
text-align: left;
overflow: hidden;
position: relative;
}
+div#navigation {
+ clear: both;
+ margin: 0 0 0 0;
+ padding: .8em 0 .6em 0;
+ overflow: hidden;
+ background: #efefef;
+ color: #888;
+ border-bottom: 1px solid #ccc;
+}
+
div#header {
clear: both;
margin: 1em auto 0 auto;
padding-top: 10px;
text-align: center;
overflow: hidden;
- background: url('../images/bg-panel-top.gif') no-repeat center top;
}
div#language {
@@ -101,40 +112,52 @@ div#language ul li.selected a:visited {
font-weight: bold;
}
-div#navigation {
- clear: both;
- margin: 0 auto;
- padding: 0;
- text-align: center;
- overflow: hidden;
- background: url('../images/bg-panel-content.gif') repeat-y center top;
-}
div#navigation .wrapper {
width: 940px;
- border-top: 1px solid #ccc;
- border-bottom: 1px solid #ccc;
- padding: 0.75em 0 0.5em 0;
}
+div#navigation .wrapper a#logo {
+ color: #828282;
+ display:block;
+ float: left;
+ font-weight: bold;
+ font-size: 1.1em;
+ line-height: 1.2em;
+ margin: 0.15em 1em 0 0;
+ padding: 0 1em 0 0;
+ text-decoration: none;
+}
+
+div#navigation .wrapper a#logo span {
+ color: #bbbaba;
+ font-size: .85em;
+}
+
+
div#navigation ul {
margin:0;
padding:0;
}
div#navigation ul li {
+ margin: 0;
+ padding: 0;
float: left;
- border-left: 1px solid #777;
+ border-left: 1px solid #ccc;
}
-div#navigation ul li.first {
- border-left: 0;
+div#navigation ul li.lang {
+ float: right;
+ border-left: none;
+ font-size: .83em;
}
div#navigation ul li a,
div#navigation ul li a:visited {
+ color: #999;
display:block;
- padding: 0em 1em 0.25em 1em ;
+ padding: 0em 1em 0 1em ;
text-decoration:none;
}
@@ -145,18 +168,23 @@ div#navigation ul li a:visited {
div#navigation ul li.selected a,
div#navigation ul li.selected a:visited {
- text-decoration: none;
- font-weight: bold;
- color: #111;
+ text-decoration: none;
+ color: #6c3;
+}
+
+div#navigation ul li.active a,
+div#navigation ul li.selected a:visited {
+ text-decoration: none;
+ color: #444;
}
div#content {
clear: both;
- margin: 0 auto;
- padding: 0 0 0 0;
+ margin: 0 auto 3em auto;
+ padding: 0 0 0;
text-align:center;
overflow: hidden;
- background: url('../images/bg-panel-content.gif') repeat-y center top;
+ background: url(/images/bg-content.gif) repeat-y center top;
}
div#content div.pad {
@@ -187,53 +215,54 @@ div#main {
div#sidebar {
float:right;
- width: 300px;
+ width: 325px;
overflow: hidden;
- padding-top: 2em;
+ padding-top: 0;
}
-#sidebar ul.subnav {
+#sidebar ul {
margin:0 0 1.5em 0;
padding:0;
- border-bottom: 1px solid #ccc;
}
-#sidebar ul.subnav li a,
-#sidebar ul.subnav li a:visited {
+#sidebar ul li a,
+#sidebar ul li a:visited {
display:block;
text-decoration:none;
- padding:4px 0 3px 5px;
- border-top: 1px solid #ccc;
+ padding:4px 0 3px 20px;
+ border-top: 1px solid #efefef;
}
-#sidebar ul.subnav li a:hover,
-#sidebar ul.subnav li a:visited:hover {
+#sidebar ul li a:hover,
+#sidebar ul li a:visited:hover {
text-decoration:underline;
}
-#sidebar ul.subnav li.selected a,
-#sidebar ul.subnav li.selected a:visited {
- color: #111;
- font-weight: bold;
+#sidebar ul li.selected a,
+#sidebar ul li.selected a:visited {
+ color: #6c3;
+ background: #efefef;
+ margin-left: 0;
+ padding-left: 20px;
}
-#sidebar ul.subnav li ul {
+#sidebar ul li ul {
border-bottom: 0;
list-style-type: disc;
margin-bottom: 0.5em;
}
-#sidebar ul.subnav li ul li {
+#sidebar ul li ul li {
border-bottom: 0;
list-style-type: disc;
margin-left: 1.5em;
}
-#sidebar ul.subnav li ul li a,
-#sidebar ul.subnav li ul li a:visited,
-#sidebar ul.subnav li.selected ul li a,
-#sidebar ul.subnav li.selected ul li a:visited {
+#sidebar ul li ul li a,
+#sidebar ul li ul li a:visited,
+#sidebar ul li.selected ul li a,
+#sidebar ul li.selected ul li a:visited {
display:block;
text-decoration:none;
padding:0;
@@ -242,8 +271,8 @@ div#sidebar {
color: #195190;
}
-#sidebar ul.subnav li ul li.selected a,
-#sidebar ul.subnav li ul li.selected a:visited {
+#sidebar ul li ul li.selected a,
+#sidebar ul li ul li.selected a:visited {
color: #444;
font-weight: normal;
}
@@ -254,7 +283,9 @@ div#footer {
padding-top: 10px;
text-align: center;
overflow: hidden;
- background: url('../images/bg-panel-footer.gif') no-repeat center top;
+ background: #efefef;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #ddd
}
div#footer .wrapper {
@@ -266,11 +297,12 @@ div#footer div.box {
float: left;
width: 280px;
margin-right: 30px;
- color: #a7b3c2;
+ color: #888;
}
div#footer div.last {
margin-right: 0;
+ margin-left: 15px;
}
div#footer div.box ul li a,
@@ -352,6 +384,46 @@ div#header h1 a:visited:hover {
background: url('../images/logo.gif') no-repeat top left;
}
+div#header h1.riddle {
+ float: none;
+ width: 100%;
+ text-indent: 0;
+ background: #fff;
+ color: #000;
+ font-size:4em;
+ margin: 20px 0 0 0;
+ padding:0;
+}
+
+div#header h1.riddle a,
+div#header h1.riddle a:visited,
+div#header h1.riddle a:hover,
+div#header h1.riddle a:visited:hover {
+ display: block;
+ width: 100%;
+ height: auto;
+ color: #000;
+ text-decoration: none;
+ background: #fff url(/images/ts.gif) no-repeat right center;
+}
+
+div#header p {
+ color: #777;
+ display: block;
+ font: italic 1.25em Georgia, Times, Serif;
+ line-height: 1.67em;
+ margin: 0.935em 0 1.87em 0;
+ padding: 0 0 1.25em 0;
+ border-bottom: 1px solid #ccc;
+}
+
+div#sidebar h2 {
+ font-size: .9em;
+ letter-spacing: .5px;
+ text-transform:uppercase;
+ margin: 40px 20px 5px 20px;
+}
+
.highlight pre {
font-family: 'Bitstream Vera Sans Mono', 'Courier', monospace;
padding: 0 1.5em;
@@ -370,7 +442,6 @@ div#header h1 a:visited:hover {
}
div#content div.pad {
- margin-left: 20px;
- margin-right: 20px;
- border-top:4px solid #222C38;
+ margin-left: 0;
+ margin-right: 0;
}

0 comments on commit ad5f622

Please sign in to comment.