Skip to content

Commit

Permalink
Fixed mobile styling
Browse files Browse the repository at this point in the history
  • Loading branch information
dannguyen committed Jun 29, 2012
1 parent e29eaf2 commit a7c956b
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 76 deletions.
6 changes: 3 additions & 3 deletions sass/base/_typography.scss
Expand Up @@ -26,15 +26,15 @@ table{
font-family: $table-font;
}
}
body > header h1 {
body > header h1, h1#site-title
{
font-size: 1.5em;
@extend .heading;
font-family: $header-title-font-family;
font-weight: normal;
line-height: 1.2em;
margin-bottom: 0.6667em;
}
body > header h2 {
body > header h2, h2#site-subtitle {
font-family: $header-subtitle-font-family;
}

Expand Down
131 changes: 64 additions & 67 deletions sass/custom/_styles.scss
Expand Up @@ -41,20 +41,20 @@ span#author-credit{
color: #888;
}
}
body{
a:link, a:visited, a:-webkit-any-link{
text-decoration: none;
color: $link-color;
}

a:hover{
text-decoration: underline;
}

b, strong{
}

a:link, a:visited, a:-webkit-any-link{
text-decoration: none;
color: $link-color;
}

a:hover{
text-decoration: underline;
}

b, strong{
}


div.container{
/* width: $container-width;*/
margin: auto auto;
Expand Down Expand Up @@ -101,20 +101,20 @@ body{
}
}

} /* body wrap */


#content > article header{
margin-top: 0.1em;
}

#content > article header p.description{
font-size: $std-font-size;

color: #444;
margin-bottom: 1.0em;
font-style: italic;
}
} /* body wrap */

#content > article header{
margin-top: 0.1em;
}

#content > article header p.description{
font-size: 120%;
color: #444;
margin-bottom: 1.0em;
font-style: italic;
}



Expand Down Expand Up @@ -411,28 +411,6 @@ article footer div.nav-pagination{



@media only screen and (min-width: 320px) {

.after-nav{ display: none;}
div.split{
width: 100%;
float: none;
}
}

@media only screen and (min-width: 768px) {

.after-nav{display: block;}

div.split{
width: 47%;
float: left;
}
div.split + div.split{
margin-left:6%;
}
}

body #front-page{
p{ font-size: $std-font-size;}
}
Expand All @@ -445,15 +423,35 @@ ul.plain{



/* media queries */



@media only screen and (min-width: 320px){
.fb_iframe_widget{ display: block} ;
h1#site-title{font-size: 80%;}
h2#site-subtitle{font-size: 70%;}
#content > article header p.description{font-size: 95%;}

div.container{ width: 95%} ;
.after-nav{ display: none;}
.fb_iframe_widget{ display: block;}

body{
strong{font-weight: bold};
}

div.split{
width: 100%;
float: none;
}
#masonry-container{

div.thirds{
padding-left: 1%;
padding-right: 1%;
padding: 2%;

}

.imgwrap.preview{
margin-bottom: 0.1em;
}
Expand All @@ -463,24 +461,15 @@ ul.plain{
}
}




@media only screen and (min-width: 480px) {
div.container{ width: 100% ; max-width: 480px;
div.thirds{clear:left; float: none; margin-left: 0;}
}


#masonry-container{
div.thirds{
padding-left: 1%;
padding-right: 1%;

}

}


.imgwrap.medium{ width: 100%; }

#content article .entry-content > *, #content article header hgroup{
Expand All @@ -491,15 +480,29 @@ ul.plain{
.inset-item{
float: none;
}

}

@media only screen and (min-width: 768px) {

h1#site-title{font-size: 1.5em;}
h2#site-subtitle{font-size: 1.0em;}
#content > article header p.description{font-size: 120%;}


body{
strong{font-weight: $font-heavy-weight};
}
div.container{ width: 100%; max-width: $container-ipad;
.after-nav{display: block;}

div.split{
width: 47%;
float: left;
}
div.split + div.split{
margin-left:6%;
}

div.container{ max-width: $container-ipad;
div.thirds{
width: 32%;
margin-left: 1.5%;
Expand All @@ -517,8 +520,8 @@ ul.plain{
}

.imgwrap.medium{ width: $medium-width; }

}

}

@media only screen and (min-width: 1024px) {
Expand Down Expand Up @@ -597,9 +600,3 @@ ul.plain{
}


/*
@media only screen and (min-width: 992px) {
div.container{ width: 100%; max-width: 992px; }
}
*/
2 changes: 1 addition & 1 deletion sass/partials/_blog.scss
Expand Up @@ -3,7 +3,7 @@ article {
a { @extend .force-wrap; }
header {
position: relative;
padding-top: 1em;
padding-top: 0.3em;
padding-bottom: 1em;
margin-bottom: 1em;
/* background: $img-border bottom left repeat-x;*/
Expand Down
4 changes: 2 additions & 2 deletions source/_includes/after_nav.html
Expand Up @@ -6,8 +6,8 @@
<div class="chiclet tweet"><a href="https://twitter.com/intent/tweet?text=Check%20out%20the%20@BastardsBook%20of%20Photography,%20an%20open-source%20visual%20guide%20to%20taking%20photos%20http%3A%2F%2Fphotography.bastardsbook.com&via=dancow">Tweet this</a></div>

<div class="chiclet tweet"><a href="https://twitter.com/intent/user?screen_name=dancow">Follow @dancow</a></div>

<div class="fb-like chiclet" style="margin-top: 4px;" data-send="false" data-width="100" data-show-faces="false"></div>
<div class="fb-like chiclet" style="margin-top: 1px;" data-send="false" data-layout="button_count" data-width="20" data-show-faces="false"></div>


</div>
Expand Down
2 changes: 1 addition & 1 deletion source/_includes/custom/header.html
@@ -1,6 +1,6 @@
<hgroup>
<div class="container">
<h1><a href="{{ root_url }}/">{{ site.title }}</a></h1>
<h1 id="site-title"><a href="{{ root_url }}/">{{ site.title }}</a></h1>
{% if site.subtitle %}
<h2 id="site-subtitle">{{ site.subtitle }} <span id="author-credit">by <a href="http://danwin.com">{{site.author}}</a></span></h2>
{% endif %}
Expand Down
1 change: 0 additions & 1 deletion source/_includes/facebook_like.html
Expand Up @@ -8,4 +8,3 @@
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
{% endif %}

3 changes: 2 additions & 1 deletion source/_layouts/default.html
Expand Up @@ -4,8 +4,9 @@
<header role="banner">{% include header.html %}</header>
<nav role="navigation"><div class="container">{% include navigation.html %}</div></nav>
<div id="main">
{% unless page.pre_sharing == false %}
{% include after_nav.html %}

{% endunless %}
<div class="container">
<div id="content">
{{ content | expand_urls: root_url }}
Expand Down
1 change: 1 addition & 0 deletions source/index.markdown
@@ -1,6 +1,7 @@
---
layout: special
homepage: true
pre_sharing: false
ledeimage: ny-giants-super-bowl-parade-ticker-_-6838582959.jpg
---
<div id="front-page">
Expand Down

0 comments on commit a7c956b

Please sign in to comment.