From dab2c8b55c4cad26e935ec9a453a1af1c6698457 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 6 Oct 2011 20:48:19 -0700 Subject: I ran magit to make my small commit, but noticed that apparently I hadn't commited in a while. So here. --- .gitignore | 3 +- Makefile | 7 +++-- header.php.patch | 4 +-- logo-style.scss.php | 1 - style.scss | 83 +++++++++++++++++++++++++++++++-------------------- twentyeleven-fix.scss | 71 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 129 insertions(+), 40 deletions(-) create mode 100644 twentyeleven-fix.scss diff --git a/.gitignore b/.gitignore index 4537eb6..639f69d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,11 @@ # ignore everyting * # but these: -!img/swoosh.png +!img/swoosh.svg !style.scss !header.php.patch !Makefile !logo-style.scss.php !license.txt !css_shadow.php +!twentyeleven-fix.scss diff --git a/Makefile b/Makefile index aad371c..c782b9b 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,12 @@ srcfiles = \ Makefile \ logo-style.scss.php \ license.txt \ - css_shadow.php + css_shadow.php \ + twentyeleven-fix.scss all: header.php style.css img/swoosh.png .gitignore -style.css: logo-style.scss +style.css: logo-style.scss twentyeleven-fix.scss %: %.patch ../twentyeleven/% $(RM) $@ @@ -29,7 +30,7 @@ style.css: logo-style.scss $(PHP) -f $< > $@ %.png: %.svg - rsvg-convert $< > $@ + rsvg-convert $< > $@.$$$$ && pngcrush $@.$$$$ $@ ; $(RM) $@.$$$$ .gitignore: Makefile echo "# DO NOT EDIT, this file is automatically made by \`Makefile'" >$@ diff --git a/header.php.patch b/header.php.patch index 9fba494..fbb1e7a 100644 --- a/header.php.patch +++ b/header.php.patch @@ -7,9 +7,9 @@ -

-

+ -+

Kil-a-Bytes

-+

McKenzie Center for Innovation and Technology

+

1024

++

Kil-A-Bytes

++

McKenzie Center for Innovation and Technology

- .04, 'top' =>.04, 'steps'=>10, 'color'=>'#FFFFFF')); ?> -@import url('http://fonts.googleapis.com/css?family=Anton'); @mixin transform($arg) { transform: $arg; diff --git a/style.scss b/style.scss index 8022eef..0b6033c 100644 --- a/style.scss +++ b/style.scss @@ -14,12 +14,16 @@ Version: 0.1 Template: twentyeleven */ +@import url('http://fonts.googleapis.com/css?family=Anton'); @import "../twentyeleven/style.css"; +@import "twentyeleven-fix.scss"; @import "logo-style.scss"; + + $yellow : #FFFF00; $background-blue: #2210D2; -$highlight-blue : #0000FF; //<-lighter that background, darker than light +$highlight-blue : #0000FF; //<-lighter than background, darker than light $light-blue : #1E90FF; @mixin gradient($color1, $color2) { @@ -35,7 +39,8 @@ $light-blue : #1E90FF; body { background-color: $background-blue; #page { - $border-width: 0.1em; + //I wouldn't use px, but we get roundoff errors otherwise + $border-width: 1px; border: { style: solid; width: $border-width; @@ -57,8 +62,11 @@ body { overflow: hidden; box-shadow: 0 .15em 0 #AAAAFF inset; - height: 175px; - padding: 25px 50% 0 3em; + $bg-width: 472px; + $bg-height: 200px; + $padding-top: 25px; + height: $bg-height - $padding-top; + padding: $padding-top $bg-width 0 3em; background: { color: $light-blue; image: url('img/swoosh.png'); @@ -98,7 +106,7 @@ body { } } -@media (max-width: 1050px) { +@mixin small_branding { body #page header#branding hgroup { #team-name { font-size: 60px; @@ -106,37 +114,46 @@ body { h2 { font-size: 30px; } - } + } } -@media (max-width: 800px) { - body #page header#branding hgroup { - height: auto; - background-image: none; - #team-name{ - font-size: 3em; - } - h2 { - font-size: 2em; - } - #team-number { - font-size: 5em; - position: relative; - right: auto; - &:before { - text-shadow: none; - transform: none; - content: "FRC"; - color: white; - font-family: serif; - font-size: 0.2em; - vertical-align: text-top; +@media (max-width: 1050px) { + @include small_branding; +} +@media (max-width: 800px) { + body #page header#branding { + hgroup { + height: auto; + background-image: none; + padding: 2em; + + h1, h2 { + clear:none; + } + #team-name{ + font-size: 3em; + float: left + } + h2 { + font-size: 2em; + float: left; + } + #team-number { + font-size: 5em; + float: right; + + position: relative; + right: auto; + &:before { + text-shadow: none; + transform: none; + content: "FRC"; + color: white; + font-family: serif; + font-size: 0.2em; + vertical-align: text-top; + } } } } } -/* -div.menu-wp_nav_menu-container { - margin: 0 .5em !important; -} -*/ \ No newline at end of file diff --git a/twentyeleven-fix.scss b/twentyeleven-fix.scss new file mode 100644 index 0000000..bbfa208 --- /dev/null +++ b/twentyeleven-fix.scss @@ -0,0 +1,71 @@ +body { + padding: 0; + #page header#branding #access { + ul { + :hover > ul, + :hover + ul, + :active > ul, + :active + ul, + :focus > ul, + :focus + ul { + display: block; + } + } + } +} + +@mixin searchform_wide($border_width) { + position: relative !important; + top: auto !important; + bottom: auto !important; + left: auto !important; + right: auto !important; + width: 100%; + max-width: none; + .field { + float: none; + width: 100%; + display: block; + margin-left: -$border_width; + } +} + +@media (max-width: 800px) { + body #page header#branding { + .only-search, #searchform { + padding-right: 10px+28px;// matches twentyeleven values + } + #searchform { + @include searchform_wide(1px); + } + #access { + ul, div { + margin: 0; + padding: 0; + } + ul { + li { + float: none; + display: block; + width: 50%; + ul { + left: 100%; + top: 0; + } + ul { + width: 100%; + li, a { + width: auto; + } + } + } + } + } + } +} + +#ie6 { + body #page header#branding #searchform { + @include searchform_wide(1px); + } +} -- cgit v1.2.3