From f6cc0a1f11288be0b51efdd84961aaf88fae2c28 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Fri, 26 Nov 2010 23:11:40 -0500 Subject: Updated docs for new theme --- docs/_static/pylons.png | Bin 0 -> 4063 bytes docs/_static/pyramid.png | Bin 4063 -> 0 bytes docs/conf.py | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 docs/_static/pylons.png delete mode 100644 docs/_static/pyramid.png (limited to 'docs') diff --git a/docs/_static/pylons.png b/docs/_static/pylons.png new file mode 100644 index 000000000..53f83e4d0 Binary files /dev/null and b/docs/_static/pylons.png differ diff --git a/docs/_static/pyramid.png b/docs/_static/pyramid.png deleted file mode 100644 index 53f83e4d0..000000000 Binary files a/docs/_static/pyramid.png and /dev/null differ diff --git a/docs/conf.py b/docs/conf.py index e520c9d82..653f7ab15 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -128,11 +128,11 @@ html_theme = 'pylons' html_title = 'The Pyramid Web Application Development Framework v%s' % release # A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None +html_short_title = 'Home' # The name of an image file (within the static path) to place at the top of # the sidebar. -#html_logo = '_static/pylons.png' +html_logo = '_static/pyramid.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 @@ -201,7 +201,7 @@ latex_documents = [ # The name of an image file (relative to this directory) to place at the top of # the title page. -latex_logo = '_static/pyramid.png' +latex_logo = '_static/pylons_small.png' # For "manual" documents, if this is true, then toplevel headings are parts, # not chapters. -- cgit v1.2.3 From ab1a86aadceb4bac6244a2b43a959be70cab4f18 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 27 Nov 2010 00:57:19 -0500 Subject: add dummy pylons_small.png to allow latex to compile --- docs/_static/pylons_small.png | Bin 0 -> 4063 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/_static/pylons_small.png (limited to 'docs') diff --git a/docs/_static/pylons_small.png b/docs/_static/pylons_small.png new file mode 100644 index 000000000..53f83e4d0 Binary files /dev/null and b/docs/_static/pylons_small.png differ -- cgit v1.2.3 From 4d76ed6f46304d43a6b95da7a4d5388527bf6c1e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 27 Nov 2010 01:00:00 -0500 Subject: typo fix --- docs/narr/introduction.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/narr/introduction.rst b/docs/narr/introduction.rst index 725d32725..7c725690d 100644 --- a/docs/narr/introduction.rst +++ b/docs/narr/introduction.rst @@ -103,7 +103,7 @@ What Is The Pylons Project? --------------------------- :app:`Pyramid` is a member of the collection of software published under the -Pylons Project. :Pylons software is written by a loose-knit community of +Pylons Project. Pylons software is written by a loose-knit community of contributors. The `Pylons Project website `_ includes details about how :app:`Pyramid` relates to the Pylons Project. -- cgit v1.2.3 From 5aa4a3272b4bacb913a0dd48439d507f7f107d19 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 27 Nov 2010 09:15:21 -0500 Subject: Updated MyProject template + snapshot in narrative doc --- docs/narr/MyProject/myproject/__init__.py | 1 + docs/narr/MyProject/myproject/static/footerbg.png | Bin 0 -> 333 bytes docs/narr/MyProject/myproject/static/headerbg.png | Bin 0 -> 203 bytes docs/narr/MyProject/myproject/static/ie6.css | 8 ++++ docs/narr/MyProject/myproject/static/logo.png | Bin 6641 -> 0 bytes docs/narr/MyProject/myproject/static/middlebg.png | Bin 0 -> 2797 bytes docs/narr/MyProject/myproject/static/pylons.css | 47 +++++++++------------ docs/narr/MyProject/myproject/static/pyramid.png | Bin 0 -> 33055 bytes .../MyProject/myproject/static/transparent.gif | Bin 0 -> 49 bytes .../MyProject/myproject/templates/mytemplate.pt | 25 +++++------ docs/narr/project.png | Bin 81057 -> 92135 bytes 11 files changed, 39 insertions(+), 42 deletions(-) create mode 100644 docs/narr/MyProject/myproject/static/footerbg.png create mode 100644 docs/narr/MyProject/myproject/static/headerbg.png create mode 100644 docs/narr/MyProject/myproject/static/ie6.css delete mode 100644 docs/narr/MyProject/myproject/static/logo.png create mode 100644 docs/narr/MyProject/myproject/static/middlebg.png create mode 100644 docs/narr/MyProject/myproject/static/pyramid.png create mode 100644 docs/narr/MyProject/myproject/static/transparent.gif (limited to 'docs') diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py index 580dfe546..936404c82 100644 --- a/docs/narr/MyProject/myproject/__init__.py +++ b/docs/narr/MyProject/myproject/__init__.py @@ -10,3 +10,4 @@ def main(global_config, **settings): renderer='myproject:templates/mytemplate.pt') config.add_static_view('static', 'myproject:static') return config.make_wsgi_app() + diff --git a/docs/narr/MyProject/myproject/static/footerbg.png b/docs/narr/MyProject/myproject/static/footerbg.png new file mode 100644 index 000000000..1fbc873da Binary files /dev/null and b/docs/narr/MyProject/myproject/static/footerbg.png differ diff --git a/docs/narr/MyProject/myproject/static/headerbg.png b/docs/narr/MyProject/myproject/static/headerbg.png new file mode 100644 index 000000000..0596f2020 Binary files /dev/null and b/docs/narr/MyProject/myproject/static/headerbg.png differ diff --git a/docs/narr/MyProject/myproject/static/ie6.css b/docs/narr/MyProject/myproject/static/ie6.css new file mode 100644 index 000000000..b7c8493d8 --- /dev/null +++ b/docs/narr/MyProject/myproject/static/ie6.css @@ -0,0 +1,8 @@ +* html img, +* html .png{position:relative;behavior:expression((this.runtimeStyle.behavior="none")&&(this.pngSet?this.pngSet=true:(this.nodeName == "IMG" && this.src.toLowerCase().indexOf('.png')>-1?(this.runtimeStyle.backgroundImage = "none", +this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.src + "',sizingMethod='image')", +this.src = "static/transparent.gif"):(this.origBg = this.origBg? this.origBg :this.currentStyle.backgroundImage.toString().replace('url("','').replace('")',''), +this.runtimeStyle.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + this.origBg + "',sizingMethod='crop')", +this.runtimeStyle.backgroundImage = "none")),this.pngSet=true) +);} +#wrap{display:table;height:100%} diff --git a/docs/narr/MyProject/myproject/static/logo.png b/docs/narr/MyProject/myproject/static/logo.png deleted file mode 100644 index 88f5d9865..000000000 Binary files a/docs/narr/MyProject/myproject/static/logo.png and /dev/null differ diff --git a/docs/narr/MyProject/myproject/static/middlebg.png b/docs/narr/MyProject/myproject/static/middlebg.png new file mode 100644 index 000000000..2369cfb7d Binary files /dev/null and b/docs/narr/MyProject/myproject/static/middlebg.png differ diff --git a/docs/narr/MyProject/myproject/static/pylons.css b/docs/narr/MyProject/myproject/static/pylons.css index c153be07f..33b21ac1a 100644 --- a/docs/narr/MyProject/myproject/static/pylons.css +++ b/docs/narr/MyProject/myproject/static/pylons.css @@ -4,34 +4,23 @@ body{line-height:1;} ol,ul{list-style:none;} blockquote,q{quotes:none;} blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;} -/* remember to define focus styles! */ :focus{outline:0;} -/* remember to highlight inserts somehow! */ ins{text-decoration:none;} del{text-decoration:line-through;} -/* tables still need 'cellspacing="0"' in the markup */ table{border-collapse:collapse;border-spacing:0;} -/* restyling */ sub{vertical-align:sub;font-size:smaller;line-height:normal;} sup{vertical-align:super;font-size:smaller;line-height:normal;} -/* lists */ ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;} ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;} li{display:list-item;} -/* nested lists have no top/bottom margins */ ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;} -/* 2 deep unordered lists use a circle */ ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;} -/* 3 deep (or more) unordered lists use a square */ ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;} .hidden{display:none;} p{line-height:1.5em;} -h1{font-size:1.75em;/* 28px */ -line-height:1.7em;font-family:helvetica,verdana;} -h2{font-size:1.5em;/* 24px */ -line-height:1.7em;font-family:helvetica,verdana;} -h3{font-size:1.25em;/* 20px */ -line-height:1.7em;font-family:helvetica,verdana;} +h1{font-size:1.75em;line-height:1.7em;font-family:helvetica,verdana;} +h2{font-size:1.5em;line-height:1.7em;font-family:helvetica,verdana;} +h3{font-size:1.25em;line-height:1.7em;font-family:helvetica,verdana;} h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;} html,body{width:100%;height:100%;} body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;} @@ -42,23 +31,25 @@ body h2, body h3, body h4, body h5, -body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;} -#wrap {min-height: 100%;} -#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;} -#header{background-color:#e88f00;top:0;font-size:14px;} -#footer{background-color:#000000;bottom:0;position: relative;margin-top:-40px;clear:both;} -.header,.footer{width:700px;margin-right:auto;margin-left:auto;} +body h6{font-family:"Neuton","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#373839;font-style:normal;} +#wrap{min-height:100%;} +#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;vertical-align:middle;} +#header{background:#000000;top:0;font-size:14px;} +#footer{bottom:0;background:#000000 url(footerbg.png) repeat-x 0 top;position:relative;margin-top:-40px;clear:both;} +.header,.footer{width:750px;margin-right:auto;margin-left:auto;} .wrapper{width:100%} #top,#bottom{width:100%;} -#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;} -#bottom{color:#222;background-color:#ffffff;overflow:hidden;padding-bottom:80px;} -.top,.bottom{width:700px;margin-right:auto;margin-left:auto;} -.top{padding-top:100px;} +#top{color:#000000;height:230px; +background:#ffffff url(headerbg.png) repeat-x 0 top;position:relative;} +#bottom{color:#222;background-color:#ffffff;} +.top,.middle,.bottom{width:750px;margin-right:auto;margin-left:auto;} +.top{padding-top:40px;} +#middle{width:100%;height:100px;background:url(middlebg.png) repeat-x;border-top:2px solid #ffffff;border-bottom:2px solid #b2b2b2;} .app-welcome{margin-top:25px;} .app-name{color:#000000;font-weight:bold;} .bottom{padding-top:50px;} -#left{width:325px;float:left;padding-right:25px;} -#right{width:325px;float:right;padding-left:25px;} +#left{width:350px;float:left;padding-right:25px;} +#right{width:350px;float:right;padding-left:25px;} .align-left{text-align:left;} .align-right{text-align:right;} .align-center{text-align:center;} @@ -67,7 +58,7 @@ ul.links li{list-style-type:none;font-size:14px;} form{border-style:none;} fieldset{border-style:none;} input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;} -input[type=text]{} +input[type=text]{width:205px;} input[type=submit]{background-color:#ddd;font-weight:bold;} /*Opera Fix*/ -body:before {content:"";height:100%;float:left;width:0;margin-top:-32767px;} +body:before{content:"";height:100%;float:left;width:0;margin-top:-32767px;} diff --git a/docs/narr/MyProject/myproject/static/pyramid.png b/docs/narr/MyProject/myproject/static/pyramid.png new file mode 100644 index 000000000..347e05549 Binary files /dev/null and b/docs/narr/MyProject/myproject/static/pyramid.png differ diff --git a/docs/narr/MyProject/myproject/static/transparent.gif b/docs/narr/MyProject/myproject/static/transparent.gif new file mode 100644 index 000000000..0341802e5 Binary files /dev/null and b/docs/narr/MyProject/myproject/static/transparent.gif differ diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 6ad23d44f..02fc00eeb 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -7,21 +7,21 @@ + -
-
- +
pyramid
+
+
+
+

Welcome to ${project}, an application generated by
the Pyramid web application development framework. @@ -31,21 +31,18 @@

-

Search Pyramid documentation

+

Search documentation

- +