Skip to content

Commit

Permalink
Merge branch 'master' into zeta_global_ssp/update_parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
abermanov-zeta authored Nov 7, 2023
2 parents 1f2dd41 + 112b92d commit 943094b
Show file tree
Hide file tree
Showing 196 changed files with 11,866 additions and 18,361 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
files: '**/*.md'
separator: ","
- uses: DavidAnson/markdownlint-cli2-action@v11
- uses: DavidAnson/markdownlint-cli2-action@v13
if: steps.changed-files.outputs.any_changed == 'true'
with:
globs: ${{ steps.changed-files.outputs.all_changed_files }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Gemfile.lock

# Files generated by `npm install`
node_modules/
!_sass/node_modules
/.vs/prebid.github.io/v17/.suo
/.vs/slnx.sqlite
/.vs
Binary file not shown.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ The site is hosted on GitHub pages, and uses [Jekyll](https://jekyllrb.com/) to
1. gem install github-pages
1. start Jekyll as described below

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

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

The markdown files are linted via [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli). VSCode supports the [.markdownlintignore](.markdownlintignore) file.
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
Expand Down
43 changes: 0 additions & 43 deletions _assets/sass/main.scss

This file was deleted.

17 changes: 0 additions & 17 deletions _assets/sass/vendor/_bootstrap.scss

This file was deleted.

3 changes: 2 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ collections:

port: 8080

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

keep_files:
- assets/css/main-bundle.css
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
43 changes: 43 additions & 0 deletions _sass/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// General layout is according to https://sass-guidelin.es/#the-7-1-pattern

// Abstracts should not output any CSS, they just help setup
// the environment

// Abstracts
@import 'abstracts/colors';
@import 'abstracts/tokens';
@import 'abstracts/bootstrap-variables';
@import 'abstracts/functions';
@import 'abstracts/mixins';
@import 'abstracts/breakpoints';

// Vendor Includes
@import 'vendor/bootstrap';
@import 'vendor/bourbon';
@import 'vendor/include-media';
@import 'vendor/awesomplete';

// Base Styles
@import 'base/base';
@import 'base/typography';

// Core Layout
@import 'layout/header';
@import 'layout/sidebar';
@import 'layout/footer';

// Components
@import 'components/card';
@import 'components/banner';
@import 'components/buttons';
@import 'components/pb';
@import 'components/social-media';
@import 'components/table';
@import 'components/download-form';
@import 'components/autocomplete-filter';
@import 'components/bidder-list';
@import 'components/search';

// Pages
@import 'pages/home';
@import 'pages/404';
Empty file added _sass/node_modules/.keep
Empty file.
58 changes: 58 additions & 0 deletions _sass/node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 52 additions & 0 deletions _sass/node_modules/bootstrap/scss/_alert.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions _sass/node_modules/bootstrap/scss/_badge.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions _sass/node_modules/bootstrap/scss/_breadcrumb.scss

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 943094b

Please sign in to comment.