Commit 57c22772 authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie
Browse files

Style quashing - stylesheet is now smaller, with opportunity to get smaller

yet. A few templates changed as the "full width" class is now called
column-full instead of column-left-full.
parent c0d6b5ba
...@@ -43,10 +43,11 @@ function pieform_renderer_oneline_footer() { ...@@ -43,10 +43,11 @@ function pieform_renderer_oneline_footer() {
* container. * container.
*/ */
function pieform_renderer_oneline(Pieform $form, $builtelement, $rawelement) { function pieform_renderer_oneline(Pieform $form, $builtelement, $rawelement) {
$formname = $form->get_name();
// Set the class of the enclosing <div> to match that of the element // Set the class of the enclosing <div> to match that of the element
$result = '<span'; $result = '<span';
if (isset($rawelement['name'])) { if (isset($rawelement['name'])) {
$result .= ' id="' . $rawelement['name'] . '_container"'; $result .= ' id="' . $formname . '_' . $rawelement['name'] . '_container"';
} }
if ($rawelement['class']) { if ($rawelement['class']) {
$result .= ' class="' . $rawelement['class'] . '"'; $result .= ' class="' . $rawelement['class'] . '"';
......
...@@ -42,40 +42,50 @@ h5, h6 { ...@@ -42,40 +42,50 @@ h5, h6 {
font-size: 13px; font-size: 13px;
} }
form {
margin: 0;
}
input, select, textarea {
border: 1px solid #b0bf64;
}
input[type="submit"], input[type="button"] {
border: 2px outset #ccc;
}
input[type="checkbox"] {
display: none;
}
.center { .center {
text-align: center; text-align: center;
} }
.fl {
float: left;
}
.fr {
float: right;
}
/* CONTENT LAYOUT BEGIN */ /* CONTENT LAYOUT BEGIN */
#container { #container {
min-width: 770px; min-width: 770px;
width: 90%; width: 90%;
margin: 0 auto; margin: 0 auto;
padding: 0;
} }
/* HEADER BEGIN */ /* HEADER BEGIN */
#topwrapper { #topwrapper {
padding: 0; margin-top: 15px;
margin: 15px 0 0 0;
} }
#header { #header {
padding: 0;
margin: 0;
background: #FFFFFF url(../images/header_corner_topleft.gif) no-repeat top left; background: #FFFFFF url(../images/header_corner_topleft.gif) no-repeat top left;
} }
.cornertopright {
float: right;
margin: 0;
padding: 0;
}
#topwrapper ul, #topwrapper ul,
#topwrapper li { #topwrapper li {
padding: 0px; padding: 0;
margin: 0px; margin: 0;
text-align: right; text-align: right;
display: inline; display: inline;
} }
...@@ -83,210 +93,77 @@ h5, h6 { ...@@ -83,210 +93,77 @@ h5, h6 {
/* GLOBAL NAVIGATION TABS BEGIN */ /* GLOBAL NAVIGATION TABS BEGIN */
#globalTabs { #globalTabs {
text-align: right; text-align: right;
padding: 0;
margin: 0 10px 5px 0; margin: 0 10px 5px 0;
} }
#globalTabs a {
font-weight: bold;
color: #FFF;
}
#globalTabs a:hover {
text-decoration: none;
}
#topwrapper #globalTabs #globalnav-logout a { #globalnav-logout a {
width: 89px;
height: 24px;
padding: 5px 25px 6px 25px; padding: 5px 25px 6px 25px;
margin: 0;
background: url(../images/globalnav_logout_off.gif) no-repeat center; background: url(../images/globalnav_logout_off.gif) no-repeat center;
text-decoration: none;
font-size: 12px;
font-weight: bold;
color: #FFFFFF;
} }
#topwrapper #globalTabs #globalnav-logout a:hover { #globalnav-logout a:hover {
background: url(../images/globalnav_logout_on.gif) no-repeat center; background: url(../images/globalnav_logout_on.gif) no-repeat center;
text-decoration: none;
} }
#topwrapper #globalTabs #globalnav-logout.selected a, #globalnav-returntosite a {
#topwrapper #globalTabs #globalnav-logout.selected a:link,
#topwrapper #globalTabs #globalnav-logout.selected a:active,
#topwrapper #globalTabs #globalnav-logout.selected a:visited {
background: url(images/../images/globalnav_logout_on.gif) no-repeat center;
text-decoration: none;
}
#topwrapper #globalTabs #globalnav-returntosite a {
width: 150px;
padding: 5px 36px 6px 37px; padding: 5px 36px 6px 37px;
margin: 0;
background: url(../images/globalnav_siteadmin_off.gif) no-repeat center; background: url(../images/globalnav_siteadmin_off.gif) no-repeat center;
text-decoration: none;
font-size: 12px;
font-weight: bold;
color: #FFFFFF;
} }
#topwrapper #globalTabs #globalnav-returntosite a:hover { #globalnav-returntosite a:hover {
background: url(../images/globalnav_siteadmin_on.gif) no-repeat center; background: url(../images/globalnav_siteadmin_on.gif) no-repeat center;
text-decoration: none;
} }
#topwrapper #globalTabs #globalnav-returntosite.selected a, #globalnav-siteadmin a {
#topwrapper #globalTabs #globalnav-returntosite.selected a:link,
#topwrapper #globalTabs #globalnav-returntosite.selected a:active,
#topwrapper #globalTabs #globalnav-returntosite.selected a:visited {
background: url(images/../images/globalnav_siteadmin_on.gif) no-repeat center;
text-decoration: none;
}
#topwrapper #globalTabs #globalnav-siteadmin a {
width: 150px;
padding: 5px 21px 6px 21px; padding: 5px 21px 6px 21px;
margin: 0;
background: url(../images/globalnav_siteadmin_off.gif) no-repeat center; background: url(../images/globalnav_siteadmin_off.gif) no-repeat center;
text-decoration: none;
font-size: 12px;
font-weight: bold;
color: #FFFFFF;
} }
#topwrapper #globalTabs #globalnav-siteadmin a:hover { #globalnav-siteadmin a:hover {
background: url(../images/globalnav_siteadmin_on.gif) no-repeat center; background: url(../images/globalnav_siteadmin_on.gif) no-repeat center;
text-decoration: none;
}
#topwrapper #globalTabs #globalnav-siteadmin.selected a,
#topwrapper #globalTabs #globalnav-siteadmin.selected a:link,
#topwrapper #globalTabs #globalnav-siteadmin.selected a:active,
#topwrapper #globalTabs #globalnav-siteadmin.selected a:visited {
background: url(images/../images/globalnav_siteadmin_on.gif) no-repeat center;
text-decoration: none;
} }
/* GLOBAL NAVIGATION TABS END */ /* GLOBAL NAVIGATION TABS END */
.logo { #logo {
text-align: left; padding: 10px;
padding: 10px 10px 10px 10px;
margin: 0;
}
form {
margin: 0;
}
input, select, textarea {
border: 1px solid #b0bf64;
}
input[type="submit"], input[type="button"] {
border: 2px outset #ccc;
}
input[type="checkbox"] {
display: none;
}
/* REQUIRED INPUT BOX HIGHLIGHTS BEGINS */
#register #register_username,
#register #register_password1,
#register #register_password2,
#register #register_firstname,
#register #register_lastname,
#register #register_email {
border: 1px solid #b0bf64;
padding: 2px;
} }
#profileform #profileform_firstname,
#profileform #profileform_lastname {
border: 1px solid #b0bf64;
padding: 2px;
}
#newpost #newpost_title,
#newpost #newpost_description {
border: 1px solid #b0bf64;
padding: 2px;
}
#newblog #newblog_title {
border: 1px solid #b0bf64;
padding: 2px;
}
#contactus #contactus_email,
#contactus #contactus_name,
#contactus #contactus_message {
border: 1px solid #b0bf64;
padding: 2px;
}
#creategroup #creategroup_name {
border: 1px solid #b0bf64;
padding: 2px;
}
#editgroup #editgroup_name {
border: 1px solid #b0bf64;
padding: 2px;
}
/* REQUIRED INPUT BOX HIGHLIGHTS ENDS */
.searchbox { .searchbox {
float: right;
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
color: #497424; color: #497424;
padding: 0;
margin: 40px 0 0 0; margin: 40px 0 0 0;
} }
.searchbox #searchform_submit { #searchform_submit {
border: none; border: none;
} margin-left: 5px;
padding-bottom: 2px;
#searchform #query_container { text-align: right;
padding: 0;
margin: 0;
vertical-align: middle;
}
#searchform #query_container #query {
margin: 0;
padding: 0;
vertical-align: middle;
}
#searchform #submit_container {
padding: 0 0 0 0;
margin: 0 0 0 0;
vertical-align: middle; vertical-align: middle;
} }
#searchform #submit_container #searchform_submit { #searchform_query_container, #searchform_submit_container {
margin: 0 0 0 5px;
text-align: right;
padding: 0 0 2px 0;
vertical-align: middle; vertical-align: middle;
border: none;
} }
#searchform #query_container input { #searchform_query_container input {
border: 1px solid #b0bf64; border: 1px solid #b0bf64;
padding: 4px; padding: 4px;
color: #777777; color: #777777;
width: 183px; width: 183px;
} }
.searchbox table,
.searchbox tr,
.searchbox td {
padding: 0;
margin: 0;
}
.searchbox .advancedsearch { .searchbox .advancedsearch {
font-size: 9px; font-size: 9px;
padding: 0 0 0 5px; padding-left: 5px;
margin: 0;
} }
/* HEADER END */ /* HEADER END */
...@@ -294,33 +171,18 @@ input[type="checkbox"] { ...@@ -294,33 +171,18 @@ input[type="checkbox"] {
/* MAIN COLUMNS BEGIN */ /* MAIN COLUMNS BEGIN */
#mainwrapper { #mainwrapper {
padding: 5px 5px 5px 5px; padding: 5px;
margin: 0;
background-color: #d4d1c0; background-color: #d4d1c0;
} }
/* MAIN NAVIGATION BEGIN */ /* MAIN NAVIGATION BEGIN */
.mainnav-left {
float: left;
margin: -8px 0 0 0;
padding: 0;
}
.mainnav-right {
float: right;
margin: -8px 0 0 0;
padding: 0;
}
#mainnav { #mainnav {
padding: 8px 0 0 0; padding-top: 8px;
margin: 0 0 0 0; margin: 0;
background: url(../images/navbg_spacer.gif) repeat-x; background: url(../images/navbg_spacer.gif) repeat-x;
height: 32px; height: 32px;
font-size: 12px;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
text-align: left;
} }
#mainnav li { #mainnav li {
...@@ -331,43 +193,28 @@ input[type="checkbox"] { ...@@ -331,43 +193,28 @@ input[type="checkbox"] {
text-decoration: none; text-decoration: none;
} }
#mainnav li.selected {
color: #FFFFFF;
}
#mainnav li a, #mainnav li a,
#mainnav li a:link, #mainnav li a:link,
#mainnav li a:visited, #mainnav li a:visited,
#mainnav li a:active { #mainnav li a:active {
color: #e6c560; color: #e6c560;
text-decoration: none; margin-top: 7px;
margin: 7px 0 0 0;
} }
#mainnav li a:hover { #mainnav li a:hover {
color: #FFFFFF; color: #FFF;
text-decoration: none; text-decoration: none;
} }
#mainnav li.selected a {
color: #FFF;
}
/* MAIN NAVIGATION ENDS */ /* MAIN NAVIGATION ENDS */
/* SUB NAVIGATION BEGINS */ /* SUB NAVIGATION BEGINS */
.subnav-left {
float: left;
margin: -6px 0 0 0;
padding: 0;
}
.subnav-right {
float: right;
margin: -6px 0 0 0;
padding: 0;
}
#subnav { #subnav {
padding: 6px 0 0 0; padding-top: 6px;
margin: -3px 0 0 0; margin: 0;
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
text-align: left; text-align: left;
...@@ -380,10 +227,7 @@ input[type="checkbox"] { ...@@ -380,10 +227,7 @@ input[type="checkbox"] {
#subnav li a:link, #subnav li a:link,
#subnav li a:visited, #subnav li a:visited,
#subnav li a:active { #subnav li a:active {
color: #FFFFFF; color: #FFF;
text-decoration: none;
margin: 0;
padding: 0;
} }
#subnav li a:hover { #subnav li a:hover {
...@@ -394,31 +238,21 @@ input[type="checkbox"] { ...@@ -394,31 +238,21 @@ input[type="checkbox"] {
#subnav li { #subnav li {
display: inline; display: inline;
padding: 0; padding: 0;
margin: 0 5px 0 5px; margin: 0 5px;
} }
#subnav li.selected { #subnav li.selected a {
font-weight: bold;
color: #98bf10; color: #98bf10;
} }
/* SUB NAVIGATION BEGINS */ /* SUB NAVIGATION ENDS */
#maincontentwrapper {
margin: 0 0 0 0;
padding: 0;
}
#column-left { #column-left {
margin:0 235px 0 0; margin-right: 235px;
padding:0; background-color: #FFF;
background-color: #FFFFFF;
} }
#column-left-full { #column-full {
margin:0 0 0 0; background-color: #FFF;
padding:0;
background-color: #FFFFFF;
} }
#column-right { #column-right {
...@@ -428,41 +262,34 @@ input[type="checkbox"] { ...@@ -428,41 +262,34 @@ input[type="checkbox"] {
/* RIGHT SIDE BOX BEGIN */ /* RIGHT SIDE BOX BEGIN */
div.sidebar { div.sidebar {
background: #FFFFFF url(../images/sidebox2_top_headerbg.gif) no-repeat top; background: #FFF url(../images/sidebox2_top_headerbg.gif) no-repeat top;
padding: 10px 0 0 10px; padding: 10px 0 0 10px;
margin: 0 0 10px 0; margin-bottom: 10px;
color: #FFFFFF; color: #FFF;
font-weight: bold; font-weight: bold;
} }
#column-right div.sidebar-botcorners { .sidebarforgotpassword {
padding: 0 0 0 0;
margin: 0 0 0 0;
}
#column-right .sidebarforgotpassword {
padding: 10px 5px 5px 10px; padding: 10px 5px 5px 10px;
margin: 0 0 0 0;
background: #FFFFFF url(../images/sidebox_topwhite.gif) no-repeat top; background: #FFFFFF url(../images/sidebox_topwhite.gif) no-repeat top;
} }
#column-right div.sidebarforgotpassword-botcorners { #column-right .sidebarforgotpassword-botcorners {
padding: 0 0 0 0; margin-bottom: 7px;
margin: 0 0 7px 0;
} }
#column-right .sidebarforgotpassword a, .sidebarforgotpassword a,
#column-right .sidebarforgotpassword a:link, .sidebarforgotpassword a:link,
#column-right .sidebarforgotpassword a:active, .sidebarforgotpassword a:active,
#column-right .sidebarforgotpassword a:visited { .sidebarforgotpassword a:visited {