Skip to content

Commit e38a86e

Browse files
authored
Merge pull request #152 from basiljs/refactor/webpack
Webpack does scss and js (and maybe ts?)
2 parents c0393d0 + 4d5a120 commit e38a86e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+11365
-4560
lines changed

_config.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ url: "https://basiljs.github.io/" # the base hostname & protocol for your site,
2525
twitter_username: basil_js
2626
github_username: basiljs
2727

28-
sass:
29-
style: compressed
30-
sass_dir: _sass
28+
# sass:
29+
# style: compressed
30+
# sass_dir: _sass
3131
# Build settings
3232
markdown: kramdown
3333
# kramdown:
@@ -36,6 +36,7 @@ highlighter: rouge
3636
plugins:
3737
- jekyll-feed
3838
exclude:
39+
- assets/ts
3940
- Gemfile
4041
- Gemfile.lock
4142
- package.json

_source/_includes/search-bar.html

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
<div id="flex-search">
22
<input class="searchfield flex-search-item" id="lunr-search" placeholder="Search" /> <button id="lunr-clear" class="flex-search-item">Clear</button>
33
</div>
4-
<div class="flex-search-advanced-hints">
5-
<div id="advanced-search-hint">
6-
<label for="advanced-search-toggle">Advanced search:</label>
7-
<input type="checkbox" name="toggle" id="advanced-search-toggle" checked>
8-
<div id="advanced-search-text" >
9-
<p>
10-
<em>If your terms don't match, try to use some special search terms.<br>
11-
You can use wildcards: like <code>lerp*</code> or <code>co*lor*</code>. <br>
12-
Or try using boosts: <code>fill^10 color</code>. This means the weight of fill is 10 times higher then color<br>
13-
Read more about the search engine <a href="https://lunrjs.com/guides/searching.html">here</a>
14-
</em>
15-
</p>
16-
</div>
17-
</div>
18-
</div>
19-
<div id="flex-search-results">
4+
<div id="flex-search-results" class="search-results">
205
</div>

_source/_sass/_reference.scss

Lines changed: 0 additions & 223 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)