Skip to content

Commit 74b3821

Browse files
chalinsfshaza2
authored andcommitted
Use jekyll-assets 3 and Bootstrap 3 (cfug#1199)
* Gems * Move css and sass file to src/_assets * Base setup for use of Bootstrap 3 * Config overrides so that styles match lavish-bootstrap * Final cleanup, and undo unnecessary changes * Plugin to register bootstrap-sass (for Bootstrap 3) * Fix reference to two_column.css
1 parent 60c1795 commit 74b3821

34 files changed

+10464
-596
lines changed

_config_now.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Fixed time stamp (useful when comparing generated site versions)
2+
now: 2018-07-01 12:34:56
3+
4+
assets:
5+
digest: false
6+
source_maps: true
7+
compress:
8+
css: false
9+
js: false
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Typography
2+
3+
$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace !default; // Match Lavish settings
4+
5+
// Code
6+
7+
$code-color: #444; // Match Lavish settings
8+
$code-bg: #f0f0f0; // Match Lavish settings
9+
$pre-color: #77777a; // Match Lavish settings
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ $homepage-illustration-text-break-size: 720px;
168168
// No need for margin, we don't show sidebar on homepage.
169169
margin-left: auto;
170170
width: auto;
171+
float: none; // Match Lavish settings
171172

172173
@include media-query($on-palm) {
173174
padding-left: 0;

0 commit comments

Comments
 (0)