diff --git a/Gemfile b/Gemfile index b807382..67faed5 100644 --- a/Gemfile +++ b/Gemfile @@ -16,5 +16,6 @@ group :jekyll_plugins do gem 'jekyll-seo-tag' gem 'jekyll-archives' gem 'kramdown' + gem "kramdown-parser-gfm" gem 'rouge' end diff --git a/Gemfile.lock b/Gemfile.lock index 8e570c7..1929ef7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,8 @@ GEM listen (~> 3.0) kramdown (2.3.0) rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -75,7 +77,8 @@ DEPENDENCIES jekyll-seo-tag jekyll-sitemap kramdown + kramdown-parser-gfm rouge BUNDLED WITH - 2.0.1 + 2.1.4 diff --git a/_config.yml b/_config.yml index 9ec0a18..648befb 100644 --- a/_config.yml +++ b/_config.yml @@ -36,7 +36,9 @@ jekyll-archives: category: '/category/:name/' # Pagination -paginate: 20 +paginate: 9 +paginate_trail: 2 +paginate_show_first_and_last: true paginate_path: /page:num/ # Other diff --git a/_includes/pagination.html b/_includes/pagination.html index 5cf9c93..a1d4296 100644 --- a/_includes/pagination.html +++ b/_includes/pagination.html @@ -1,25 +1,38 @@ {% if paginator.total_pages > 1 %} - + + + {% endif %} \ No newline at end of file diff --git a/assets/css/main.scss b/assets/css/main.scss index 983228b..c5b37bc 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -8,14 +8,43 @@ display:inline; } -figcaption { - text-align: center; - font-size: smaller; - color: #757575; -} - // Import partials from `sass_dir` (defaults to `_sass`) @import "syntax", "starsnonscss" ; + +/* pagination */ + +$paginateColor: #00ab6b; + +.pagination > li > a +{ + background-color: white; + color: $paginateColor; +} + +.pagination > li > a:focus, +.pagination > li > a:hover, +.pagination > li > span:focus, +.pagination > li > span:hover +{ + color: #5a5a5a; + background-color: #eee; + border-color: #ddd; +} + +.pagination > .active > a +{ + color: white; + background-color: $paginateColor !important; + border: solid 1px $paginateColor !important; + z-index: 0 !important; +} + +.pagination > .active > a:hover +{ + background-color: $paginateColor !important; + border: solid 1px $paginateColor; +} +/* pagination end */ \ No newline at end of file diff --git a/assets/css/screen.css b/assets/css/screen.css index ae2001f..d5b832d 100644 --- a/assets/css/screen.css +++ b/assets/css/screen.css @@ -754,9 +754,11 @@ span.navigation { text-align: center; } +/* .pagination { display: block; } +*/ iframe { max-width: 100%;