[cc-commits] [CC SVN] r11403 - in ccwordpress/branches/production: . www/wp-content/themes/cc4
webmaster at creativecommons.org
webmaster at creativecommons.org
Thu Dec 11 15:22:51 EST 2008
Author: bse
Date: 2008-12-11 20:22:50 +0000 (Thu, 11 Dec 2008)
New Revision: 11403
Modified:
ccwordpress/branches/production/
ccwordpress/branches/production/www/wp-content/themes/cc4/style.css
Log:
Merged revisions 11279,11362 via svnmerge from
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk
........
r11279 | bse | 2008-11-18 18:11:13 +0000 (Tue, 18 Nov 2008) | 2 lines
Forced page width to 875px; May adjust this.
........
r11362 | bse | 2008-12-03 18:48:29 +0000 (Wed, 03 Dec 2008) | 2 lines
Fixed an annoying spacing issue with the columns.
........
Property changes on: ccwordpress/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
- /ccwordpress/trunk:1-8278,8280-8284,8286,8288-8296,8298-8311,8313-8435,8437-8453,8455-8471,8473-8499,8501-8502,8504-8509,8511-8514,8516-8518,8520-8576,8578-8601,8604-8655,8657-8663,8665-8671,8673-8694,8696-9095,9097-9115,9117,9119-9122,9125-9132,9134-9465,9467-9612,9615-9627,9629-9643,9645-9659,9661-9687,9689-9712,9733,9769,9771,9775,9809-9810,9813,9820,9832-9838,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10539,10541,10545-10582,10584-10600,10602-10638,10640-10734,10736,10784,10787,10822,10842,10868,10895,10913,10927,10938-11077,11079-11200,11219,11221,11224-11225,11306,11316,11332,11334,11352,11354,11361,11399,11401
+ /ccwordpress/trunk:1-8278,8280-8284,8286,8288-8296,8298-8311,8313-8435,8437-8453,8455-8471,8473-8499,8501-8502,8504-8509,8511-8514,8516-8518,8520-8576,8578-8601,8604-8655,8657-8663,8665-8671,8673-8694,8696-9095,9097-9115,9117,9119-9122,9125-9132,9134-9465,9467-9612,9615-9627,9629-9643,9645-9659,9661-9687,9689-9712,9733,9769,9771,9775,9809-9810,9813,9820,9832-9838,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10539,10541,10545-10582,10584-10600,10602-10638,10640-10734,10736,10784,10787,10822,10842,10868,10895,10913,10927,10938-11077,11079-11200,11219,11221,11224-11225,11279,11281-11284,11286-11359,11361-11362,11399,11401
Modified: ccwordpress/branches/production/www/wp-content/themes/cc4/style.css
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc4/style.css 2008-12-09 19:41:56 UTC (rev 11402)
+++ ccwordpress/branches/production/www/wp-content/themes/cc4/style.css 2008-12-11 20:22:50 UTC (rev 11403)
@@ -11,8 +11,8 @@
body { background-color: #fff; color: #333; font: 12px verdana, sans-serif !important; line-height: 1.5em !important; text-align: center; }
-.box { text-align: left; margin: 0 auto; width: 91%; min-width: 765px; max-width: 1000px; } /* replaces #wrapper */
-.content-box { float: left; padding-top: 1.5em;/* border-top: 1px solid #ddd;*/ margin-right: 1%; overflow: hidden; }
+.box { text-align: left; margin: 0 auto; width: 875px; }
+.content-box { float: left; padding-top: 1.5em;/* border-top: 1px solid #ddd; margin-right: 1%;*/ overflow: hidden; }
.content-box-right { float: right; padding-top: 1.5em;/* border-top: 1px solid #ddd;*/ margin-left: 1%; overflow: hidden; }
.clear { height: 0px !important; clear: both; }
@@ -56,8 +56,8 @@
#splash { position: relative; background-color: /*#0f2700*/ #fff; color: #707070; margin: 0px 0 3px 0; padding-bottom: 6px; overflow: hidden;}
#splash #blurb { margin: 0 0 28px 0; padding: 0 15px; font-size: 65%; color: #505050; }
#content { padding: 0.5em 0; margin-bottom: 20px;}
-#main-content { float: left; width: 83%; padding-bottom: 35px; }
- #alpha, #blog { width: 67%; } /* + .content-box */ /* #blog and #features - Deprecated, use #alpha and #beta respectively */
+#main-content { float: left; width: 82%; padding-bottom: 35px; }
+ #alpha, #blog { width: 70.5%; } /* + .content-box */ /* #blog and #features - Deprecated, use #alpha and #beta respectively */
#beta, #features { width: 29%; margin-left: 0.5%; z-index:-100;} /* + .content-box */
/* DEPRECATED */ #page { width: 99%; } /* + .content-box */
@@ -138,7 +138,7 @@
#main-content .feature { border-bottom: 1px solid #ddd; padding-bottom: 30px; margin-bottom: 25px; }
#beta h4 { padding-left: 2%; }
-.block { clear: both; margin-bottom: 35px; padding-left: 1%; padding-right: 10%; }
+.block { clear: both; margin-bottom: 35px; padding-left: 1%; }
#blog .block, #alpha .block { margin-bottom: 33px; }
#features .block, #beta .block { padding: 0 5px; }
@@ -174,7 +174,7 @@
font-weight: bold;
}
-#title { border-bottom: 1px solid #e0e0e0; margin-right: 1em; margin-top: 0.8em; }
+#title { border-bottom: 1px solid #e0e0e0; margin-top: 0.8em; }
#title h1 { margin-top: 1.5em; }
#title h2, .title h1 { padding: 0 1.5em 0.27em 0; margin: 0;}
#title h2.tagline { /* color: #92534e;*/ color: #b82e00;}
@@ -241,7 +241,7 @@
.rss .rss-title { margin-right: 64px; }
.rss p { margin: 0; clear: both; }
-.page { padding-right: 5% !important; }
+.page { }
#blog .block, #features .page, #alpha .block, #alpha .page { padding-right: 2% !important; }
@@ -404,3 +404,55 @@
margin-top: 1em;
margin-left: 0.4em;
}
+
+
+ .attribute_blurb {
+ overflow: auto;
+ margin-bottom: 2.5em;
+ padding: 10px;
+ background-color: #f4f9e7;
+ -moz-border-radius: 10px;
+ }
+ .attributes {
+ width: 154px;
+ padding: 0 2% 0 0;
+ float: left;
+ height: 200px;
+ }
+ .attributes img {
+ float: left;
+ margin: 0 8px 10px 0;
+ }
+ .attributes p {
+ clear:left;
+ border-top:1px solid #ccc;
+ padding-top: 0.5em;
+ }
+
+ #license_blurbs {
+ /* border-top: 1px solid #ddd;*/
+ position: relative;
+ }
+
+ .license_blurb {
+ margin: 2em 3.5em 3em 0;
+ padding-bottom: 1.25em;
+ border-bottom: 1px solid #ddd;
+ }
+ .license_blurb h2 {
+ margin-left: 100px;
+ margin-bottom: 1em;
+ font-size: 150% !important;
+ }
+
+ .license_blurb img {
+ float: left;
+ }
+ .license_blurb p {
+ clear: left;
+ }
+
+ .license_blurb .deed_links {
+ font-size: 90%;
+ }
+
More information about the cc-commits
mailing list