Skip to content

Commit

Permalink
fixed broken css on social links
Browse files Browse the repository at this point in the history
  • Loading branch information
doolin committed Jul 13, 2013
1 parent 45fd311 commit a0d2403
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 22 deletions.
2 changes: 1 addition & 1 deletion deploy.sh
@@ -1,6 +1,6 @@
#!/bin/sh

echo rsync deployment for rubymacros.com
rsync -essh -vta --delete --cvs-exclude build/* tinoboxc@tinobox.com:/home2/tinoboxc/public_html/rubymacros
rsync -essh -vta --delete --cvs-exclude build/* tinoboxc@tinobox.com:/home3/tinoboxc/public_html/rubymacros
#rsync -essh -vta --delete --cvs-exclude source/* tinoboxc@tinobox.com:/home2/tinoboxc/public_html/rubymacros

32 changes: 15 additions & 17 deletions source/index.html.haml
Expand Up @@ -4,8 +4,8 @@
%div.subtitle
(a work in progress)

-#= partial 'content/introduction'
-#= partial 'content/ruby/'
= partial 'content/introduction'
= partial 'content/ruby/'


-#= partial 'content/string_substitution'
Expand All @@ -18,21 +18,19 @@
-#= partial 'content/lisp_iteration'
-#= partial 'content/outline'
-#= partial 'content/conclusion'
= partial 'content/conclusion'

-#= partial 'content/social_links_small'
= partial 'content/social_links_small'

-#%div.row
-# %div.span4
-# %img.mugshot{ :src => "/images/blackie4-100x100.jpg"}
-# %p.bio
-# Dave is software professional specializing in general development, who appreciates TeX's lack of arithmetic operators.
-#
-# %div.span4
-# %img.mugshot{ :src => "/images/caleb_clausen_100x102.jpeg"}
-# %p.bio
-# Caleb has written far too many C macros and took Gema way too seriously.
-#
-#= partial 'content/disqus'
%div.row
%div.span4
%img.mugshot{ :src => "/images/blackie4-100x100.jpg"}
%p.bio
Dave is software professional specializing in general development, who appreciates TeX's lack of arithmetic operators.

-#= partial 'content/footer'
%div.span4
%img.mugshot{ :src => "/images/caleb_clausen_100x102.jpeg"}
%p.bio
Caleb has written far too many C macros and took Gema way too seriously.

= partial 'content/disqus'
6 changes: 5 additions & 1 deletion source/stylesheets/rubymacros.css.scss
Expand Up @@ -80,7 +80,11 @@ pre {
word-break: break-all;
}

ul.social-links {
ul.social-links li {
display: inline;
}

.g-plusone {
display: inline;
}

Expand Down
14 changes: 11 additions & 3 deletions source/stylesheets/site.css.scss
Expand Up @@ -22,13 +22,21 @@ $side-gutter-width: $gutter-width;

body {
font-family: $font-family;
color: $font-color;
color: $font-color;
}

a {
@include link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color);
a {
}

#main {
padding: 50px;
}
}

ul.social_links li {
display: inline;
}

.g-plusone {
display: inline;
}

0 comments on commit a0d2403

Please sign in to comment.