From 00d79f47701e0dc6a707250800a9b46ec0beee45 Mon Sep 17 00:00:00 2001 From: Tim Diggins Date: Sun, 5 Jun 2022 15:53:46 +0100 Subject: [PATCH] correct references (including master -> main) --- README.md | 8 ++++---- .../setup_app_skeleton/stylesheets/_variables-night.scss | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7c4b830..285562f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ThreddedCreateApp [![Build Status](https://travis-ci.org/thredded/thredded_create_app.svg?branch=master)](https://travis-ci.org/thredded/thredded_create_app) [![Test Coverage](https://codeclimate.com/github/thredded/thredded_create_app/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded_create_app/coverage) +# ThreddedCreateApp [![Build Status](https://travis-ci.org/thredded/thredded_create_app.svg?branch=main)](https://travis-ci.org/thredded/thredded_create_app) [![Test Coverage](https://codeclimate.com/github/thredded/thredded_create_app/badges/coverage.svg)](https://codeclimate.com/github/thredded/thredded_create_app/coverage) Generates a Rails app with the [Thredded](https://github.com/thredded/thredded) forums engine installed. @@ -158,9 +158,9 @@ Once you've deployed your app, please let us know that you are using Thredded by tweeting [@thredded]! [@thredded]: https://twitter.com/thredded -[Devise Readme]: https://github.com/plataformatec/devise/blob/master/README.md +[Devise Readme]: https://github.com/heartcombo/devise/blob/main/README.md [Thredded chat room]: https://gitter.im/thredded/thredded -[Thredded Readme]: https://github.com/thredded/thredded/blob/master/README.md +[Thredded Readme]: https://github.com/thredded/thredded/blob/main/README.md ## Deploying to Heroku @@ -173,7 +173,7 @@ heroku create heroku config:set RACK_ENV=production RAILS_ENV=production \ SECRET_KEY_BASE="$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)" # Deploy to heroku -git push heroku master +git push heroku main # Set up the database and some seed data (an admin user and a messageboard) heroku run rake db:migrate db:seed # Open the website in your default browser diff --git a/lib/thredded_create_app/tasks/setup_app_skeleton/stylesheets/_variables-night.scss b/lib/thredded_create_app/tasks/setup_app_skeleton/stylesheets/_variables-night.scss index 637a8b1..20d163b 100644 --- a/lib/thredded_create_app/tasks/setup_app_skeleton/stylesheets/_variables-night.scss +++ b/lib/thredded_create_app/tasks/setup_app_skeleton/stylesheets/_variables-night.scss @@ -1,5 +1,5 @@ // See https://www.google.com/design/spec/style/color.html#color-color-palette -// https://github.com/angular/material2/blob/master/src/lib/core/theming/_palette.scss +// https://github.com/angular/components/blob/main/src/material/core/theming/_palette.scss @at-root { $black-87-opacity: rgba(black, 0.87); $white-87-opacity: rgba(white, 0.87);