[ckan-changes] commit/ckanextiati: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Fri Jun 10 07:24:15 UTC 2011
2 new changesets in ckanextiati:
http://bitbucket.org/okfn/ckanextiati/changeset/5ddb75b0e5e6/
changeset: 5ddb75b0e5e6
user: sebbacon
date: 2011-06-10 09:22:59
summary: general stylesheet changes from Nick
affected #: 13 files (279.9 KB)
--- a/public/css/iati.css Fri Jun 10 08:20:13 2011 +0100
+++ b/public/css/iati.css Fri Jun 10 07:22:59 2011 +0000
@@ -112,8 +112,8 @@
}
h1, h2, h3, h4, h5, h6 {
- color: #26237B !important;
- font-weight: bold;
+ color: #2C4F87 !important;
+ font-weight: normal;
}
div#branding h1#site-title a {
@@ -241,6 +241,8 @@
border-top: 0px solid;
}
+/*
+COMMENTED OUT - Nick Mason 10/6/2011 - Better to have default styles here
#package-search .search {
width: 100%;
border: 1px solid #ccc;
@@ -248,6 +250,7 @@
padding: 0.3em;
margin-bottom: 0.1em;
}
+*/
#package-search .facets {
margin-top: 0.8em;
@@ -262,11 +265,15 @@
margin: 0px;
}
+
+/*
+COMMENTED OUT - Nick Mason 10/6/2011 - Better to have default styles here
#package-search .facets select {
border: 0px solid #BBE3F7;
font-size: 0.9em;
padding: 0.0em;
}
+*/
#package-search .button {
float: right;
--- a/public/css/overrides.css Fri Jun 10 08:20:13 2011 +0100
+++ b/public/css/overrides.css Fri Jun 10 07:22:59 2011 +0000
@@ -1,3 +1,5 @@
+/*-------- Page/Header layout --------*/
+
#wrapper {
padding:0px;
margin:0px;
@@ -14,6 +16,35 @@
height:20px;
}
+#topbar ul {
+ width:940px;
+ margin:0px auto;
+ display:block;
+}
+
+#topbar ul li {
+ float:right;
+ list-style-type:none;
+ text-transform:uppercase;
+ border-right: solid 1px #777;
+ padding:0px 10px;
+}
+
+#topbar ul li:first-child {
+ border-right: none;
+ padding:0px 0px 0px 10px;
+}
+
+#topbar ul li a {
+ color:#AAA;
+ font-size:11px;
+}
+
+#topbar ul li a.active,
+#topbar ul li a:hover {
+ color:#FFF;
+}
+
#header {
background:url(/images/header.png);
padding:0px;
@@ -27,16 +58,27 @@
margin:0px auto;
}
-#branding img {
+#branding h1 {
+ float:none !important;
+}
+
+#branding a {
+ margin:0px !important;
+}
+
+#branding a img {
border-top: 0px solid black;
border-bottom: 0px solid black;
display: block;
- float: left;
+ float: none;
margin:20px 0px 25px 0px;
+ width:269px;
+ height:70px;
+ max-height:70px;
}
#main {
- padding-top:10px;
+ padding-top:22px;
overflow:visible;
}
@@ -44,59 +86,12 @@
padding-bottom:20px;
}
-div.menu {
- margin:0px;
-}
-
-div#access {
- background:transparent;
- margin: 0px;
- padding:0px;
- border-top: 0px solid #CCC;
- border-bottom: 0px solid #CCC;
- width:650px;
- float:left;
-}
-
-div#top-bar {
- float:right;
- width:200px;
- margin-top:100px;
- text-align:right;
-}
-
-div#top-bar a {
- color:#FFF;
-}
-
-div#access ul li {
- padding-right:15px;
-}
-
-div#access ul li:hover a {background:transparent;}
-div#access ul li a:hover { border-bottom: 1px dashed #fff; background:transparent !important;}
-
-div#access ul li a {
- font-weight: normal;
- font-family:'Museo300';
- font-size:14px;
- text-transform:uppercase;
- color: #fff;
- padding: 0px;
- border-right: 0px solid #CCC;
- line-height:100%;
-}
-
-div#access ul li:first-child a {
- border-left: 0px solid #CCC;
-}
-
#site-title {
float: left;
font-size: 30px;
line-height: 36px;
margin: 0 !important;
- width: 700px;
+ width: 269px;
padding: 0 ! important;
}
@@ -113,33 +108,153 @@
display:none;
}
-h1, h2, h3 {
- font-family:'Museo300';
+
+/*-------- Menu --------*/
+
+div.menu {margin:0px;}
+div.menu ul.children {visibility:hidden;}
+
+div#access {
+ background:transparent;
+ margin: 0px;
+ padding:0px;
+ border-top: 0px solid #CCC;
+ border-bottom: 0px solid #CCC;
+ width:650px;
+ float:left;
+}
+
+div#access ul li {
+ padding-right:15px;
+}
+
+div#access ul li:hover a {background:transparent; color:#fff !important;}
+div#access ul li a:hover { border-bottom: 1px dashed #fff; background:transparent !important;}
+
+div#access ul li a {
+ font-weight: normal;
+ font-family:'Museo300', 'Times New Roman', serif;
+ font-size:14px;
+ text-transform:uppercase;
+ color: #fff;
+ padding: 0px;
+ border-right: 0px solid #CCC;
+ line-height:100%;
+}
+
+div#access ul li:first-child a {
+ border-left: 0px solid #CCC;
+}
+
+#access ul li:hover > ul {
+ display:none;
+}
+
+#access ul li a.active {
+ color:#FFF;
font-weight:normal;
}
-h1 {
- color: #2C4F87;
+#access ul li.current_page_item > a,
+#access ul li.current-menu-ancestor > a,
+#access ul li.current-menu-item > a,
+#access ul li.current-menu-parent > a
+{
+ color:#fff;
+}
+
+/*-------- Login controls -------*/
+
+div#top-bar {
+ float:right;
+ width:200px;
+ margin-top:-4px;
+ text-align:right;
+}
+
+div#top-bar a {
+ color:#FFF;
+}
+
+
+/*------- Typography --------*/
+
+h1, h2, h3,
+#content .entry-title,
+#content .package h3,
+#content .package h4 {
+ font-family:'Museo300', 'Times New Roman', serif;
+ font-weight:normal;
+}
+
+h1, h2,
+#content .entry-title,
+#content .package h3,
+#content .package h4 {
+ color: #2C4F87 !important;
font-size: 25px;
letter-spacing: 0px;
line-height: 33px;
- margin: 0 0 18px !important;
+ margin: 0 0 24px !important;
text-transform: uppercase;
+ background:transparent !important;
+}
+
+#content .entry-title {
+ margin-bottom:17px !important;
+}
+
+#content .package h3,
+#content .package h4 {
+ font-size:20px;
+ margin-bottom:10px !important;
}
h1 span {
text-transform:none;
- color:#666;
+ color:#333;
font-size:15px;
}
+.status-publish h2, .status-publish h3 {
+ font-size:16px;
+ text-transform:none;
+ margin:20px 0px 19px 0px !important;
+}
+
+h3#reply-title {
+ font-family:'Museo300', 'Times New Roman', serif;
+ font-weight:normal;
+ color: #2C4F87 !important;
+ font-size: 25px !important;
+ letter-spacing: 0px !important;
+ line-height: 33px !important;
+ margin: 24px 0px 24px 0px !important;
+ background:transparent !important;
+ text-transform:uppercase !important;
+ padding:0px !important;
+}
+
+#commentform {
+ width:450px;
+}
+
+#commentform label {
+ color: #2C4F87 !important;
+ font-family: 'Museo300', 'Times New Roman', serif;
+ font-size: 16px;
+ padding:10px 0px;
+}
+
+/*-------- Home menu --------*/
+
#home-options {
background: url(/images/home-grad.png);
height:350px;
width:300%;
margin-left:-100%;
- margin-bottom:30px;
- margin-top:30px;
+ margin-bottom:34px;
+ margin-top:25px;
position:relative;
}
@@ -161,7 +276,7 @@
#home-options ul li img,
#home-options ul li canvas {
padding-top:30px;
- padding-bottom:15px;
+ padding-bottom:22px;
}
#home-options ul li:last-child {
@@ -169,7 +284,7 @@
}
#home-options ul li h1 {
- font-family:'BebasNeueRegular';
+ font-family:'BebasNeueRegular', Arial, Verdana, sans-serif;
text-transform:uppercase;
font-size:20px;
color:#666 !important;
@@ -197,7 +312,7 @@
width:190px;
margin-left:23px;
margin-top:0px;
- height:55px;
+ height:65px;
line-height:22px;
}
@@ -209,12 +324,12 @@
padding:7px 10px 0px 10px;
color:#FFF;
text-decoration:none;
- font-family:'BebasNeueRegular';
+ font-family:'BebasNeueRegular', Arial, Verdana, sans-serif;
text-transform:uppercase;
font-size:21px;
line-height:19px;
border-bottom:solid 3px #3E5379;
- display:inline-block;
+ display:inline-block;
letter-spacing:1px;
}
@@ -225,12 +340,13 @@
div#footer {
padding-right:0px;
- background-color:#333;
+ background:#333;
margin-bottom:0px;
padding:12px 0px 10px 0px;
color:#fff;
font-family:Arial;
text-transform:uppercase;
+ margin:0px !important;
}
div#colophon {
@@ -263,7 +379,7 @@
}
#id-like-to {
- font-family:'Museo300';
+ font-family:'Museo300', 'Times New Roman', serif;
color:#fff;
background:#536FA1;
display:block;
@@ -272,9 +388,143 @@
top:-3px;
left:-20px;
text-transform:uppercase;
- padding:0px 6px;
- margin:0px;
- margin-bottom:-45px;
+ padding:2px 6px;
+ margin:-6px 0px -40px -0px;
z-index:999;
text-align:center;
}
+
+
+/*-------- Search form --------*/
+
+#package-search .facets tr td {
+ color: #2C4F87 !important;
+ font-family: 'Museo300', 'Times New Roman', serif;
+ font-size: 16px;
+ vertical-align:middle;
+ padding:10px 0px;
+}
+
+#package-search .facets tr td:first-child {
+ width: 100px !important;
+}
+
+#package-search .facets {
+ width: 600px;
+ margin-bottom:15px;
+}
+
+#package-search .facets tr td input {
+ font-size: 11px;
+ border:auto;
+}
+
+#package-search input.search {
+ border-color: #AAAAAA #DDDDDD #DDDDDD #AAAAAA;
+ border-radius: 5px 5px 5px 5px;
+ border-style: solid;
+ border-width: 1px;
+ color: #2C4F87;
+ font-family: 'Museo300', 'Times New Roman', serif;
+ font-size: 17px;
+ padding: 7px 0px;
+ width: 500px;
+}
+
+#package-search .facets select {
+ border:auto;
+}
+
+.entry-content select {
+ margin: 0;
+}
+
+#package-search .button,
+#content input[type=submit],
+#content input[type=submit]:hover {
+ float:none;
+ background: none repeat scroll 0 0 #536FA1;
+ border-bottom: 3px solid #3E5379;
+ border-radius: 5px 5px 5px 5px;
+ color: #FFFFFF;
+ display: inline-block;
+ font-family: 'BebasNeueRegular', Arial, Verdana, sans-serif;
+ font-size: 21px;
+ letter-spacing: 1px;
+ line-height: 19px;
+ padding: 7px 10px 0;
+ text-decoration: none;
+ text-transform: uppercase;
+ font-weight:normal;
+}
+
+#package-search .button:active,
+#content input[type=submit]:active {
+ border-bottom: 1px solid #3E5379;
+ margin-top: 2px;
+}
+
+ul.packages {
+ margin-top:40px;
+}
+
+ul.packages > li {
+ border-left-width:0px;
+ margin:8px 0px;
+ border-bottom-color:#CCC;
+}
+
+ul.packages li div.header a {
+ color: #2C4F87;
+ font-family: 'Museo300', 'Times New Roman', serif;
+ font-size: 18px;
+ font-weight: normal;
+}
+
+ul.packages li div.header a:hover {
+ border-bottom:dashed 1px #536FA1;
+}
+
+ul.packages li ul.openness .closed {
+ font-weight:normal;
+}
+
+/*-------- Pagers --------*/
+
+.pager span.pager_curpage {
+ background: none repeat scroll 0 0 #536FA1;
+ border-style:none;
+ color: #FFFFFF;
+ font-weight: normal;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+a, a:link {
+ color: #536FA1;
+}
+
+.pager span, .pager a {
+ border: none;
+ color: #536FA1;
+ font-family: 'BebasNeueRegular', Arial, sans-serif;
+ font-size: 20px;
+ font-weight: normal;
+ margin: 0;
+ padding: 5px 5px 0;
+ text-decoration: none;
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+}
+
+.pager a:hover, .pager a:active {
+ background:#E3EFF3;
+ color:#536FA1;
+}
+
+
+/*-------- Wordpress Specific --------*/
+
+.type-page
\ No newline at end of file
Binary file public/images/header.png has changed
Binary file public/images/home-arrow.png has changed
Binary file public/images/home-dots.png has changed
Binary file public/images/home-grad.png has changed
Binary file public/images/home-learn.png has changed
Binary file public/images/home-news.png has changed
Binary file public/images/home-search.png has changed
Binary file public/images/home-visualise.png has changed
Binary file public/images/iati-logo.png has changed
--- a/templates/home/index.html Fri Jun 10 08:20:13 2011 +0100
+++ b/templates/home/index.html Fri Jun 10 07:22:59 2011 +0000
@@ -38,7 +38,7 @@
</style><link rel="stylesheet" href="/css/overrides.css" type="text/css" media="screen, print" /><link rel="stylesheet" href="/fonts/fonts.css" type="text/css" media="screen, print" />
-
+ <meta http-equiv="X-UA-Compatible" content="IE=7" /></py:def><py:def function="body_class">home</py:def><div py:match="content">
--- a/templates/layout_base.html Fri Jun 10 08:20:13 2011 +0100
+++ b/templates/layout_base.html Fri Jun 10 07:22:59 2011 +0000
@@ -13,6 +13,7 @@
<head><title>${page_title()} - ${g.site_title}</title><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=7" /><link rel="shortcut icon" href="http://assets.okfn.org/images/logo/favicon.ico" type="image/x-icon" /><py:choose><py:when test="defined('optional_feed')">
@@ -29,6 +30,8 @@
<link rel="stylesheet" href="/css/style.css" type="text/css" media="screen, print" /><link rel="stylesheet" href="/css/iati.css" type="text/css" media="screen, print" />
+ <link rel="stylesheet" href="/fonts/fonts.css" type="text/css" media="screen, print" />
+ <link rel="stylesheet" href="/css/overrides.css" type="text/css" media="screen, print" /><!--[if IE]><link rel="stylesheet" href="/css/ie.css" type="text/css" media="screen, print" />
@@ -65,7 +68,13 @@
<body class="${value_of('body_class', default=lambda: c.body_class)()}"><div id="wrapper" class="hfeed">
- <div id="topbar"></div>
+ <div id="topbar">
+ <ul>
+ <li><a class="active" href="/">IATI Registry</a></li>
+ <li><a href="http://www.iatistandard.org/">IATI Specification</a></li>
+ <li><a href="http://www.aidtransparency.net/">About IATI</a></li>
+ </ul>
+ </div><div id="header"><div id="masthead"><div id="branding" role="banner">
http://bitbucket.org/okfn/ckanextiati/changeset/de0ab57f10d8/
changeset: de0ab57f10d8
user: sebbacon
date: 2011-06-10 09:23:52
summary: general stylesheet changes from Nick
affected #: 3 files (0 bytes)
Binary file public/images/home-news-1.png has changed
Binary file public/images/home-news-2.png has changed
Binary file public/images/home-news-3.png has changed
Repository URL: https://bitbucket.org/okfn/ckanextiati/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the ckan-changes
mailing list