Merge pull request #56 from KyleHodgetts/font-size-issues

Font size issues
This commit is contained in:
Viren Mohindra 2016-11-20 16:49:44 -05:00 committed by GitHub
commit 82a6713c6d
5 changed files with 29 additions and 10 deletions

View file

@ -29,18 +29,19 @@ GEM
safe_yaml (~> 1.0)
jekyll-feed (0.8.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.4.0)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
json (2.0.2)
kramdown (1.12.0)
kramdown (1.13.0)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
minima (2.0.0)
minima (2.1.0)
jekyll (~> 3.3)
multi_css (0.1.0)
css_press
multi_js (0.1.0)
@ -74,7 +75,7 @@ DEPENDENCIES
octopress-minify-html
RUBY VERSION
ruby 2.2.3p173
ruby 2.2.1p85
BUNDLED WITH
1.13.6

View file

@ -27,6 +27,10 @@ markdown: kramdown
theme: minima
gems:
- jekyll-feed
sass:
sass_dir: css/partials
exclude:
- Gemfile
- Gemfile.lock
@ -34,4 +38,4 @@ exclude:
# Be sure to exclude vendor from your _config.yml
# Travis bundles all gems in the vendor directory on its build servers, which Jekyll will mistakenly read and explode on.
# https://jekyllrb.com/docs/continuous-integration/
# https://jekyllrb.com/docs/continuous-integration/

View file

@ -62,10 +62,6 @@
<![endif]-->
<!-- Font Awesome -->
<script src="https://use.fontawesome.com/1e8cbd500f.js"></script>
<style>
/* padding for the main-nav bar */
body{padding-top:70px;}#share-buttons img {width: 35px;padding: 5px;border: 0;box-shadow: 0;display: inline;}
</style>
<!-- Analytics JS -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@ -292,4 +288,4 @@
});
</script>
</body>
</html>
</html>

View file

@ -0,0 +1 @@
$font-size: 18px

View file

@ -1,5 +1,18 @@
---
---
@import 'variables'
body
padding-top: 70px
font-size: $font-size
#share-buttons img
width: 35px
padding: 5px
border: 0
box-shadow: 0
display: inline
// begin
.navbar-form
@ -20,3 +33,7 @@
padding: 1em
body
padding-top: 132px !important
@media screen and (min-width:600px)
p a td
font-size: $font-size