Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl-cms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wfpl bump
[wfpl-cms.git]
/
styl.styl
diff --git
a/styl.styl
b/styl.styl
index
72c2e05
..
051415d
100644
(file)
--- a/
styl.styl
+++ b/
styl.styl
@@
-1,11
+1,10
@@
@require 'inc/wfpl/stylus-helpers.styl'
@require 'inc/wfpl/stylus-helpers.styl'
-@require '.image-mtimes.styl'
+@require '.sha1sums.styl'
// dimensions
site-width = 934px // inside the shadow
site-padding = 30px
// 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
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
// 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
header, hgroup, section, footer, aside, nav, article, figure, img
display: block
@@
-131,23
+130,20
@@
p.attrib, p.attribution
body
margin: 0
padding: 0
body
margin: 0
padding: 0
+ background: window-bg
color: content-fg
font: font-size-normal Arimo, Arial, sans-serif
color: content-fg
font: font-size-normal Arimo, Arial, sans-serif
- // Styles for the <body> tag within ckeditor
- background: content-bg
- width: content-width
- margin: 0 auto
- &.real_body_tag // revert the above for the <body> 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
// 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
+// <body> tag within ckeditor
+#admin_pages-wysiwyg-content
+ background: content-bg
+ width: content-width
+ margin: 0 auto
// outermost div for centering, shadow, etc
#centerer
// outermost div for centering, shadow, etc
#centerer
@@
-243,6
+239,7
@@
td > :first-child,
th > :first-child,
legend + *,
article > :first-child,
th > :first-child,
legend + *,
article > :first-child,
+aside > :first-child,
section > :first-child,
nav > :first-child,
div > :first-child,
section > :first-child,
nav > :first-child,
div > :first-child,
@@
-253,6
+250,7
@@
td > :last-child,
th > :last-child,
fieldset > :last-child,
article > :last-child,
th > :last-child,
fieldset > :last-child,
article > :last-child,
+aside > :last-child,
section > :last-child,
nav > :last-child,
div > :last-child,
section > :last-child,
nav > :last-child,
div > :last-child,