Browse files

ENHANCEMENT added complete form style and additional typography styles

  • Loading branch information...
1 parent 988174d commit 7ff80fd5f41bc1583f60f7cc5ce9b88509a80645 @clarkepaul clarkepaul committed Oct 5, 2012
Showing with 111 additions and 29 deletions.
  1. +33 −6 css/form.css
  2. +65 −21 css/layout.css
  3. +3 −0 css/reset.css
  4. +5 −0 css/typography.css
  5. BIN images/ajax-loader.gif
  6. +5 −2 templates/Page.ss
View
39 css/form.css
@@ -16,6 +16,11 @@ form {
div.field {
margin: 10px 0 15px;
}
+fieldset {
+ border: 0;
+ margin: 0;
+ padding: 0;
+}
form label {
margin-bottom: 5px;
}
@@ -27,9 +32,10 @@ form label {
font-size: 12px;
color: #888;
}
+
form input.text,
form textarea,
-form .textajaxuniquetext,
+form .textajaxuniquetext, /* Not sure if this is used? */
form select {
width: 100%;
max-width: 400px;
@@ -38,6 +44,8 @@ form select {
background-color: #fff;
border: 1px solid #dad9d9;
}
+ .ie7 form select { width: 400px; }
+
form input.text:focus,
form textarea:focus,
form .textajaxuniquetext:focus,
@@ -48,6 +56,9 @@ form input[disabled], form textarea[disabled] {
background-color: #f7f7f7;
border: 1px solid #dad9d9;
}
+textarea {
+ resize: vertical;
+}
/* Radio and Checkbox */
@@ -100,19 +111,31 @@ form .message {
border: none;
font-size: 13px;
margin-right: 10px;
+ float: left;
}
a.btn:hover, button, input[type="submit"]:hover, .Actions .action:hover {
- background: #d80000;
+ background: #C80000;
color: #fff;
}
a.btn {
line-height: 18px;
margin-bottom: 10px;
}
- a.btn:after { /* creates arrow in button */
+ a.btn:after { /* creates arrow in button */
content: '\2192';
padding-left: 10px;
}
+ .ie7 input.action {
+ width: 0; /* IE table-cell margin fix */
+ overflow: visible;
+ }
+ input.action[class] { /* IE ignores [class] */
+ width: auto; /* cancel margin fix for other browsers */
+ }
+
+ .ie7 .Actions .action {
+ float: left;
+ }
.Actions:after {
color: #B94A48;
content: "* Indicates a required field";
@@ -130,6 +153,12 @@ form .message {
#Remember {
min-height: 20px;
}
+ #ForgotPassword {
+ clear: left;
+ }
+ #MemberLoginForm_LostPasswordForm .Actions:after {
+ display: none;
+ }
/* Search / Login */
.header form .middleColumn {
@@ -140,8 +169,6 @@ form .message {
-
-
/* USER DEFINED USER FORM MODULE STYLES
----------------------------------------------- */
@@ -151,7 +178,7 @@ form .message {
padding-top: 15px;
}
form .date .middleColumn input {
- background: transparent url(../images/icons/your_icon_here.png) no-repeat scroll 90px 5px;
+ /*background: transparent url(../images/icons/your_icon_here.png) no-repeat scroll 90px 5px;*/
width: 114px;
}
.Actions input.resetformaction { /* Clear button */
View
86 css/layout.css
@@ -44,10 +44,10 @@ body {
aside {
float: left;
width: 23%;
- margin-top: 20px;
+ margin-top: 12px;
}
.no-sidebar aside {
- display:none;
+ display: none;
}
@@ -219,64 +219,69 @@ body {
}
/* Secondary navigation */
- .secondary h3 {
+ .main .secondary h3 {
font-size: 20px;
color: #b8b7b7;
- margin: 0 0 10px 0;
+ margin: 0 0 8px 0;
font-family: "CamboRegular", Georgia, "Times New Roman", Times, serif;
font-weight: normal;
}
- .secondary {
+ .main .secondary {
border-bottom: 1px solid #e5e5e5
}
- .secondary ul {
+ .main .secondary ul {
padding: 0;
margin: 0;
}
- .secondary li {
+ .main .secondary li {
border-top: 1px solid #e5e5e5;
position: relative;
list-style-type: none;
+ margin-bottom: 0;
}
- .secondary li .arrow {
+ .main .secondary li .arrow {
color: #b80000;
padding-right: 5px;
display: block;
font-size: 15px;
line-height: 20px;
position: absolute;
left: 2px;
- top: 5px;
+ top: 7px;
-moz-transition: 0.2s;
-webkit-transition: 0.2s;
transition: 0.2s;
}
- .secondary li:hover .arrow {
+ .main .secondary li:hover .arrow {
left: 6px
}
- .secondary li a {
- padding: 8px 0;
+ .main .secondary li a {
+ padding: 10px 0;
display: block;
width: 100%;
text-transform: uppercase;
letter-spacing: 2px;
font-size: 11px;
color: #333;
line-height: 17px;
+ border-bottom: none;
font-family: 'Lucida Sans', 'Lucida Grande', Arial, Helvetica, sans-serif;
}
- .secondary li .text {
+ .main .secondary li .text {
padding-left: 28px;
display: block;
}
- .secondary li.section,
- .secondary li.current {
+ .main .secondary li.section,
+ .main .secondary li.current {
background-color: #f7f7f7
}
- .secondary li.section a,
- .secondary li.current a {
+ .main .secondary li.section a,
+ .main .secondary li.current a {
color: #000
}
+ .main .secondary h3 {
+ color: #aaa;
+ }
/* MIXED */
@@ -625,6 +630,7 @@ body h1 span.amp {
}
}
+/* Based on HTML5 boilerplate print styles */
@media print {
* {
background: transparent !important;
@@ -634,14 +640,27 @@ body h1 span.amp {
filter: none !important;
-ms-filter: none !important;
}
- .header,
- .footer {
- display: none
- }
a,
a:visited {
text-decoration: underline
}
+ a[href]:after {
+ content: " (" attr(href) ")";
+ }
+ abbr[title]:after {
+ content: " (" attr(title) ")";
+ }
+
+ /*
+ * Don't show links for images, or javascript/internal links
+ */
+
+ .ir a:after,
+ a[href^="javascript:"]:after,
+ a[href^="#"]:after {
+ content: "";
+ }
+
thead {
display: table-header-group
}
@@ -652,4 +671,29 @@ body h1 span.amp {
img {
max-width: 100% !important
}
+ pre,
+ blockquote {
+ border: 1px solid #999;
+ page-break-inside: avoid;
+ }
+ @page {
+ margin: 0.5cm;
+ }
+ p,
+ h2,
+ h3 {
+ orphans: 3;
+ widows: 3;
+ }
+
+ h2,
+ h3 {
+ page-break-after: avoid;
+ }
+
+ /* Simple theme custom print styles */
+ .header,
+ .footer {
+ display: none
+ }
}
View
3 css/reset.css
@@ -1,3 +1,6 @@
+/* This reset is loosely derived from HTML5 boilerplate
+for more information visit http://html5boilerplate.com/ */
+
html, body, div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
View
5 css/typography.css
@@ -208,6 +208,11 @@ body {
.typography .captionImage.right img {
margin-left: -10px;
}
+ .typography .captionImage.right p {
+ margin-left: -10px;
+ text-align: left;
+ margin-left: -10px;
+ }
.typography .captionImage.leftAlone{
float:none;
margin: 0 20px 20px 0px;
View
BIN images/ajax-loader.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
7 templates/Page.ss
@@ -36,7 +36,10 @@ Change it, enhance it and most importantly enjoy it!
</div>
</div>
<% include Footer %>
-<% require javascript(http://code.jquery.com/jquery-1.7.2.js) %>
-<% require javascript(themes/simple/javascript/script.js) %>
+
+<% require javascript(framework/thirdparty/jquery/jquery.js) %>
+<%-- Please move: Theme javascript (below) should be moved to mysite/code/page.php --%>
+<script type="text/javascript" src="{$ThemeDir}/javascript/script.js"></script>
+
</body>
</html>

0 comments on commit 7ff80fd

Please sign in to comment.