Skip to content

Commit

Permalink
Merge pull request #143 from tripit/dev
Browse files Browse the repository at this point in the history
Fix some bugs, clean up, and readme changes.

Thanks @lord!
  • Loading branch information
Tariq Islam committed Dec 4, 2014
2 parents 058429a + 14a9aac commit c665bb4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ You're going to need:
4. Install all dependencies: `bundle install`
5. Start the test server: `bundle exec middleman server`

You can now see the docs at <http://localhost:4567>. And as you edit `source/index.md`, your server should automatically update! Whoa! That was fast!
You can now see the docs at <http://localhost:4567>. Whoa! That was fast!

Now that Slate is all set up your machine, you'll probably want to learn more about [editing Slate markdown](https://github.com/tripit/slate/wiki/Markdown-Syntax), or [how to publish your docs](https://github.com/tripit/slate/wiki/Deploying-Slate).

Expand Down
2 changes: 2 additions & 0 deletions source/javascripts/app/lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ under the License.
}
$(".highlight." + language).parent().show();

global.toc.calculateHeights();

// scroll to the new location of the position
$(window.location.hash).get(0).scrollIntoView(true);
}
Expand Down
8 changes: 4 additions & 4 deletions source/stylesheets/screen.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -483,20 +483,20 @@ html, body {
aside {
padding-top: 1em;
padding-bottom: 1em;
text-shadow: 0 1px 0 lighten($aside-notice-bg, 15%);
@include text-shadow(0 1px 0 lighten($aside-notice-bg, 15%));
margin-top: 1.5em;
margin-bottom: 1.5em;
background: $aside-notice-bg;
line-height: 1.6;

&.warning {
background-color: $aside-warning-bg;
text-shadow: 0 1px 0 lighten($aside-warning-bg, 15%);
@include text-shadow(0 1px 0 lighten($aside-warning-bg, 15%));
}

&.success {
background-color: $aside-success-bg;
text-shadow: 0 1px 0 lighten($aside-success-bg, 15%);
@include text-shadow(0 1px 0 lighten($aside-success-bg, 15%));
}
}

Expand All @@ -523,7 +523,7 @@ html, body {
margin: -2px;
border-radius: 4px;
border: 1px solid #F7E633;
text-shadow: 1px 1px 0 #666;
@include text-shadow(1px 1px 0 #666);
@include background(linear-gradient(bottom right, #F7E633 0%, #F1D32F 100%));
}
}
Expand Down

0 comments on commit c665bb4

Please sign in to comment.