website Changeset - 1fa2a78cbec9 · Conservancy Kallithea

Changeset - 1fa2a78cbec9

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

Bradley Kuhn (bkuhn) - 12 years ago 2012-04-30 15:27:13
bkuhn@ebb.org

Merge commit 'refs/merge-requests/3' of git://gitorious.org/conservancy/website into merge-requests/denver

I originally had those settings that Denver's changed because of a
tutorial I read about handling a sidebar suggested them. I've accepted
Denver's change, but am concerned that some browsers may not work.

1 file changed with 1 insertions and 9 deletions:

www/conservancy/static/conservancy.css

0 comments (0 inline, 0 general)

www/conservancy/static/conservancy.css

➞

Show inline comments

@@ ... / @@ -77,32 +77,28 @@ h3 { margin-top: .6em; margin-bottom: .4em; } @@
     margin-left: 50px;
     margin-right: 50px;
+}
 #container {
     width: 100%;
     overflow: hidden;
+}
 #container #mainContent {
     background: #fffff;
     margin-left: 210px;
     margin-right: 50px;
     padding-bottom: 32767px;
     margin-bottom: -32767px;
+}
 #container #sidebar {
     width: 200px;
     float: left;
     padding-bottom: 32767px;
     margin-bottom: -32767px;
     background-color: #ccd4a3;
+}
 #container #sidebar li {
     text-align: center;
     list-style: none;
     padding: 3px 10px 3px 10px;
     margin: 5px;
     border: 1px solid #CCC;
     background: #fff url(/img/nav-bg.png) bottom repeat-x;
+}
 #container #sidebar li:hover a { background: #3b6337; color: #fff; }
@@ ... / @@ -138,32 +134,28 @@ h3 { margin-top: .6em; margin-bottom: .4em; } @@
 #navbar li ul li { float: none; }
 #navbar li ul li a { border: 0px; margin: 0px; }
 .shaded { background: #F0FFB8; padding: .1em .5em; margin-bottom: .5em; }
 .columns {
     width: 100%;
     overflow: hidden;
+}
 .column-small {
     width: 31%;
     padding-bottom: 32767px;
     margin-bottom: -32767px;
+ }
 .column-large {
     margin-left: 35%;
     margin-right: 50px;
     padding-bottom: 32767px;
     margin-bottom: -32767px;
+}
 .column-left { float: left; }
 .column-right { float: right; }
 .column h2 { font-size: 1.25em; }
 .column h3 { font-size: 1.1em; }
 .column hr { width: 50%; align: center; }
 .column h2 a { text-decoration: none; color: #000000; }
 .column h2 a:hover { text-decoration: underline; }
@@ ... / @@ -228,13 +220,13 @@ span.subsubsectionToc { padding-left: 6em;} @@
 .js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; }
 body.conservancy-overview #navbar ul li.overview a,
 body.conservancy-Members #navbar ul li.Members a,
 body.conservancy-news #navbar ul li.news a,
 body.conservancy-blog #navbar ul li.blog a,
 body.conservancy-About #navbar ul li.About a,
 body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */
+{
     color: #000033;
     font-weight: bold;
     background: #fff url(/img/nav-bg-up.png) top repeat-x;
+}
@@ ... / \ No newline at end of file @@
+}

0 comments (0 inline, 0 general)