Commit 5caad835 authored by micahw156's avatar micahw156

by micahw156: stylelinit css cleanup.

parent 31b0082e
......@@ -4,8 +4,8 @@
*/
#page {
margin: 0 auto;
max-width: 1600px;
margin: 0 auto;
}
/**
......@@ -15,8 +15,8 @@
*/
#section-footer {
clear: both;
float: none;
clear: both;
}
/* Layout Helpers */
......@@ -28,7 +28,6 @@
#section-main #content .node {
clear: both;
}
@media only screen and (min-width: 480px) {
.two-sidebars #sidebar-first {
......@@ -42,7 +41,6 @@
}
}
@media only screen and (min-width: 768px) {
#content {
......@@ -53,8 +51,8 @@
}
.two-sidebars #content-inner {
margin-left: 160px; /* Left Sidebar width */
margin-right: 160px; /* Right Sidebar width */
margin-left: 160px; /* Left Sidebar width */
}
.sidebar-second #content-inner {
......@@ -67,8 +65,8 @@
#sidebar-first, .two-sidebars #sidebar-first {
float: left;
margin-right: -160px;
width: 160px;
margin-right: -160px;
}
#sidebar-second, .two-sidebars #sidebar-second {
......@@ -77,12 +75,11 @@
}
}
@media only screen and (min-width: 960px) {
.two-sidebars #content-inner {
margin-left: 23%; /* Left Sidebar width */
margin-right: 23%; /* Right Sidebar width */
margin-left: 23%; /* Left Sidebar width */
}
.sidebar-second #content-inner {
......@@ -95,8 +92,8 @@
#sidebar-first, .two-sidebars #sidebar-first {
float: left;
margin-right: -23%;
width: 20%;
margin-right: -23%;
}
#sidebar-second, .two-sidebars #sidebar-second {
......
......@@ -6,8 +6,8 @@
/** Styling for page.tpl.php elements **/
body {
background: #fff;
color: #000;
background: #fff;
}
#page {
......@@ -43,27 +43,21 @@ form#search-theme-form {
padding: 0 0 1.5em;
}
#sidebar-first {
}
.region-sidebar-first {
margin: 0 0 0.512em;
padding: 0 0.512em 0.512em;
}
#sidebar-second {
}
.region-sidebar-second {
margin: 0 0 0.512em;
padding: 0 0.512em 0.512em;
}
#section-footer {
font-size: 0.8em; /* 11.2px */
line-height: 1.875em;
padding: 0 0 1.875em;
text-align: center;
font-size: 0.8em; /* 11.2px */
line-height: 1.875em;
}
#section-footer a {
......@@ -75,8 +69,8 @@ form#search-theme-form {
/** Styling for nodes **/
.node .submitted {
font-style: italic;
margin: 0 0 0.625em;
font-style: italic;
}
div.field-label-inline {
......@@ -86,9 +80,9 @@ div.field-label-inline {
/* Format links section. */
.node .content .links {
text-transform: uppercase;
font-size: 0.8em; /* 11.2px */
line-height: 1.875em;
text-transform: uppercase;
}
.node .content .links li {
......@@ -96,28 +90,28 @@ div.field-label-inline {
}
.node .content .links a {
background: #ffa;
-moz-border-radius: 0.262em;
border-radius: 0.262em;
color: #777;
padding: 0.134em 0.328em;
text-decoration: none;
color: #777;
-moz-border-radius: 0.262em;
border-radius: 0.262em;
background: #ffa;
}
.node .content .links a:hover {
color: #555;
text-decoration: underline;
color: #555;
}
/** Media Queries **/
@media only screen and (min-width: 768px) {
#content-inner {
padding: 0 0.625em 1.5em;
}
}
@media only screen and (min-width: 1200px) {
#secondary-menu, #section-header, #section-navigation, #section-main, #section-footer {
margin: 0 0.3125em;
}
......
......@@ -6,10 +6,10 @@
/* Main Navigation */
ul#main-menu {
font-size: 1.25em; /* 17.500px */
line-height: 1.2em;
margin: 0;
padding: 0.6em 0;
font-size: 1.25em; /* 17.500px */
line-height: 1.2em;
}
ul#main-menu li.expanded,
......@@ -24,20 +24,14 @@ ul#main-menu a {
text-decoration: none;
}
ul#main-menu a:hover { }
/* Secondary Navigation */
ul#secondary-menu {
float: right;
line-height: 1.5em;
padding: 0.25em 0; /* todo: test these values */
line-height: 1.5em;
}
ul#secondary-menu li { }
ul#secondary-menu a { }
/* Sidebar Menus */
.sidebar ul.menu {
......@@ -63,8 +57,8 @@ ul#secondary-menu a { }
.sidebar ul.menu .expanded,
.sidebar ul.menu .collapsed {
list-style-image: none;
list-style-type: none;
list-style-image: none;
}
.sidebar ul.menu ul.menu {
......@@ -94,21 +88,21 @@ ul#secondary-menu a { }
}
#block-menu-menu-footer-links a {
text-decoration: underline;
color: #444;
font-size: 11px;
font-weight: normal;
text-decoration: underline;
}
@media only screen and (min-width: 500px) {
ul#main-menu > li {
display: inline-block;
text-align: center;
}
}
@media only screen and (min-width: 768px) {
.sidebar ul.menu {
text-align: left;
}
......
......@@ -22,6 +22,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
}
/* Corrects inline-block not defined in IE6/7/8 and FF3 */
audio, canvas, video {
display: inline-block;
*display: inline;
......@@ -33,6 +34,7 @@ audio:not([controls]) {
}
/* Ensures content is hidden from all presentations, including screenreaders */
[hidden] {
display: none;
visibility: hidden;
......@@ -48,6 +50,7 @@ audio:not([controls]) {
}
/* Switch box model back for colorbox module. */
#colorbox, #cboxOverlay, #cboxWrapper {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
......@@ -62,65 +65,67 @@ audio:not([controls]) {
* To add a background to the PAGE, set it in the 'html' element
* To add a background to the WRAPPER, set it in the 'body' element
*/
html {
overflow-y: scroll; /* Force a scrollbar in non-IE */
height: 100%;
font-size: 87.5%;
overflow-y: scroll; /* Force a scrollbar in non-IE */
-webkit-text-size-adjust: 100%; /* Prevent iOS text size adjust on orientation change without disabling user zoom */
-ms-text-size-adjust: 100%;
}
body {
margin: 0 auto;
min-height: 100%;
margin: 0 auto;
text-rendering: optimizelegibility;
}
/* Fonts settings based on the 100E2R standard: http://www.informationarchitects.jp/en/100e2r/ */
body, button, caption, fieldset, input, legend, option, select, textarea, td, th {
max-width: 100%; /* Fixes forms and tables to be responsive */
color: #222; /* Full black on white is too much contrast, #222 is a better default */
font: 1em/1.625 Georgia, serif;
max-width: 100%; /* Fixes forms and tables to be responsive */
}
/* Headings - sizes are set in media query section below */
/* For info on transitioning, see http://elliotjaystocks.com/blog/css-transitions-media-queries */
h1, h2, h3, h4, h5, h6 {
/*font-family: Palatino, 'Palatino Linotype', 'Book Antiqua', FreeSerif, Georgia, serif;*/
-o-transition: all 0.2s linear;
-moz-transition: all 0.2s linear;
-webkit-transition: all 0.2s linear;
transition: all 0.2s linear;
/* font-family: Palatino, 'Palatino Linotype', 'Book Antiqua', FreeSerif, Georgia, serif; */
font-size: 1em;
font-weight: bold;
transition: all .2s linear;
-o-transition: all .2s linear;
-moz-transition: all .2s linear;
-webkit-transition: all .2s linear;
}
/* Font size = 14px (87.5%), line height = 21px (1.5em), interval = major third (1:1.25) */
/* http://modularscale.com/scale/?px1=14&px2=&ra1=1.25&ra2=0 */
h1 {
margin: 0 0 0.6144em;
font-size: 2.441em; /* 34.18px */
line-height: 1.2288em;
margin: 0 0 0.6144em;
}
h2 {
margin: 0 0 0.768em;
font-size: 1.953em; /* 27.344px */
line-height: 1.5360em;
margin: 0 0 0.7680em;
line-height: 1.536em;
}
h3 {
font-size: 1.563em; /* 21.875px */
line-height: 1.9200em;
margin: 0 0 0.96em;
font-size: 1.563em; /* 21.875px */
line-height: 1.92em;
}
h4 {
margin: 0 0 1.2em;
font-size: 1.25em; /* 17.500px */
line-height: 1.2em;
margin: 0 0 1.2em;
}
h5 {
......@@ -132,12 +137,13 @@ h6 {
}
small {
margin: 0 0 1.875em;
font-size: 0.8em; /* 11.2px */
line-height: 1.875em;
margin: 0 0 1.875em;
}
/* Add and/or remove tags as your baseline grid needs */
p, blockquote, q, pre, address, hr, code, samp, dl, ol, ul, form, table, fieldset, menu, figure, figcaption, button {
margin: 0 0 1.625em;
}
......@@ -149,37 +155,38 @@ img.file-icon {
/** Preformatted text and code **/
/* Allows line wrapping of 'pre' */
pre, code {
background-color: #eee;
border: 1px solid #aaa;
display: block;
margin: 0.33em 0;
padding: 0.33em;
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
border: 1px solid #aaa;
background-color: #eee;
}
pre, code, kbd, samp {
font: 1em/1.625em Menlo, Consolas, 'DejaVu Sans Mono', Monaco, 'Bistream Vera Sans Mono', 'Courier New', Courier, monospace;
font: 1em/1.625em Menlo, Consolas, "DejaVu Sans Mono", Monaco, "Bistream Vera Sans Mono", "Courier New", Courier, monospace;
}
/* Undo previous formatting for editing tips. */
ul.tips code {
background: inherit;
border: none;
display: inline;
margin: inherit;
padding: inherit;
border: none;
background: inherit;
}
/** Tables **/
table {
border-collapse: collapse;
border-spacing: 0;
width: 99%;
border-spacing: 0;
border-collapse: collapse;
}
th {
......@@ -188,7 +195,7 @@ th {
tr, th, td {
/* Not sure where this baggage came from. */
/*padding-right: 1.625em;*/
/* padding-right: 1.625em; */
}
tr.even {
......@@ -200,10 +207,10 @@ tr.odd {
}
table.views-table caption {
font-size: 1.15em;
font-weight: bold;
margin: 2em 0 0.4em;
text-align: left;
font-size: 1.15em;
font-weight: bold;
}
/** Forms **/
......@@ -213,8 +220,8 @@ form {
}
fieldset {
border: 0;
padding: 0;
border: 0;
}
textarea {
......@@ -223,8 +230,8 @@ textarea {
}
legend {
border: 0;
*margin-left: -7px;
border: 0;
}
button, input, select, textarea {
......@@ -233,8 +240,8 @@ button, input, select, textarea {
}
button, input {
line-height: normal;
*overflow: visible;
line-height: normal;
}
button, input[type="button"], input[type="reset"], input[type="submit"] {
......@@ -258,11 +265,12 @@ input[type="search"]::-webkit-search-decoration {
}
button::-moz-focus-inner, input::-moz-focus-inner {
border: 0;
padding: 0;
border: 0;
}
/* Reintroduce inner spacing in 'table' to avoid overlap and whitespace issues in IE6/7 */
table button, table input {
*overflow: auto;
}
......@@ -274,7 +282,7 @@ blockquote, q {
}
blockquote:before, blockquote:after, q:before, q:after {
content: '';
content: "";
content: none;
}
......@@ -283,9 +291,9 @@ blockquote, q, cite {
}
blockquote {
border-left: 4px solid #ddd;
margin-left: 1em;
padding-left: 0.625em;
border-left: 4px solid #ddd;
}
blockquote > p {
......@@ -295,9 +303,9 @@ blockquote > p {
/** Lists **/
ul, ol {
list-style-position: outside;
margin: 0 0 1.625em 1.625em;
padding: 0;
list-style-position: outside;
}
li {
......@@ -322,17 +330,27 @@ li ul, li ol {
}
ul { list-style-type: disc; }
ul ul { list-style-type: circle; }
ul ul ul { list-style-type: square; }
ul ul ul ul { list-style-type: circle; }
ol { list-style-type: decimal; }
ol ol { list-style-type: lower-alpha; }
ol ol ol { list-style-type: decimal; }
ol.upper-alpha { list-style-type: upper-alpha; }
ol.lower-alpha { list-style-type: lower-alpha; }
ol.upper-roman { list-style-type: upper-roman; }
ol.lower-roman { list-style-type: lower-roman; }
ol.decimal { list-style-type: decimal; }
/* Menus */
......@@ -342,8 +360,8 @@ ul.menu {
}
li.expanded, li.collapsed, li.leaf, ul.menu li {
padding: 0;
margin: 0 0 0.3125em 0;
padding: 0;
}
/* Tabs */
......@@ -362,7 +380,7 @@ dl dd {
}
dt {
margin 0 0 0.8125;
margin: 0 0 0.8125;
}
dl.node-type-list dt {
......@@ -374,8 +392,8 @@ dl.node-type-list dt {
/* When declaring Link states, remember: LoVe HA : Link | Hover | Visited | Active */
a, a:visited {
color: #06c;
text-decoration: none;
color: #06c;
}
a:hover {
......@@ -387,6 +405,7 @@ a:focus {
}
/* Better CSS outline suppression: people.opera.com/patrickl/experiments/keyboard/test */
a:hover, a:active {
outline: none;
}
......@@ -394,20 +413,20 @@ a:hover, a:active {
/* Edit links for views */
.edit-link {
font-size: 0.625em;
margin-bottom: 0.625em;
padding-left: 0.3125em;
text-transform: uppercase;
font-size: 0.625em;
}
.edit-link a {
color: #aaa;
text-decoration: none;
color: #aaa;
}
.edit-link a:hover {
color: #555;
text-decoration: underline;
color: #555;
}
/** Figures **/
......@@ -433,6 +452,7 @@ img {
}
/* Corrects overflow displayed oddly in IE9 */
svg:not(:root) {
overflow: hidden;
}
......@@ -440,17 +460,17 @@ svg:not(:root) {
/** Abbreviations **/
abbr[title], dfn[title] {
border-bottom: 1px dotted;
cursor: help;
white-space: nowrap;
border-bottom: 1px dotted;
}
/* Date-based "abbreviations" show computer-friendly timestamps which are not human-friendly. */
abbr.created {
border: none;
cursor: auto;
white-space: normal;
border: none;
}
/** Marked/inserted/deleted text **/
......@@ -460,8 +480,8 @@ mark {
}
ins {
background: #ff9;
text-decoration: none;
background: #ff9;
}
del {
......@@ -471,10 +491,10 @@ del {
/** Others **/
hr {
border: 0;
border-bottom: 1px solid #ddd;
display: block;
height: 1px;
border: 0;
border-bottom: 1px solid #ddd;
}
strong, b, dt {
......@@ -490,11 +510,12 @@ var, address {
}
/* Position 'sub' and 'sup' without affecting line-height: gist.github.com/413930 */
sub, sup {
font-size: 0.625em;
line-height: 0;
position: relative;
vertical-align: baseline;
font-size: 0.625em;
line-height: 0;
}
sup {
......@@ -511,9 +532,10 @@ sub {
* Micro clearfix hack, more semantically titled with 'group'
* Source: nicolasgallagher.com/micro-clearfix-hack/
*/
.group:before, .group:after {
content: "";
display: table;
content: "";
}
.group:after {
......@@ -527,24 +549,24 @@ sub {
/* User Interface Styles */
.resizable-textarea textarea {
font-size:14px!important;
font-size: 14px!important;
}
.messages {
margin: 0.625em 0;
padding: 0.625em;
color: #04a107;
border: 1px solid #04a107;
background-color: #edffed;
color: #04a107;
padding: 0.625em;
margin: 0.625em 0;
}
/* Quick-and-dirty yellow box. (Hint: Use on paragraphs) */
.yellowbox {
background: #FF8;
border: 1px solid #F88;
padding: 0.625em 1.625em;
text-align: center;
border: 1px solid #f88;
background: #ff8;
}
/* clear classes for content */
......@@ -583,11 +605,11 @@ sub {
#skip-nav a, #skip-nav a:hover, #skip-nav a:visited {
position: absolute;
left: 0;
top: -500px;
left: 0;
overflow: hidden;
width: 1px;
height: 1px;
overflow: hidden;
}
#skip-nav a:active, #skip-nav a:focus {
......
......@@ -4,11 +4,11 @@
*/
* {
-ms-filter: none !important;
filter: none !important;
color: #000 !important; /* Black prints faster: sanbeiji.com/archives/953 */
background: transparent;
color: black !important; /* Black prints faster: sanbeiji.com/archives/953 */
text-shadow: none !important;
filter: none !important;
-ms-filter: none !important;
}
/* Hide these elements */
......@@ -34,9 +34,9 @@
*/
body, button, caption, fieldset, input, legend, option, select, textarea, td, th {
color: #222; /* Full black on white is too much contrast, #222 is a better default */
font: 10pt Times New Roman, Times,serif;
letter-spacing: normal;
color: #222; /* Full black on white is too much contrast, #222 is a better default */
font: 10pt "Times New Roman", Times, serif;
line-height: normal;
}
......@@ -44,44 +44,44 @@ body, button, caption, fieldset, input, legend, option, select, textarea, td, th
/* For info on transitioning, see http://elliotjaystocks.com/blog/css-transitions-media-queries */
h1, h2, h3, h4, h5, h6 {
/*font-family: Palatino, 'Palatino Linotype', 'Book Antiqua', FreeSerif, Georgia, serif;*/
-o-transition: all 0.2s linear;
-moz-transition: all 0.2s linear;