Permalink
Browse files

Merged upstream

  • Loading branch information...
2 parents 47aca36 + d93ee7e commit bd047f830839db82678dfed84616b1dc623d3481 @beberlei beberlei committed Jan 29, 2012
Showing with 16 additions and 3 deletions.
  1. +1 −1 doctrine/layout.html
  2. +14 −1 doctrine/static/default.css
  3. +1 −1 doctrine/static/layout.css
View
@@ -175,7 +175,7 @@ <h3>{{ _('This Page') }}</h3>
<body>
<div id="wrapper">
<div id="header">
- <h1 id="h1title">Documentation</h1>
+ <h1 id="h1title"></h1>
<div id="logo">
<a href="/">Doctrine - PHP Database Libraries</a> </div>
</div>
@@ -977,6 +977,19 @@ div.jsactive pre
background: none repeat scroll 0 0 #f2f2f2;
float: right;
margin: 2em 0 2em 2em;
- padding: 1em;
+ padding: 0.5em;
width: 40%;
+ border: 1px solid #000;
+}
+
+#welcome-to-the-doctrine-project {
+ float: left;
+ width: 500px;
+}
+#latest-blog-posts {
+ width: 300px;
+ float: left;
+}
+#doctrine-projects {
+ clear: both;
}
@@ -23,7 +23,7 @@ a:hover { color: #00508c; text-decoration:underline; border:0; }
::selection { background: #2E6BC8; color: #fff; }
/* layout */
-#wrapper { width: 96%; min-width: 1000px; margin-left: auto; margin-right: auto; position: relative; }
+#wrapper { width: 96%; min-width: 1000px; max-width: 1150px; margin-left: auto; margin-right: auto; position: relative; }
#header { position:relative; background: transparent url(arrows.jpg) no-repeat top right;}
#header h1#h1title { margin: 0; padding: 0; color: #fff; position: absolute; top: 50px; right: 20px; font-weight:bold; font-size:153.9%; text-shadow: #4E89D5 1px 1px 1px; }
#header h1#h1title a { color: #fff; }

0 comments on commit bd047f8

Please sign in to comment.