diff options
| -rw-r--r-- | design/config.rb | 1 | ||||
| -rw-r--r-- | design/sass/_global.scss | 10 | ||||
| -rw-r--r-- | design/sass/screenv8.scss | 3 | ||||
| -rw-r--r-- | design/templates/base.html | 11 |
4 files changed, 18 insertions, 7 deletions
diff --git a/design/config.rb b/design/config.rb index eff5b4c..3d2c82a 100644 --- a/design/config.rb +++ b/design/config.rb @@ -1,4 +1,3 @@ -require 'compass-flexbox' project_type = :stand_alone # Set this to the root of your project when deployed: http_path = "/" diff --git a/design/sass/_global.scss b/design/sass/_global.scss index dcc1c29..5e746e1 100644 --- a/design/sass/_global.scss +++ b/design/sass/_global.scss @@ -47,6 +47,16 @@ time { } } +pre { + @include constrain_narrow(); + text-align: left; + @include breakpoint(alpha){ + @include fontsize(18); + line-height: 1.5; + margin-top: 2em; + margin-bottom: 2em; + } +} object, embed { max-width: 100%; height: auto; diff --git a/design/sass/screenv8.scss b/design/sass/screenv8.scss index 931f107..cda3c75 100644 --- a/design/sass/screenv8.scss +++ b/design/sass/screenv8.scss @@ -1,4 +1,5 @@ -@import 'flexbox'; //Flexbox relies on https://github.com/timhettler/compass-flexbox +//@import 'flexbox'; //Flexbox relies on https://github.com/timhettler/compass-flexbox +@import "compass/css3/flexbox"; @import "_normalize.scss"; @import "_fonts.scss"; @import "_mixins.scss"; diff --git a/design/templates/base.html b/design/templates/base.html index 2283c59..bc2ba42 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -33,13 +33,13 @@ </header> <nav role="navigation" class="bl"> <ul> - <li id="stories"><a href="/jrnl/" title="An archive of writings from around the world">Journal</a></li> + <li id="stories"><a href="/jrnl/" title="What we've been up to lately">Journal</a></li> + <li id="adventura"><a href="/adventures/" title="Our past and current adventures">Adventures</a></li> + <li id="field-notes"><a href="/field-notes/" title="Rough drafts and sketches">Field Notes</a></li> <li id="photos"><a href="/photos/" title="Photos from travels around the world">Photos</a></li> - <!--<li id="guides"><a href="/travel-guide/1/" title="Travel Guides, Tips, Tricks and Recommendations">Guides</a>,</li>--> - <li id="field-notes"><a href="/field-notes/" title="Shorter thoughts, sometimes syndicated to twitter">Field Notes</a></li> <li id="maps"><a href="/map" title="Maps and miscellanea">Map</a></li> - <li id="projects" ><a href="/projects/" title="Luxagraf: Projects">Projects</a></li> - <li id="etc" class="last"><a href="/about" title="About Luxagraf">Etc</a></li> + <!--<li id="projects" ><a href="/projects/" title="Luxagraf: Projects">Projects</a></li>--> + <li id="etc" class="last"><a href="/about" title="About Luxagraf">About</a></li> </ul> </nav> </div> @@ -48,6 +48,7 @@ <footer role="contentinfo"> <nav class="bl"> <ul> + <li><a href="/blogroll" title="Sites that inspire us">Blogroll</a></li> <li><a href="/rss/" title="RSS feed">Subscribe</a></li> <li><a href="https://twitter.com/luxagraf" rel="me" title="follow luxagraf on Twitter">@luxagraf</a></li> <li><a href="https://www.flickr.com/photos/luxagraf" rel="me" title="luxagraf on Flickr">Flickr</a></li> |