浏览代码

[docs] Improved styles

Enrico Berti 12 年之前
父节点
当前提交
3d3ef2c1d9
共有 5 个文件被更改,包括 217 次插入201 次删除
  1. 10 4
      docs/Makefile
  2. 205 170
      docs/docbook.css
  3. 二进制
      docs/images/hue_logo.png
  4. 2 2
      docs/index.txt
  5. 0 25
      docs/sdk/sdk.md

+ 10 - 4
docs/Makefile

@@ -28,7 +28,7 @@ docs: $(BLD_DIR_DOC)
 NO_TOC := --xsltproc-opts='--stringparam generate.toc ""'
 
 #
-# Being lazy/loose with the prerequsite. Include all files except sdk and
+# Being lazy/loose with the prerequisite. Include all files except sdk and
 # release notes, which are handled separately below.
 #
 DOC_FILES := $(shell find . -name sdk -prune -o -name release-notes -name user-guide -o -print)
@@ -51,7 +51,13 @@ release-notes: $(BLD_DIR_DOC)/release-notes
 $(BLD_DIR_DOC)/release-notes: $(wildcard release-notes/*.txt)
 	@echo '--- Generating release notes at $@'
 	@mkdir -p $@
-	@for i in $? ; do asciidoc $$i ; done
+	@cp docbook.css $@
+	@cp docbook.css release-notes/
+	@for i in $? ; do \
+	  a2x --format=xhtml --stylesheet=docbook.css $$i ; \
+	  rm -f $$i.xml ; \
+	done;
+	@rm release-notes/docbook.css
 	@mv release-notes/*.html $@/
 	@echo "--- Generated $@"
 
@@ -63,9 +69,9 @@ $(BLD_DIR_DOC)/user-guide: $(wildcard user-guide/*.md)
 	@mkdir -p $@
 	@cp -r user-guide/images $@
 	@cp docbook.css $@
-	@for i in $? ; do PYTHONPATH=$(DESKTOP_DIR)/core/ext-py/markdown:$(DESKTOP_DIR)/core/ext-py/elementtree \
+	@for x in $? ; do PYTHONPATH=$(DESKTOP_DIR)/core/ext-py/markdown:$(DESKTOP_DIR)/core/ext-py/elementtree \
 	  $(DESKTOP_DIR)/core/ext-py/markdown/bin/markdown \
-	  $$i > $(BLD_DIR_DOC)/$$i ; done
+	  $$x > $(BLD_DIR_DOC)/$$x ; done
 	@rename 's/\.md/\.html/' $@/*.md
 	@echo "--- Generated $@"
 

+ 205 - 170
docs/docbook.css

@@ -1,233 +1,268 @@
+
 /* ---------------------------------------------------------------------------
-   Bare AsciiDoc styles
-   Ryan Tomayko <r@tomayko.com>
+   Hue Docs styles
 --------------------------------------------------------------------------- */
 
 body {
-	font-family:verdana,helvetica,arial,sans-serif;
-	font-size:81.25%;   /* 13px */
-	line-height:1.538;  /* 20px */
-	margin:40px 50px;
-	max-width:53.8461538462em; /* 790px */
-	color:#333;
-}
-
-em {
-	font-style:italic;
-}
-
-strong {
-	font-weight:bold;
-	color:#000;
-}
-
-tt {
-	font-family:consolas, 'lucida console', 'bitstream vera sans mono',
-	           'courier new', monospace;
-	color:#000;
-}
-
-p, ul, ol, dl {
-	margin:10px 0
-}
-
-dl {
-	margin-left:40px
-}
-
-dt {
-	font-weight:normal;
-	color:#000;
-}
-
-h1, h2, h3, h4, h5 {
-	font-family:'lucida grande',georgia,verdana,helvetica,arial,sans-serif;
-	font-weight:normal;
-	color:#000;
-}
-
-h1 {
-	font-size:30px;
-	line-height:1.428;
-	margin:20px 0;
+  background-color: #FFFFFF;
+  border-top: 3px solid #287DBD;
+  padding: 30px;
+  font-family: 'Open Sans',sans-serif;
+  color: #333333;
+  margin:0;
+  line-height: 1.1em;
+}
+
+hr {
+    border-color: #EEEEEE -moz-use-text-color #FFFFFF;
+    border-bottom: 1px solid #FFFFFF;
+    border-top: 1px solid #CCCCCC;
+    border-image: none;
+    border-left: 0 none;
+    border-right: 0 none;
+    margin: 20px 0;
+}
+
+.section {
+    border: 1px solid #EEEEEE;
+    box-shadow: none;
+    color: #333333;
+    margin-bottom: 20px;
+    margin-top: 15px;
+    padding: 20px;
+    padding-top: 5px;
+    position: relative;
+}
+
+.title, h1, .toc p, h2 {
+    color: #338BB8;
+    font-size: 24px;
+    font-weight: 600;
+    margin-bottom: 15px;
+    margin-top: 15px;
 }
 
 h2 {
-	font-size:23px;
-	line-height:1.36363636; /* repeating, of course */
-	margin:20px 0;
+  font-size: 20px;
+  margin-top: 24px;
 }
 
-h2 + .sectionbody {}
-
-h3 {
-	font-size:18px;
-	line-height:1.1;
-	margin:30px 0 10px 0;
+a:link, a:visited {
+    color: #338BB8;
+    text-decoration: none;
 }
-
-h4 {
-	font-size:13px;
-	font-weight:bold;
-	line-height:1.538;
+a:hover {
+    color: #3799CA;
+    text-decoration: underline;
 }
 
-h5 {
-	font-size:13px;
-	font-style:italic;
-	line-height:1.538;
+.table {
+  margin-top: 20px;
 }
 
-pre {
-	font-size:larger;
+table {
+  border: none!important;
 }
 
-#header { 
-	text-align:center;
-	margin-bottom:30px;
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
 
-#header h1 { margin-bottom:0 }
-
-
-/*.title, .sidebar-title {
-	font-weight:normal;
-	margin-bottom:0;
-}*/
-
-.admonitionblock .title {
-	font-weight:bold;
+table {
+  width: 100%;
+  margin-bottom: 20px;
 }
 
-.admonitionblock {
-	margin:30px 0px;
-	color:#555;
+table th,
+table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #e5e5e5;
 }
 
-.admonitionblock td.icon {
-	width:30px;
-	padding-right:20px;
-	padding-left:20px;
-	text-transform:uppercase;
-	font-weight:bold;
-	color:#888;
+table th {
+  font-weight: bold;
 }
 
-.listingblock .content {
-	border:1px solid silver;
-	background:#eee;
-	padding:5px;
+table thead th {
+  vertical-align: bottom;
 }
 
-.listingblock .content pre {
-	margin:0;
+table caption + thead tr:first-child th,
+table caption + thead tr:first-child td,
+table colgroup + thead tr:first-child th,
+table colgroup + thead tr:first-child td,
+table thead:first-child tr:first-child th,
+table thead:first-child tr:first-child td {
+  border-top: 0;
 }
 
-.literalblock .content {
-	margin-left:40px;
+table tbody + tbody {
+  border-top: 2px solid #e5e5e5;
 }
 
-.verseblock .content {
-	white-space:pre
+table {
+  background-color: #f1f1f1;
 }
 
-.sidebarblock .sidebar-content {
-	border:1px solid silver;
-	background:#FFFFEE;
-	padding:0 10px;
-	color:#222;
-	font-size:smaller;
-	line-height:1.5;
+table {
+  border: 1px solid #e5e5e5;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 2px;
+     -moz-border-radius: 2px;
+          border-radius: 2px;
 }
 
-.sidebar-title {
-	margin:10px 0;
-	font-weight:bold;
-	color:#442;
+table th,
+table td {
+  border-left: 1px solid #e5e5e5;
+  border-bottom: 1px solid #FFFFFF!important;
 }
 
-.quoteblock-content {
-	font-style:italic;
-	color:#444;
-	margin-left:40px;
+table caption + thead tr:first-child th,
+table caption + tbody tr:first-child th,
+table caption + tbody tr:first-child td,
+table colgroup + thead tr:first-child th,
+table colgroup + tbody tr:first-child th,
+table colgroup + tbody tr:first-child td,
+table thead:first-child tr:first-child th,
+table tbody:first-child tr:first-child th,
+table tbody:first-child tr:first-child td {
+  border-top: 0;
 }
 
-.quoteblock-content .attribution {
-	font-style:normal;
-	text-align:right;
-	color:#000;
+table thead:first-child tr:first-child > th:first-child,
+table tbody:first-child tr:first-child > td:first-child,
+table tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 2px;
+          border-top-left-radius: 2px;
+  -moz-border-radius-topleft: 2px;
 }
 
-.exampleblock-content *:first-child { margin-top:0 }
-.exampleblock-content {
-	border-left:2px solid silver;
-	padding-left:8px;
+table thead:first-child tr:first-child > th:last-child,
+table tbody:first-child tr:first-child > td:last-child,
+table tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 2px;
+          border-top-right-radius: 2px;
+  -moz-border-radius-topright: 2px;
 }
 
-#footer {
-	font-size:11px;
-	margin-top:40px;
-	border-top:1px solid silver;
-	color:#555;
+table thead:last-child tr:last-child > th:first-child,
+table tbody:last-child tr:last-child > td:first-child,
+table tbody:last-child tr:last-child > th:first-child,
+table tfoot:last-child tr:last-child > td:first-child,
+table tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 2px;
+          border-bottom-left-radius: 2px;
+  -moz-border-radius-bottomleft: 2px;
 }
 
-#author {
-	color:#000;
-	text-transform:uppercase
+table thead:last-child tr:last-child > th:last-child,
+table tbody:last-child tr:last-child > td:last-child,
+table tbody:last-child tr:last-child > th:last-child,
+table tfoot:last-child tr:last-child > td:last-child,
+table tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 2px;
+          border-bottom-right-radius: 2px;
+  -moz-border-radius-bottomright: 2px;
 }
 
-/* ---------------------------------------------------------------------------
-   FreeBSD AsciiDoc Theme
-   Ryan Tomayko <r@tomayko.com>
-
-   Based on The FreeBSD Handbook and various other FreeBSD documenration.
---------------------------------------------------------------------------- */
-
-body {
-  font-family:serif;
-  font-size:100%;
-  color:#000;
+table tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+          border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
 }
 
-tt { color:#007A00 }
-pre tt { color:#000 }
-
-dt { color:#000 }
+table tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+          border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+}
 
-/* TODO: find out why docbook tables are not 100% */
-table {
-   width:100%;
+table caption + thead tr:first-child th:first-child,
+table caption + tbody tr:first-child td:first-child,
+table colgroup + thead tr:first-child th:first-child,
+table colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 2px;
+          border-top-left-radius: 2px;
+  -moz-border-radius-topleft: 2px;
 }
 
-h1, h2, h3, h4, h5, .NAVHEADER {
-  font-family:'lucida grande',helvetica,verdana,sans-serif;
-  color:#148BCF;
-  font-weight:bold;
+table caption + thead tr:first-child th:last-child,
+table caption + tbody tr:first-child td:last-child,
+table colgroup + thead tr:first-child th:last-child,
+table colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 2px;
+          border-top-right-radius: 2px;
+  -moz-border-radius-topright: 2px;
 }
 
-#header {
-  text-align:left;
+table tbody > tr:nth-child(odd) > td,
+table tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
 }
-#header h1 { margin-bottom:40px }
 
-h1 {
-  font-size:36px;
-  line-height:1;
-  margin:40px 0;
+table tbody tr:hover > td,
+table tbody tr:hover > th {
+  background-color: #ffffff;
 }
 
-h2 {
-  font-size:28px;
-  line-height:1;
-  margin:30px 0 20px 0;
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 11px;
+  color: #444444;
+  -webkit-border-radius: 3px;
+     -moz-border-radius: 3px;
+          border-radius: 3px;
 }
 
-.sectionbody {
-  margin-left:30px;
+code {
+  padding: 2px 4px;
+  color: #d14;
+  white-space: nowrap;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
 }
 
 pre {
-  background:#EEE;
+  display: block;
+  padding: 9.5px;
+  margin: 14px;
+  font-size: 12px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 2px;
+     -moz-border-radius: 2px;
+          border-radius: 2px;
+}
+
+.toc .section {
+  border: none;
+}
+
+.toc {
+  background-color: #F6F6F6;
+  padding: 10px;
+}
+
+.note {
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  border-left-width: 5px;
+  padding: 10px;
 }
-
-/* vim: set ft=css ts=4 sw=4 noexpandtab: */

二进制
docs/images/hue_logo.png


+ 2 - 2
docs/index.txt

@@ -1,5 +1,5 @@
-Hue
-===
+image:images/hue_logo.png[Hue Logo]
+===================================
 
 Installation
 ------------

+ 0 - 25
docs/sdk/sdk.md

@@ -1,31 +1,6 @@
 
 <link rel="stylesheet" href="docbook.css" type="text/css" media="screen" title="no title" charset="utf-8"></link>
 
-<style>
-.note {
-  margin: 2em ;
-  border: medium outset ;
-  padding: 1em
-}
-pre {
-  font-size: 10px;
-  font-family: monico, courier;
-  overflow: auto;
-  padding: 8px;
-}
-img {
-  border: 1px solid #999;
-  margin: 10px;
-}
-h6 {
-  color:#148BCF;
-  font-family:'lucida grande',helvetica,verdana,sans-serif;
-  font-weight:bold;
-  font-size: 12px;
-  font-style:italic;
-}
-</style>
-
 Hue SDK Documentation
 =====================