From 145f81046bc5881d7da86b05c8b92862b63f8080 Mon Sep 17 00:00:00 2001 From: B Mathis Date: Thu, 5 Nov 2009 21:30:03 -0600 Subject: updated rake file, reorganized stylesheets, added google site search, added google analytics --- source/stylesheets/_base.sass | 3 + source/stylesheets/_layout.sass | 119 +++++++++++++++++++++ source/stylesheets/_partials.sass | 2 + source/stylesheets/_theme.sass | 49 +++++++++ source/stylesheets/_typography.sass | 27 +++++ source/stylesheets/partials/_base.sass | 16 --- source/stylesheets/partials/_main.sass | 4 - source/stylesheets/partials/_search.sass | 18 ++++ source/stylesheets/partials/_twitter.sass | 2 + source/stylesheets/partials/base/_typography.sass | 27 ----- .../stylesheets/partials/main/_flash_messages.sass | 36 ------- source/stylesheets/partials/main/_form.sass | 61 ----------- source/stylesheets/partials/main/_layout.sass | 117 -------------------- source/stylesheets/partials/main/_theme.sass | 49 --------- source/stylesheets/partials/main/_twitter.sass | 2 - source/stylesheets/screen.sass | 12 ++- 16 files changed, 230 insertions(+), 314 deletions(-) create mode 100644 source/stylesheets/_base.sass create mode 100644 source/stylesheets/_layout.sass create mode 100644 source/stylesheets/_partials.sass create mode 100644 source/stylesheets/_theme.sass create mode 100644 source/stylesheets/_typography.sass delete mode 100644 source/stylesheets/partials/_base.sass delete mode 100644 source/stylesheets/partials/_main.sass create mode 100644 source/stylesheets/partials/_search.sass create mode 100644 source/stylesheets/partials/_twitter.sass delete mode 100644 source/stylesheets/partials/base/_typography.sass delete mode 100644 source/stylesheets/partials/main/_flash_messages.sass delete mode 100644 source/stylesheets/partials/main/_form.sass delete mode 100644 source/stylesheets/partials/main/_layout.sass delete mode 100644 source/stylesheets/partials/main/_theme.sass delete mode 100644 source/stylesheets/partials/main/_twitter.sass (limited to 'source/stylesheets') diff --git a/source/stylesheets/_base.sass b/source/stylesheets/_base.sass new file mode 100644 index 00000000..82b34b76 --- /dev/null +++ b/source/stylesheets/_base.sass @@ -0,0 +1,3 @@ +//compass default reset ++global-reset +@import compass/utilities.sass \ No newline at end of file diff --git a/source/stylesheets/_layout.sass b/source/stylesheets/_layout.sass new file mode 100644 index 00000000..ab06b650 --- /dev/null +++ b/source/stylesheets/_layout.sass @@ -0,0 +1,119 @@ +!page_width = 900px +!sidebar_width = 250px +!sidebar_margin = 30px +!pad = 15px +!default_border_radius = 4px + +html body + background-color= !body_bg + color= !body_color + a + color= !link_color + +#footer a + color= #ddd + &:hover + color = #fff +#header + background-color= !header_bg + border-bottom= "1px solid" !header_border + padding: 30px 0 + .page_width + position: relative + a.title + font-size= !h1 + +heading-font + display: inline-block + color= !title_color + text-decoration: none + +#nav + +clearfix + position: relative + z-index: 1 + padding: 6px 0 + background: + color= !nav_bg + image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4)) + image: -moz-linear-gradient(left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4)) + border: + top= "1px solid" !nav_border_top + bottom= "1px solid" !nav_border_bottom + ul + position: relative + +horizontal-list + margin: 0 auto + overflow: visible + li + padding: 0 15px + border-left= "1px solid" !nav_border_left + border-right= "1px solid" !nav_border_right + &.alpha + border-left: none + padding-left: 0 + &.omega + border-right: 0 + &.subscribe + position: absolute + left= !page_width - !sidebar_width - !sidebar_margin/2 + border: none + a + display: inline-block + padding-left: 28px + background: url("/images/rss.png") left top no-repeat + a + display: inline-block + color= !nav_color + line-height: 150% + text-decoration: none + &:hover + color= !nav_color_hover + +.page_width + width= !page_width + margin: 0 auto + padding: + left: 30px + right: 30px + +#page + +clearfix + background-color= !page_bg + .page_width + +clearfix + padding: + top: 25px + bottom: 25px + background-color= !blog_bg + +easy-box-shadow(#ccc) + border: + left= "1px solid" !page_border_sides + right= "1px solid" !page_border_sides +#main + width= !page_width - !sidebar_width - !sidebar_margin +#sidebar + width= !sidebar_width + margin-left= !sidebar_margin + +#main, #sidebar + float: left + +.blog + .article + padding= !base_font_size * 1.5 0 !base_font_size * 1.5 + border-bottom= "1px solid" !article_border + &:first-child + padding-top: 0 + .footer + padding-top= !base_font_size + + +#footer + position: relative + z-index: 2 + font-size= !base_font_size_small + clear: both + padding= !base_font_size * 1.5 0 + color= !footer_color + +h-linear-gradient(darken(!body_bg, 25), !body_bg) + border-top= "14px solid" !footer_bg \ No newline at end of file diff --git a/source/stylesheets/_partials.sass b/source/stylesheets/_partials.sass new file mode 100644 index 00000000..326df48d --- /dev/null +++ b/source/stylesheets/_partials.sass @@ -0,0 +1,2 @@ +@import partials/twitter.sass +@import partials/search.sass \ No newline at end of file diff --git a/source/stylesheets/_theme.sass b/source/stylesheets/_theme.sass new file mode 100644 index 00000000..b159019e --- /dev/null +++ b/source/stylesheets/_theme.sass @@ -0,0 +1,49 @@ +// Link Colors +!link_color = #165B94 + +// Main Section Colors +!body_color = #333 +!body_bg = #323232 + +!header_bg = #323232 +!header_border = #181818 +!title_color = #ddd + +!nav_color = #555 +!nav_color_hover = #000 +!nav_bg = #e8e8e8 +!nav_border_top = #fff +!nav_border_bottom = #aaa +!nav_border_left = #ccc +!nav_border_right = #fff + +!page_border_sides = #ccc +!page_bg = #f0f0f0 + +// Blog +!article_border = #eee +!blog_bg = #fff + +!footer_color = #999 +!footer_bg = #444 + +// Form Colors +!fieldset_bg = #ececec +!fieldset_border = #c3c3c3 + +!textinput_color = #333 +!textinput_bg = #f4f4f4 +!textinput_bg_focus = #fefeee + +!textinput_border_top = #aaa +!textinput_border_bottom = #c6c6c6 +!textinput_border_left = #c3c3c3 +!textinput_border_right = #c3c3c3 +!textinput_border_focus = #989898 + +!cancel_link = #555 + +// Button Colors +!default_button_text_color = #fff +!default_button_bg = yellow +!blue_btn = desaturate(adjust_hue(!default_button_bg, -16), 25) \ No newline at end of file diff --git a/source/stylesheets/_typography.sass b/source/stylesheets/_typography.sass new file mode 100644 index 00000000..b5fcd56e --- /dev/null +++ b/source/stylesheets/_typography.sass @@ -0,0 +1,27 @@ +!base_font_size = 16px +!base_font_size_small = 13px +!base_font_color = #333 +!default_border_radius = 6px + ++general-typography +=heading-font + +serif-font +=quote-font + +serif-font + +body + font-size= !base_font_size + +sans-font + +h1,h2,h3,h4,h5,h6 + color: #333 + font-weight: bold + +heading-font + +blockquote + +heading-font + font-size= !base_font_size * 1.2 +.quote blockquote + font-size= !h4 + line-height= !h5 * 1.625 + color: #555 \ No newline at end of file diff --git a/source/stylesheets/partials/_base.sass b/source/stylesheets/partials/_base.sass deleted file mode 100644 index c88d3c01..00000000 --- a/source/stylesheets/partials/_base.sass +++ /dev/null @@ -1,16 +0,0 @@ -//compass default reset -+global-reset -//my reset -button - margin: 0 - padding: 0 - background: none - border: none - cursor: pointer - -button::-moz-focus-inner - border: none - padding: 0 - -@import compass/utilities.sass -@import base/typography.sass \ No newline at end of file diff --git a/source/stylesheets/partials/_main.sass b/source/stylesheets/partials/_main.sass deleted file mode 100644 index 374268c8..00000000 --- a/source/stylesheets/partials/_main.sass +++ /dev/null @@ -1,4 +0,0 @@ -@import main/theme.sass -@import main/layout.sass -@import main/form.sass -@import main/twitter.sass \ No newline at end of file diff --git a/source/stylesheets/partials/_search.sass b/source/stylesheets/partials/_search.sass new file mode 100644 index 00000000..4de9c021 --- /dev/null +++ b/source/stylesheets/partials/_search.sass @@ -0,0 +1,18 @@ +#search + position: absolute + left= !page_width + !sidebar_margin - !sidebar_width + top= 10% + form + background: url(/images/search_bg.png) no-repeat + padding: 2px 0 0 + height: 28px + width: 218px + #q + background: none + width: 160px + margin-left: 30px + font-size: 15px + border: none + color: #aaa + &:focus + outline: none \ No newline at end of file diff --git a/source/stylesheets/partials/_twitter.sass b/source/stylesheets/partials/_twitter.sass new file mode 100644 index 00000000..baeef5b4 --- /dev/null +++ b/source/stylesheets/partials/_twitter.sass @@ -0,0 +1,2 @@ +#twitter + font-size: 85% \ No newline at end of file diff --git a/source/stylesheets/partials/base/_typography.sass b/source/stylesheets/partials/base/_typography.sass deleted file mode 100644 index b5fcd56e..00000000 --- a/source/stylesheets/partials/base/_typography.sass +++ /dev/null @@ -1,27 +0,0 @@ -!base_font_size = 16px -!base_font_size_small = 13px -!base_font_color = #333 -!default_border_radius = 6px - -+general-typography -=heading-font - +serif-font -=quote-font - +serif-font - -body - font-size= !base_font_size - +sans-font - -h1,h2,h3,h4,h5,h6 - color: #333 - font-weight: bold - +heading-font - -blockquote - +heading-font - font-size= !base_font_size * 1.2 -.quote blockquote - font-size= !h4 - line-height= !h5 * 1.625 - color: #555 \ No newline at end of file diff --git a/source/stylesheets/partials/main/_flash_messages.sass b/source/stylesheets/partials/main/_flash_messages.sass deleted file mode 100644 index bdc9f9c1..00000000 --- a/source/stylesheets/partials/main/_flash_messages.sass +++ /dev/null @@ -1,36 +0,0 @@ -!flash_notice ||= #00529B -!flash_success ||= #4F8A10 -!flash_warning ||= #FBF4BD -!flash_error ||= #D8000C -!flash_notice_bg ||= #BDE5F8 -!flash_success_bg ||= #DFF2BF -!flash_warning_bg ||= #FBF4BD -!flash_error_bg ||= #FFD9DA - -=flash-message-style - +flash-message-structure - &.notice - +flash-color(!flash_notice, !flash_notice_bg) - &.success - +flash-color(!flash_success, !flash_success_bg) - &.warning - +flash-color(!flash_warning, !flash_warning_bg) - &.error - +flash-color(!flash_error, !flash_error_bg) - -=flash-message-structure - background-repeat: no-repeat - background-position: 10px center - border: 1px dashed - padding: 10px 15px - margin: 0 0 15px - -=flash-color(!color, !bg = 0) - color= !color - @if !bg == 0 - background-color= desaturate(lighten(adjust_hue(!color, -10), 83), 20) - @else - background-color= !bg - -#flash - +flash-message-style \ No newline at end of file diff --git a/source/stylesheets/partials/main/_form.sass b/source/stylesheets/partials/main/_form.sass deleted file mode 100644 index dc28ff0f..00000000 --- a/source/stylesheets/partials/main/_form.sass +++ /dev/null @@ -1,61 +0,0 @@ -#page - form - clear: both - padding-bottom= !pad - fieldset, fieldset input.textbox, fieldset textarea - +border-radius - fieldset - background-color= !fieldset_bg - width: 480px - border= "1px solid" !fieldset_border - padding: 35px 25px 20px - margin-bottom= !pad*2.2 - label - font-size: 90% - display: block - padding-bottom: 4px - select - font-size: 110% - input.textbox, textarea - font-size: 115% - color= !textinput_color - background-color= !textinput_bg - - width: 70% - padding: 6px 8px - outline: 0 - display: inline-block - - border: 1px solid - border-top-color= !textinput_border_top - border-bottom-color= !textinput_border_bottom - border-left-color= !textinput_border_left - border-right-color= !textinput_border_right - - &:focus - background= !textinput_bg_focus - border-color= !textinput_border_focus - - input.checkbox, label.checkbox - display: inline-block - p - +clearfix - padding= 0 8px !pad - input.wrong:focus - outline: 2px solid #d0a5a5 - background: #fef2f2 - button - +border-radius(5px) - +btn-style(!blue_btn) - +btn-structure(18px, 1px) - color= !default_button_text_color - border: - width: 1px - style: solid - &:hover, &:focus - +btn-style-hover(!blue_btn) - outline: none - &:active - +btn-style-active(!blue_btn) - a.cancel - color= !cancel_link \ No newline at end of file diff --git a/source/stylesheets/partials/main/_layout.sass b/source/stylesheets/partials/main/_layout.sass deleted file mode 100644 index 0275a511..00000000 --- a/source/stylesheets/partials/main/_layout.sass +++ /dev/null @@ -1,117 +0,0 @@ -!page_width = 900px -!sidebar_width = 250px -!sidebar_margin = 30px -!pad = 15px -!default_border_radius = 4px - -html body - background-color= !body_bg - color= !body_color - a - color= !link_color - -#footer a - color= #ddd - &:hover - color = #fff -#header - background-color= !header_bg - border-bottom= "1px solid" !header_border - padding: 30px 0 - a.title - font-size= !h1 - +heading-font - display: inline-block - color= !title_color - text-decoration: none - -#nav - +clearfix - position: relative - z-index: 1 - padding: 6px 0 - background: - color= !nav_bg - image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4)) - image: -moz-linear-gradient(left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4)) - border: - top= "1px solid" !nav_border_top - bottom= "1px solid" !nav_border_bottom - ul - position: relative - +horizontal-list - margin: 0 auto - overflow: visible - li - padding: 0 15px - border-left= "1px solid" !nav_border_left - border-right= "1px solid" !nav_border_right - &.alpha - border-left: none - padding-left: 0 - &.omega - border-right: 0 - &.subscribe - position: absolute - left= !page_width - !sidebar_width - !sidebar_margin/2 - border: none - a - display: inline-block - padding-left: 28px - background: url("/images/rss.png") left top no-repeat - a - display: inline-block - color= !nav_color - line-height: 150% - text-decoration: none - &:hover - color= !nav_color_hover - -.page_width - width= !page_width - margin: 0 auto - padding: - left: 30px - right: 30px - -#page - +clearfix - background-color= !page_bg - .page_width - +clearfix - padding: - top: 25px - bottom: 25px - background-color= !blog_bg - +easy-box-shadow(#ccc) - border: - left= "1px solid" !page_border_sides - right= "1px solid" !page_border_sides -#main - width= !page_width - !sidebar_width - !sidebar_margin -#sidebar - width= !sidebar_width - margin-left= !sidebar_margin - -#main, #sidebar - float: left - -.blog - .article - padding= !base_font_size * 1.5 0 !base_font_size * 1.5 - border-bottom= "1px solid" !article_border - &:first-child - padding-top: 0 - .footer - padding-top= !base_font_size - - -#footer - position: relative - z-index: 2 - font-size= !base_font_size_small - clear: both - padding= !base_font_size * 1.5 0 - color= !footer_color - +h-linear-gradient(darken(!body_bg, 25), !body_bg) - border-top= "14px solid" !footer_bg \ No newline at end of file diff --git a/source/stylesheets/partials/main/_theme.sass b/source/stylesheets/partials/main/_theme.sass deleted file mode 100644 index b159019e..00000000 --- a/source/stylesheets/partials/main/_theme.sass +++ /dev/null @@ -1,49 +0,0 @@ -// Link Colors -!link_color = #165B94 - -// Main Section Colors -!body_color = #333 -!body_bg = #323232 - -!header_bg = #323232 -!header_border = #181818 -!title_color = #ddd - -!nav_color = #555 -!nav_color_hover = #000 -!nav_bg = #e8e8e8 -!nav_border_top = #fff -!nav_border_bottom = #aaa -!nav_border_left = #ccc -!nav_border_right = #fff - -!page_border_sides = #ccc -!page_bg = #f0f0f0 - -// Blog -!article_border = #eee -!blog_bg = #fff - -!footer_color = #999 -!footer_bg = #444 - -// Form Colors -!fieldset_bg = #ececec -!fieldset_border = #c3c3c3 - -!textinput_color = #333 -!textinput_bg = #f4f4f4 -!textinput_bg_focus = #fefeee - -!textinput_border_top = #aaa -!textinput_border_bottom = #c6c6c6 -!textinput_border_left = #c3c3c3 -!textinput_border_right = #c3c3c3 -!textinput_border_focus = #989898 - -!cancel_link = #555 - -// Button Colors -!default_button_text_color = #fff -!default_button_bg = yellow -!blue_btn = desaturate(adjust_hue(!default_button_bg, -16), 25) \ No newline at end of file diff --git a/source/stylesheets/partials/main/_twitter.sass b/source/stylesheets/partials/main/_twitter.sass deleted file mode 100644 index baeef5b4..00000000 --- a/source/stylesheets/partials/main/_twitter.sass +++ /dev/null @@ -1,2 +0,0 @@ -#twitter - font-size: 85% \ No newline at end of file diff --git a/source/stylesheets/screen.sass b/source/stylesheets/screen.sass index 51e46f6c..e7fcb538 100644 --- a/source/stylesheets/screen.sass +++ b/source/stylesheets/screen.sass @@ -1,3 +1,11 @@ +/* SASS mixins */ @import library.sass -@import partials/base.sass -@import partials/main.sass \ No newline at end of file + +/* primary SASS */ +@import base.sass +@import theme.sass +@import typography.sass +@import layout.sass + +/* specific SASS */ +@import partials.sass \ No newline at end of file -- cgit v1.2.1