Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:TurboGears/tgwebsite

  • Loading branch information...
commit 3e4d65809bbca6befc63cc4c5e40f8bf2d22c285 2 parents 2710c9c + 259103d
@pedersen pedersen authored
View
8 src/documentation.rst
@@ -8,11 +8,13 @@ After that, if your answer is not there, we recommend you check out the older do
To install the current version of TurboGears, please review the `2.2 Installation`_ document. For doing more, please review `the book`_ and then the general index for `2.2 documentation`_.
-|batteriesincluded| `TurboGears2 Web Apps: Batteries Included`_
+.. rst-class:: doclink
-|tgdocs| `TurboGears 2.2 Documentation`_
+ |batteriesincluded| `TurboGears2 Web Apps: Batteries Included`_
-|tutorials| `CheatSheet`_ and `Poster`_
+ |tgdocs| `TurboGears 2.2 Documentation`_
+
+ |tutorials| `CheatSheet`_ and `Poster`_
We have several older versions of TurboGears, and we continue to support all of them. As such, we also have several older versions of the documentation. While we will eventually reduce the 2.x documentation into a single set, we are not yet ready for this.
View
20 src/index.rst
@@ -1,15 +1,15 @@
+.. include:: welcome/sidebar.rst
+
##########################
TurboGears Web Framework
##########################
-.. include:: welcome/sidebar.rst
-
-*********************************************************
- The next generation web framework that scales with you.
-*********************************************************
-
TurboGears will help you to create a database-driven, ready-to-extend application in minutes. All with code that is `as natural as writing a function`_, `designer friendly templates`_, easy `AJAX`_ on the `browser side`_ and on the `server side`_ and with an incredibly powerful and flexible `Object Relational Mapper (ORM)`_.
+.. rst-class:: googleplus
+
+Follow on `Google+`_ for the latest news!
+
***************
Give It a Try
***************
@@ -28,11 +28,9 @@ TurboGears will help you to create a database-driven, ready-to-extend applicatio
Get started Learning TurboGears 2 by looking at our famous `wiki tutorial`_.
-Follow on `Google+`_ for the latest news.
-
-############################################
- A new Generation in dynamic web frameworks
-############################################
+#########################################################
+The next generation web framework that scales with you.
+#########################################################
TurboGears 2 is built on top of the experience of several next generation web frameworks including TurboGears 1 (of course), Django, and Rails. All of these frameworks had limitations that frustrated us, and TG2 was built as an answer to that frustration. We wanted something that had:
View
39 src/themes/w3/static/tg.css_t
@@ -25,8 +25,8 @@ body {
padding: 0;
text-align: left;
font-size: 15px;
- font-family:arial,"Arial",geneva,verdana,sans-serif;
line-height: 1.5em;
+ font-family:arial,"Arial",geneva,verdana,sans-serif;
color: {{ theme_textcolor }};
background-color: {{ theme_bgcolor }};
text-rendering: optimizeSpeed;
@@ -227,6 +227,7 @@ div.body h6 {
border-bottom: 1px solid #ccc;
margin: 20px -20px 10px -20px;
padding: 3px 0 3px 10px;
+ line-height: 1.0;
}
div.body h1 { margin-top: 0; font-size: 200%; }
@@ -250,7 +251,7 @@ a.headerlink:hover {
div.body p, div.body dd, div.body li {
text-align: justify;
- line-height: 130%;
+ line-height: 1.3;
}
div.admonition p.admonition-title + p {
@@ -298,10 +299,10 @@ p.admonition-title:after {
pre {
padding: 10px;
- background-color: lightgray;
+ background-color: white;
color: {{ theme_codetextcolor }};
- line-height: 120%;
- font-size: 110%;
+ line-height: 17px;
+ font-size: 14px;
border: 2px solid #C6C9CB;
border-left: none;
border-right: none;
@@ -588,11 +589,21 @@ ul#mainmenu li span.hoverfirstitem {
font-weight: bold;
}
+.sidebar+.section>ul,
+.sidebar+.section>p,
+.sidebar+.section>blockquote {
+ margin-left: 260px;
+}
+
+.sidebar+.section+.section {
+ clear: left;
+}
+
.sidebar
{
margin: 0 0 0.5em 1em;
border: 1px solid #ddb;
- padding: 7px 7px 0 7px;
+ padding: 7px 7px 14px 7px;
background-color: #ffe;
width: 215px;;
float: left;
@@ -603,6 +614,7 @@ ul#mainmenu li span.hoverfirstitem {
.sidebar p
{
display: none;
+ text-align: left;
}
.sidebar ul
@@ -616,6 +628,7 @@ ul#mainmenu li span.hoverfirstitem {
{
display: block;
margin: 0;
+ text-align: left;
}
.sidebar ul li a
@@ -671,3 +684,17 @@ ul#mainmenu li span.hoverfirstitem {
background: url('images/featurebar_selectedbg.jpg') 0px -20px no-repeat;
width: 139px;
}
+
+.googleplus {
+ font-size: 110%;
+ font-style: italic;
+}
+
+.doclink>img {
+ vertical-align: middle;
+}
+
+.doclink>a {
+ margin-left: 10px;
+ font-size: 120%;
+}
View
4 src/themes/w3/theme.conf
@@ -30,8 +30,8 @@ textcolor = #050303
headbgcolor = #f2cf8c
headtextcolor = #050303
headlinkcolor = #321419
-linkcolor = #321419
-visitedlinkcolor = #8c8271
+linkcolor = #BE7E00
+visitedlinkcolor = #BE7E00
codebgcolor = #ffffff
codetextcolor = #322d2b
Please sign in to comment.
Something went wrong with that request. Please try again.