X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=styl.styl;h=54ac46391425d394a57f6d6406f5b9ff36c416bf;hb=3b9b94e5e746542e8bacec485df87a265e7daeda;hp=b95e4f00ab10d9aea119cdcb1b6a2097843b16b0;hpb=e26265459f66f722029b9558b1eb5d780d7d74b0;p=wfpl-cms.git diff --git a/styl.styl b/styl.styl index b95e4f0..54ac463 100644 --- a/styl.styl +++ b/styl.styl @@ -1,11 +1,10 @@ -@require 'code/wfpl/stylus-helpers.styl' -@require '.image-mtimes.styl' +@require 'inc/wfpl/stylus_helpers.styl' +@require '.sha1sums.styl' // dimensions site-width = 934px // inside the shadow site-padding = 30px -sidebar-width = 220px -content-width = (site-width - (site-padding * 3) - sidebar-width) +content-width = (site-width - (site-padding * 2)) font-size-normal = 15px font-size-small = 13px font-size-tiny = 11px @@ -20,7 +19,7 @@ window-bg = #e6e7e8 // always show vertical scrollbar, so content doesn't shift around when // switching from tall to short pages html - overflow-y: scroll + overflow-y: scroll header, hgroup, section, footer, aside, nav, article, figure, img display: block @@ -31,9 +30,10 @@ code.html border: 1px solid black background: #ccc -* + .caption - margin-top: 15px +.caption font-weight: bold + * + & + margin-top: 15px .field padding-top: 3px; @@ -130,23 +130,20 @@ p.attrib, p.attribution body margin: 0 padding: 0 + background: window-bg color: content-fg font: font-size-normal Arimo, Arial, sans-serif - // Styles for the tag within ckeditor - background: content-bg - width: content-width - margin: 0 auto - &.real_body_tag // revert the above for the on the real site - background: window-bg - width: auto - margin: 0 - // expand the ckeditor widget so there's space for the content to be exactly // the size of the content outside the editor #cke_content margin-right: -15px margin-left: -15px +// tag within ckeditor +#admin_pages-wysiwyg-content + background: content-bg + width: content-width + margin: 0 auto // outermost div for centering, shadow, etc #centerer @@ -162,16 +159,16 @@ body nav#site-nav padding-bottom: 20px ul - li-reset() - space-evenly() + li_reset() + space_evenly() footer clear: both padding-top: 40px ul - li-reset() + li_reset() li - li-reset() + li_reset() display: inline-block margin-right: 10px @@ -242,6 +239,7 @@ td > :first-child, th > :first-child, legend + *, article > :first-child, +aside > :first-child, section > :first-child, nav > :first-child, div > :first-child, @@ -252,6 +250,7 @@ td > :last-child, th > :last-child, fieldset > :last-child, article > :last-child, +aside > :last-child, section > :last-child, nav > :last-child, div > :last-child, @@ -259,6 +258,9 @@ div > :last-child, margin-bottom: 0px table.evenodd + td, th + padding: 6px 12px + text-align: left > thead, > tbody, & > tr:nth-child(2n+1) > td, > th @@ -272,3 +274,11 @@ table.evenodd &:hover > td, > th background: rgba(0,0,0,0.09) + +.field_error + input + border: 1px solid red + +.password_suggestion + & + & + margin-left: 10px