Skip to content

Commit b46c47a

Browse files
Merge branch 'prebid:master' into master
2 parents df6814c + 112b92d commit b46c47a

195 files changed

Lines changed: 11810 additions & 18361 deletions

File tree

Some content is hidden

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

.bowerrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
files: '**/*.md'
2525
separator: ","
26-
- uses: DavidAnson/markdownlint-cli2-action@v11
26+
- uses: DavidAnson/markdownlint-cli2-action@v13
2727
if: steps.changed-files.outputs.any_changed == 'true'
2828
with:
2929
globs: ${{ steps.changed-files.outputs.all_changed_files }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Gemfile.lock
1313

1414
# Files generated by `npm install`
1515
node_modules/
16+
!_sass/node_modules
1617
/.vs/prebid.github.io/v17/.suo
1718
/.vs/slnx.sqlite
1819
/.vs
-502 Bytes
Binary file not shown.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ The site is hosted on GitHub pages, and uses [Jekyll](https://jekyllrb.com/) to
4141
1. gem install github-pages
4242
1. start Jekyll as described below
4343

44-
For CSS, the site uses Laravel Mix to build CSS from Sass (scss-flavored) source files. Under the hood Laravel Mix uses Webpack.
44+
For CSS, the site uses Jekyll board tools to compile SCSS down to CSS.
4545

46-
1. follow the instructions at [/nodejs.dev](https://nodejs.dev) to install Node.js for your OS
47-
1. `npm ci` to install packages for building assets
48-
1. build assets as described below
46+
1. Install `boostrap` via `npm install` to make the build work
47+
1. [Jekyll assets management](https://jekyllrb.com/docs/assets/)
48+
1. [Jekyll SASS plugin](https://jekyllrb.com/docs/configuration/sass/)
4949

5050
The markdown files are linted via [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli). VSCode supports the [.markdownlintignore](.markdownlintignore) file.
5151
You may need to configure the disabled rules specified in [.markdownlint.json](.markdownlint.json) directly in your project settings. You can invoke linting in CLI via

_assets/sass/main.scss

Lines changed: 0 additions & 43 deletions
This file was deleted.

_assets/sass/vendor/_bootstrap.scss

Lines changed: 0 additions & 17 deletions
This file was deleted.

_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ collections:
8787

8888
port: 8080
8989

90-
exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile', 'vendor', 'node_modules', '_assets', 'mix-manifest.json', 'webpack.mix.js', 'find-ungrouped-bidders.sh' ]
90+
exclude: ['README.md', 'LICENSE', 'Gemfile.lock', 'Gemfile', 'vendor', 'find-ungrouped-bidders.sh' ]
91+
include: ['node_modules']
9192

9293
keep_files:
9394
- assets/css/main-bundle.css
File renamed without changes.

0 commit comments

Comments
 (0)