diff --git a/css/Form.css b/css/Form.css index 27827f4..d282067 100755 --- a/css/Form.css +++ b/css/Form.css @@ -1,23 +1,36 @@ -#Form_EditForm, #Form_EditForm a{color:#333;} -input:valid, textarea:valid { } +.ui-widget, .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {font-family:Arial, Helvetica, sans-serif !important;} input:invalid, textarea:invalid {border-radius: 1px; -moz-box-shadow: 0px 0px 5px red; -webkit-box-shadow:0px 0px 5px red; box-shadow:0px 0px 5px red; } .no-boxshadow input:invalid, .no-boxshadow textarea:invalid {background-color: #f0dddd;} -form ul{margin-left:0;} -form .item {margin-bottom:5px;} -form label{width:120px; float:left;} -form input.text {width:250px;} - -.controls{text-align:left !important; padding-bottom:10px;} -.controls label{width:auto;} -.login-form .controls li, li.checkbox{padding-left:120px; clear:both;} -li.checkbox{padding-bottom:20px;} -li.checkbox input{float:left;} -li.checkbox label{margin-left:5px; width:auto; float:left;} - form .message {padding:6px 15px; border:1px solid;} -form .good {background-color:#ecf9d0; border-color:#8fbe00;} -form .bad {background-color:#f9d0d0; border-color:#be0000;} -#MemberLoginForm_LoginForm_action_dologin, #ExternalLoginForm_LoginForm_action_dologin{padding:6px 20px;} +form .good {background-color:#ecf9d0; border-color:#8fbe00;} +form .bad {background-color:#f9d0d0; border-color:#be0000;} + +.checkbox, .radio{margin-top:1px;} + +#MemberLoginForm_LoginForm_action_dologin, #ExternalLoginForm_LoginForm_action_dologin, .Actions .action{padding:6px 20px;} +#MemberLoginForm_LoginForm{max-width:500px;} #ForgotPassword a{margin-top:15px;} -#ForgotPassword {margin-top:6px;} \ No newline at end of file +#ForgotPassword {margin-top:6px;} + +div.field{width:100%; float:left; margin-bottom:20px;} +.ui-widget{font-family:Arial, Helvetica, sans-serif;} +form label.left {float:left; width:25%; padding-right:5%; margin-top:4px; display:block; font-size:13px;} +form .middleColumn {float:right; width:70% !important;} +form .middleColumn .middleColumn{width:100% !important;} +.listbox option{padding:3px 0;} +form input.text, form textarea, form .textajaxuniquetext, form select{width:98%; padding:6px 1%; font-size:15px;} +form input.sitetreeurlsegment{width:200px;} +form span.readonly {font-size:16px;} + +form input[disabled]{background-color:#f7f7f7; border:1px solid #dad9d9;} + +form .creditCardField input, form input.currency {padding:5px 1%; width:50px;} +form input.numeric{padding:5px 1%; width:50px;} +form #DMYDate-month, form #DMYDate-day{width:25px;} +form .checkboxset li, form .optionset li{margin-bottom:5px;} + +@media only screen and (max-width: 700px) { +form .middleColumn {float:right; width:100% !important;;} +form label.left, #MemberLoginForm_LoginForm label{margin-bottom:8px;} +} \ No newline at end of file diff --git a/css/layout.css b/css/layout.css index bb72b3d..c639d8a 100755 --- a/css/layout.css +++ b/css/layout.css @@ -1,18 +1,6 @@ -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on February 20, 2012 06:04:25 AM America/New_York */ -@font-face { - font-family: 'GoudyBookletter1911Regular'; - src: url('../webfonts/goudy_bookletter_1911-webfont.eot'); - src: url('../webfonts/goudy_bookletter_1911-webfont.eot?#iefix') format('embedded-opentype'), - url('../webfonts/goudy_bookletter_1911-webfont.woff') format('woff'), - url('../webfonts/goudy_bookletter_1911-webfont.ttf') format('truetype'), - url('../webfonts/goudy_bookletter_1911-webfont.svg#GoudyBookletter1911Regular') format('svg'); - font-weight: normal; - font-style: normal; -} +header:after, .main:after, #Root:after {height:0;content:".";display:block;clear:both;visibility:hidden;} -header:after, .main:after {height:0;content:".";display:block;clear:both;visibility:hidden;} - -body{background:#ededed; min-width:240px;-webkit-text-size-adjust: none;} +body{background:#ededed; min-width:240px;-webkit-text-size-adjust:none; font-family:Arial, Helvetica, sans-serif;} ::-moz-selection{background:#b80000; color:#fff; text-shadow:none;} ::selection {background:#b80000; color:#fff; text-shadow:none;} @@ -25,7 +13,7 @@ a.btn:hover{background:#d80000; color:#fff;} .content ul{margin:20px 0 20px 30px;} .content li{line-height:22px; margin-bottom:5px; list-style-type:disc;} -.content-container h1{font-size:35px; border-bottom:1px solid #e5e5e5; padding-bottom:7px; margin-bottom:23px;} +.content-container h1{font-size:36px; border-bottom:1px solid #e5e5e5; padding-bottom:7px; margin-bottom:23px;} .content-container h1 span.amp{font-family:Baskerville,"Goudy Old Style","Palatino","Book Antiqua",Georgia; font-style:italic;} .content-container h2{font-size:25px; margin-bottom:15px; padding-top:15px;} .content-container h3{font-size:21px; margin-bottom:10px; padding-top:10px;} @@ -37,7 +25,7 @@ a.btn:hover{background:#d80000; color:#fff;} .header .primary ul{float:right; margin:27px -15px 0 0; white-space:nowrap;} .header .primary li{float:left; padding-bottom:20px; margin:0 5px;} -.header .primary li a{color:#888; font-size:15px; font-family:Helvetica, Arial, sans-serif; padding:7px 8px 5px; border-radius:4px; font-weight:bold; display:block; -moz-transition:color 0.2s; -webkit-transition:color 0.2s; transition:color 0.2s;} +.header .primary li a{color:#888; font-size:15px; font-family:Helvetica, Arial, sans-serif; padding:6px 8px; border-radius:4px; font-weight:bold; display:block; -moz-transition:color 0.2s; -webkit-transition:color 0.2s; transition:color 0.2s;} .header .primary li a:hover{color:#fff;} .header .primary li.section a, .header .primary li.current a{color:#fff;} .header .primary li.section, .header .primary li.current{background:url(../images/selected.png) center bottom no-repeat;} @@ -51,9 +39,9 @@ aside{float:left; width:20%; margin-top:17px;} .secondary h3{font-size:20px; color:#b8b7b7; margin-bottom:11px;} .secondary {border-bottom:1px solid #e5e5e5;} .secondary li{border-top:1px solid #e5e5e5; position:relative;} -.secondary li .arrow{color:#b80000; padding-right:5px; display:block; font-size:15px; position:absolute; left:2px; top:5px; -moz-transition:0.2s; -webkit-transition:0.2s; transition:0.2s;} +.secondary li .arrow{color:#b80000; padding-right:5px; display:block; font-size:15px; line-height:20px; position:absolute; left:2px; top:5px; -moz-transition:0.2s; -webkit-transition:0.2s; transition:0.2s;} .secondary li:hover .arrow{left:6px;} -.secondary li a{padding:8px 0; display:block; width:100%; text-transform:uppercase; letter-spacing:1px; font-size:11px; color:#666;} +.secondary li a{padding:8px 0; display:block; width:100%; text-transform:uppercase; letter-spacing:2px; font-size:11px; color:#333; line-height:17px; font-family:'Lucida Sans', 'Lucida Grande', Arial, Helvetica, sans-serif;} .secondary li .text {padding-left:28px; display:block;} .secondary li.section, .secondary li.current{background-color:#f9f9f9;} .secondary li.section a, .secondary li.current a{color:#000;} @@ -63,14 +51,14 @@ aside{float:left; width:20%; margin-top:17px;} .header{background:#161616;} .header .inner{padding-top:50px;} -.footer{color:#999; background:#ededed; padding:20px 0; font-size:11px;} +.footer{color:#999; background:#ededed; padding:20px 0; font-size:11px; line-height:22px;} .footer a{color:#999;} .footer .left{float:left; color:#000; display:block;} .footer .right{float:right; display:block;} .footer span{padding:0 3px; color:#bbb;} -.footer .primary{display:inline-block;} -.footer .primary li{display:inline-block;} -.ie6 .footer .primary li, .ie7 .footer .primary li{display:inline; zoom:1; margin-right:10px;} +.footer .primary, .footer .primary ul{display:inline;} +.footer .primary li{display:inline;} +/*.ie6 .footer .primary li, .ie7 .footer .primary li{display:inline; zoom:1; margin-right:10px;}*/ .footer .primary li:after{padding:0 3px 0 5px; content:'/'; color:#999;} .footer .primary li:last-child:after{content:'';} .footer .arrow{padding:0 8px 0 5px; color:#b80000; font-size:13px;} @@ -89,22 +77,23 @@ aside{float:left; width:20%; margin-top:17px;} .main{padding:20px 0 45px;} .content-container, aside{width:100%;} .content-container h1{font-size:30px; margin-bottom:15px; padding-bottom:3px;} -.content-container p{font-size:14px; line-height:24px;} -p.intro{font-size:20px; line-height:28px;} +.content-container p{font-size:14px; line-height:23px;} +p.intro{font-size:19px; line-height:27px;} .inner{padding:0 22px;} -.secondary li a{line-height:22px;} +.secondary li a{line-height:24px;} +.secondary li .arrow{line-height:26px;} .footer .right{float:left; padding-top:14px; width:100%;} } @media print { - * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } /* Black prints faster: h5bp.com/s */ + * { background: transparent !important; color: black !important; box-shadow:none !important; text-shadow: none !important; filter:none !important; -ms-filter: none !important; } .header, .footer{display:none;} - a, a:visited { text-decoration: underline; } - thead { display: table-header-group; } /* h5bp.com/t */ - tr, img { page-break-inside: avoid; } - img { max-width: 100% !important; } - @page { margin: 0.5cm; } - p, h2, h3 { orphans: 3; widows: 3; } - h2, h3 { page-break-after: avoid; } + a, a:visited {text-decoration:underline;} + thead {display:table-header-group;} + tr, img {page-break-inside: avoid;} + img {max-width:100% !important;} + @page {margin:0.5cm;} + p, h2, h3 {orphans:3; widows:3;} + h2, h3 {page-break-after:avoid;} } \ No newline at end of file diff --git a/css/reset.css b/css/reset.css index 899ce26..d1ce301 100755 --- a/css/reset.css +++ b/css/reset.css @@ -11,7 +11,7 @@ time, mark, audio, video{margin:0; padding:0; border:0; font-size:100%; font:inh article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section{display: block;} html{overflow-y:scroll;} -body{-webkit-text-size-adjust: none; -webkit-font-smoothing: antialiased; -moz-font-smoothing: antialiased; font-smoothing: antialiased;} +body{-webkit-text-size-adjust:none;} .clear:before, .clear:after {content: "\0020"; display: block; height: 0; overflow: hidden; } .clear:after {clear:both;} @@ -30,6 +30,7 @@ input[type="checkbox"], input.checkbox, .checkboxes input {vertical-align:bottom .ie6 input {vertical-align: text-bottom;} label, input[type="button"], input[type="submit"], input[type="image"], button, .btn {cursor:pointer;} button, input, select, textarea {margin:0;} +.checkbox, .radio {float:left; width:13px; height:13px; margin-right:6px; padding:0;} button {width:auto; overflow:visible;} .ie7 img {-ms-interpolation-mode: bicubic;} diff --git a/css/typography.css b/css/typography.css index 5e1a584..6d95652 100755 --- a/css/typography.css +++ b/css/typography.css @@ -1,6 +1,18 @@ -body {font-size:13px; font-family:Helvetica,Arial,sans-serif;} -h1,h2,h3,h4,h5,h6 {font-family:"GoudyBookletter1911Regular", Georgia, "Times New Roman", Times, serif; font-weight:normal; color:#b80000;} -p {margin:0 0 17px; font-size:13px; line-height:22px;} +/* Generated by Font Squirrel (http://www.fontsquirrel.com) on March 26, 2012 09:18:54 AM America/New_York */ +@font-face { + font-family: 'CamboRegular'; + src: url('../webfonts/Cambo-Regular-webfont.eot'); + src: url('../webfonts/Cambo-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../webfonts/Cambo-Regular-webfont.woff') format('woff'), + url('../webfonts/Cambo-Regular-webfont.ttf') format('truetype'), + url('../webfonts/Cambo-Regular-webfont.svg#CamboRegular') format('svg'); + font-weight: normal; + font-style: normal; +} + +body {font-size:13px; font-family:Arial, Helvetica, sans-serif;} +h1,h2,h3,h4,h5,h6 {font-family:"CamboRegular", Georgia, "Times New Roman", Times, serif; font-weight:normal; color:#b80000;} +p {margin:0 0 17px; font-size:13px; line-height:21px;} em {font-style:normal;} a {color:#b80000; text-decoration:none;} a:hover {color:#d80000;} @@ -11,4 +23,4 @@ table tr.even, .content table th, .content thead td {background-color:#ededed;} table td, .content table th {padding:2px 5px;border:1px solid #d4d4d4; vertical-align:top;} table th {text-align:left; font-weight:bold;} -p.intro{font-family:"GoudyBookletter1911Regular", Georgia, "Times New Roman", Times, serif; font-size:25px; line-height:34px; margin-bottom:20px; color:#222;} \ No newline at end of file +p.intro{font-family:"CamboRegular", Georgia, "Times New Roman", Times, serif; font-size:22px; line-height:32px; margin-bottom:20px; color:#222;} \ No newline at end of file diff --git a/templates/Includes/MemberLoginForm.ss b/templates/Includes/MemberLoginForm.ss index 7b75986..08b3cc2 100755 --- a/templates/Includes/MemberLoginForm.ss +++ b/templates/Includes/MemberLoginForm.ss @@ -8,22 +8,23 @@ <% end_if %>
- <% if Legend %>$Legend<% end_if %> - + + <% end_loop %> + <% if Actions %> - <% end_if %>
diff --git a/templates/Page.ss b/templates/Page.ss index 0dc9973..9c4d7d0 100755 --- a/templates/Page.ss +++ b/templates/Page.ss @@ -11,7 +11,8 @@ Change it, enhance it and most importantly enjoy it! - + + <% base_tag %> <% if MetaTitle %>$MetaTitle<% else %>$Title<% end_if %> » $SiteConfig.Title @@ -19,10 +20,6 @@ Change it, enhance it and most importantly enjoy it! $MetaTags(false) - <% require themedCSS(reset) %> - <% require themedCSS(typography) %> - <% require themedCSS(layout) %> - <% require themedCSS(tabstrip) %> diff --git a/webfonts/Barry Schwartz License.txt b/webfonts/Barry Schwartz License.txt deleted file mode 100755 index 4fa062d..0000000 --- a/webfonts/Barry Schwartz License.txt +++ /dev/null @@ -1,5 +0,0 @@ -This font has been released into the public domain by its author, Barry Schwartz. This applies worldwide. - -In some countries this may not be legally possible; if so: - -Barry Schwartz grants anyone the right to use this work for any purpose, without any conditions, unless such conditions are required by law. \ No newline at end of file diff --git a/webfonts/Cambo SIL OFL Font License 1.1.txt b/webfonts/Cambo SIL OFL Font License 1.1.txt new file mode 100644 index 0000000..cdecc21 --- /dev/null +++ b/webfonts/Cambo SIL OFL Font License 1.1.txt @@ -0,0 +1,95 @@ +Copyright (c) 2011, Carolina Giovagnoli (caro@huertatipografica.com.ar), +Copyright (c) 2011, Andres Torresi (andres@huertatipografica.com.ar), +with Reserved Font Name Cambo. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. \ No newline at end of file diff --git a/webfonts/Cambo-Regular-webfont.eot b/webfonts/Cambo-Regular-webfont.eot new file mode 100644 index 0000000..54a2ba7 Binary files /dev/null and b/webfonts/Cambo-Regular-webfont.eot differ diff --git a/webfonts/Cambo-Regular-webfont.svg b/webfonts/Cambo-Regular-webfont.svg new file mode 100644 index 0000000..2fe0f86 --- /dev/null +++ b/webfonts/Cambo-Regular-webfont.svg @@ -0,0 +1,147 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : Copyright c 2011 Carolina Giovagnoli carohuertatipograficacomarCopyright c 2011 Andres Torresi andreshuertatipograficacomarwith Reserved Font Name Cambo +Designer : Carolina Giovagnoli Andres Torresi +Foundry : Carolina Giovagnoli Andres Torresi +Foundry URL : httpwwwhuertatipograficacomar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/webfonts/Cambo-Regular-webfont.ttf b/webfonts/Cambo-Regular-webfont.ttf new file mode 100644 index 0000000..74545f2 Binary files /dev/null and b/webfonts/Cambo-Regular-webfont.ttf differ diff --git a/webfonts/Cambo-Regular-webfont.woff b/webfonts/Cambo-Regular-webfont.woff new file mode 100644 index 0000000..f45b31b Binary files /dev/null and b/webfonts/Cambo-Regular-webfont.woff differ diff --git a/webfonts/goudy_bookletter_1911-webfont.eot b/webfonts/goudy_bookletter_1911-webfont.eot deleted file mode 100755 index 0de7ac3..0000000 Binary files a/webfonts/goudy_bookletter_1911-webfont.eot and /dev/null differ diff --git a/webfonts/goudy_bookletter_1911-webfont.svg b/webfonts/goudy_bookletter_1911-webfont.svg deleted file mode 100755 index b60239e..0000000 --- a/webfonts/goudy_bookletter_1911-webfont.svg +++ /dev/null @@ -1,145 +0,0 @@ - - - - -This is a custom SVG webfont generated by Font Squirrel. -Copyright : This font has been released into the public domain by its author Barry Schwartz This applies worldwideIn some countries this may not be legally possible if soBarry Schwartz grants anyone the right to use this work for any purpose without any conditions unless such conditions are required by law - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/webfonts/goudy_bookletter_1911-webfont.ttf b/webfonts/goudy_bookletter_1911-webfont.ttf deleted file mode 100755 index 164d9c6..0000000 Binary files a/webfonts/goudy_bookletter_1911-webfont.ttf and /dev/null differ diff --git a/webfonts/goudy_bookletter_1911-webfont.woff b/webfonts/goudy_bookletter_1911-webfont.woff deleted file mode 100755 index dfa0b9f..0000000 Binary files a/webfonts/goudy_bookletter_1911-webfont.woff and /dev/null differ