Browse Source

Typographic trying out some webfonts

Media query layout improvements
Twitter now splits tweets with <br> and </p><p> on \n and \n\n
RSS icon made a bit smaller
unreleased_contents
Brandon Mathis 14 years ago
parent
commit
7957858bc6
  1. 3
      themes/classic/sass/default/core/_layout.scss
  2. 2
      themes/classic/sass/default/core/_theme.scss
  3. 12
      themes/classic/sass/default/core/_typography.scss
  4. 9
      themes/classic/sass/default/partials/_blog.scss
  5. 2
      themes/classic/sass/default/partials/_navigation.scss
  6. BIN
      themes/classic/source/images/rss.png
  7. 2
      themes/classic/source/javascripts/twitter.js
  8. 2
      themes/classic/source/stylesheets/screen.css

3
themes/classic/sass/default/core/_layout.scss

@ -14,7 +14,7 @@ $sidebar-width-wide: 300px;
//html { } //html { }
body { body {
-webkit-text-size-adjust: none; -webkit-text-size-adjust: none;
max-width: 1400px; max-width: 1350px;
position: relative; position: relative;
margin: 0 auto; margin: 0 auto;
> header, > nav, > footer, #articles > article { > header, > nav, > footer, #articles > article {
@ -112,7 +112,6 @@ body {
} }
@media only screen and (min-width: 992px) { @media only screen and (min-width: 992px) {
body > * { font-size: 1.1em; }
body > header { body > header {
font-size: 1.3em; font-size: 1.3em;
} }

2
themes/classic/sass/default/core/_theme.scss

@ -25,7 +25,7 @@ $sidebar-border: darken($sidebar-bg, 7);
// Blog // Blog
$article-border: #eeeeee; $article-border: #eeeeee;
$main-bg: #f7f7f7; $main-bg: #f9f8f6;
$footer-color: #999999; $footer-color: #999999;
//$footer-bg: #444444; //$footer-bg: #444444;

12
themes/classic/sass/default/core/_typography.scss

@ -7,11 +7,10 @@ $mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
// Fonts // Fonts
//@include font-face("Adelle", font-files("adellebasic_bold-webfont.woff", woff, "adellebasic_bold-webfont.ttf", truetype, "adellebasic_bold-webfont.svg#webfontKykxqSyz", svg), $eot: "adellebasic_bold-webfont.eot" ); //@include font-face("Adelle", font-files("adellebasic_bold-webfont.woff", woff, "adellebasic_bold-webfont.ttf", truetype, "adellebasic_bold-webfont.svg#webfontKykxqSyz", svg), $eot: "adellebasic_bold-webfont.eot" );
.heading { .heading {
font-family: "Georgia", "PT Sans", "Helvetica Neue", Arial, sans-serif; font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif;
font-weight: bold;
} }
.sans { font-family: "Helvetica Neue", Arial, sans-serif; } .sans { font-family: "PT Sans", "Helvetica Neue", Arial, sans-serif; }
.serif { font-family: Georgia, Times, "Times New Roman", serif; } .serif { font-family: "PT Serif", Georgia, Times, "Times New Roman", serif; }
.mono { font-family: $mono; } .mono { font-family: $mono; }
body > header h1 { body > header h1 {
@ -28,7 +27,6 @@ body {
@extend .serif; @extend .serif;
} }
#{headings()}{ #{headings()}{
@extend .heading; @extend .heading;
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
@ -36,8 +34,8 @@ body {
font-weight: normal; font-weight: normal;
} }
h1 { h1 {
font-size: 2em; font-size: 2.4em;
line-height: 1.3334em line-height: 1.2em
} }
h2, section h1 { h2, section h1 {
font-size: 1.5em; font-size: 1.5em;

9
themes/classic/sass/default/partials/_blog.scss

@ -1,11 +1,11 @@
$border: inline-image('dotted-border.png');
#articles { #articles {
> article { > article {
padding-bottom: 1em; padding-bottom: 1em;
&:last-child { margin-bottom: 0; border-bottom: none; } &:last-child { margin-bottom: 0; border-bottom: none; }
h2 { h2 {
padding-top: 0.8em; padding-top: 0.8em;
//border-top: 3px double $type-border; background: $border top left repeat-x;
background: inline-image('dotted-border.png') top left repeat-x;
} }
.byline + time:before, .byline + time +time:before { .byline + time:before, .byline + time +time:before {
content: "\2022 "; content: "\2022 ";
@ -17,7 +17,7 @@
padding-top: 2em; padding-top: 2em;
margin-bottom: 1.5em; margin-bottom: 1.5em;
padding-bottom: 1.5em; padding-bottom: 1.5em;
background: inline-image('dotted-border.png') bottom left repeat-x; background: $border bottom left repeat-x;
h1 { h1 {
margin: 0; margin: 0;
a { text-decoration: none; a { text-decoration: none;
@ -30,7 +30,8 @@
padding-top: 0; padding-top: 0;
margin: 0; margin: 0;
font-style: italic; font-style: italic;
font-family: "Georgia", Palatino, Times, "Times New Roman"; @extend .sans;
//font-family: "Georgia", Palatino, Times, "Times New Roman";
} }
} }
.entry-content { .entry-content {

2
themes/classic/sass/default/partials/_navigation.scss

@ -95,7 +95,7 @@ body > nav {
.maskImage { .maskImage {
ul[role=subscription] { li, a { border: 0; padding: 0; }} ul[role=subscription] { li, a { border: 0; padding: 0; }}
a[rel=subscribe-rss]{ a[rel=subscribe-rss]{
position: relative; top: -2px; position: relative; top: 0px;
width: image-width('rss.png'); width: image-width('rss.png');
height: image-height('rss.png'); height: image-height('rss.png');
@include mask-image('rss.png'); @include mask-image('rss.png');

BIN
themes/classic/source/images/rss.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 504 B

After

Width:  |  Height:  |  Size: 490 B

2
themes/classic/source/javascripts/twitter.js

@ -26,7 +26,7 @@ function showTwitterFeed(tweets, twitter_user){
var timeline = document.getElementById('tweets'); var timeline = document.getElementById('tweets');
timeline.innerHTML=''; timeline.innerHTML='';
for (t in tweets){ for (t in tweets){
timeline.innerHTML+='<li>'+'<p>'+'<a href="http://twitter.com/'+twitter_user+'/status/'+tweets[t].id_str+'">'+prettyDate(tweets[t].created_at)+'</a>'+linkifyTweet(tweets[t].text)+'</p>'+'</li>'; timeline.innerHTML+='<li>'+'<p>'+'<a href="http://twitter.com/'+twitter_user+'/status/'+tweets[t].id_str+'">'+prettyDate(tweets[t].created_at)+'</a>'+linkifyTweet(tweets[t].text.replace(/\n{2}/, '</p><p>').replace(/\n/, '<br>'))+'</p>'+'</li>';
} }
} }
function linkifyTweet(text){ function linkifyTweet(text){

2
themes/classic/source/stylesheets/screen.css

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save