Merge branch 'tables'

Author: onur

Cargo.lock

@@ -41,6 +41,7 @@ tempdir = "0.3"
 
 [build-dependencies]
 time = "0.1"
+sass-rs = "0.0.18"
 
 [[bin]]
 name = "cratesfyi"

Cargo.toml

@@ -1,22 +1,38 @@
 
 extern crate time;
+extern crate sass_rs;
 
 use std::env;
 use std::path::Path;
 use std::fs::File;
 use std::io::Write;
 use std::process::Command;
 
-
 fn main() {
     let git_hash = match Command::new("git")
-                                 .args(&["log", "--pretty=format:%h", "-n", "1"])
-                                 .output() {
+        .args(&["log", "--pretty=format:%h", "-n", "1"])
+        .output() {
         Ok(output) => String::from_utf8_lossy(&output.stdout).into_owned(),
-        Err(_)     => "???????".to_string()
+        Err(_) => "???????".to_string(),
     };
     let build_date = time::strftime("%Y-%m-%d", &time::now_utc()).unwrap();
     let dest_path = Path::new(&env::var("OUT_DIR").unwrap()).join("git_version");
     let mut file = File::create(&dest_path).unwrap();
     write!(file, "({} {})", git_hash, build_date).unwrap();
+
+    // compile style.scss
+    compile_sass();
+}
+
+
+
+fn compile_sass() {
+    use sass_rs::sass_context::SassFileContext;
+
+    let mut file_context = SassFileContext::new(concat!(env!("CARGO_MANIFEST_DIR"),
+                                                        "/templates/style.scss"));
+    let css = file_context.compile().unwrap();
+    let dest_path = Path::new(&env::var("OUT_DIR").unwrap()).join("style.css");
+    let mut file = File::create(&dest_path).unwrap();
+    file.write_all(css.as_bytes()).unwrap();
 }

build.rs

@@ -16,7 +16,7 @@ use std::error::Error;
 use std::time::Duration;
 use std::path::PathBuf;
 use iron::prelude::*;
-use iron::Handler;
+use iron::{Handler, status};
 use router::{Router, NoRoute};
 use staticfile::Static;
 use handlebars_iron::{HandlebarsEngine, DirectorySource};
@@ -30,6 +30,7 @@ use std::collections::BTreeMap;
 
 /// Duration of static files for staticfile and DatabaseFileHandler (in seconds)
 const STATIC_FILE_CACHE_DURATION: u64 = 60 * 60 * 24 * 30 * 12;   // 12 months
+const STYLE_CSS: &'static str = include_str!(concat!(env!("OUT_DIR"), "/style.css"));
 
 
 struct CratesfyiHandler {
@@ -59,6 +60,7 @@ impl CratesfyiHandler {
     pub fn new() -> CratesfyiHandler {
         let mut router = Router::new();
         router.get("/", releases::home_page);
+        router.get("/style.css", style_css_handler);
         router.get("/about", |_: &mut Request| {
             page::Page::new(false).title("About Docs.rs").to_resp("about")
         });
@@ -268,6 +270,17 @@ fn duration_to_str(ts: time::Timespec) -> String {
 
 
 
+fn style_css_handler(_: &mut Request) -> IronResult<Response> {
+    use iron::headers::{CacheControl, CacheDirective, ContentType};
+    let mut response = Response::with((status::Ok, STYLE_CSS));
+    let cache = vec![CacheDirective::Public,
+    CacheDirective::MaxAge(STATIC_FILE_CACHE_DURATION as u32)];
+    response.headers.set(ContentType("text/css".parse().unwrap()));
+    response.headers.set(CacheControl(cache));
+    Ok(response)
+}
+
+
 /// MetaData used in header
 #[derive(Debug)]
 pub struct MetaData {

src/web/mod.rs

@@ -383,6 +383,45 @@ div.package-page-container {
         h6:first-child {
             margin-top: 0;
         }
+
+        table {
+            // most of this stuff is taken from pure tables.css
+            border-collapse: collapse;
+            border-spacing: 0;
+            empty-cells: show;
+            border: 1px solid #cbcbcb;
+            margin-bottom: 15px;
+
+            td, th {
+                border-left: 1px solid #cbcbcb;
+                border-width: 0 0 0 1px;
+                font-size: inherit;
+                margin: 0;
+                overflow: visible;
+                padding: 0.5em 1em;
+            }
+
+            th {
+                font-family: $font-family-sans;
+                font-weight: 500;
+            }
+
+            td {
+                border-bottom: 1px solid #cbcbcb;
+            }
+
+            tbody > tr:last-child > td {
+                border-bottom-width: 0;
+            }
+
+            thead {
+                background-color: #e0e0e0;
+                color: #000;
+                text-align: left;
+                vertical-align: bottom;
+            }
+
+        }
     }
 
     pre {