Skip to content

Commit

Permalink
fix: rewrite more files
Browse files Browse the repository at this point in the history
  • Loading branch information
kalebdf committed Apr 16, 2020
1 parent 439f39e commit 0c5547d
Show file tree
Hide file tree
Showing 14 changed files with 250 additions and 95 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ Thumbs.db
/js/dist/
/node_modules/
/dist/
/tmp
3 changes: 2 additions & 1 deletion .versionrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
"filename": "_config.yml",
"updater": "build/config-updater.js"
}
]
],
"releaseCommitMessageFormat": "chore(release): {{currentTag}} [skip ci]"
}
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
Several quick start options are available:

- Clone the repo: `git clone git@github.com:flocasts/flo-scss`
- OR [download the latest release](https://github.com/flocasts/flo-scss/archive/vflo-scss.zip)
- OR [download the latest release](https://github.com/flocasts/flo-scss/archive/v0.6.2.zip)
- OR install with [npm](https://www.npmjs.com/): `npm install flocasts/flo-scss`

### Running documentation locally
Expand All @@ -52,11 +52,11 @@ Learn more about using Jekyll by reading its [documentation](https://jekyllrb.co

Make sure you follow these instructions for installing Ruby on macOS. Mistakes made in the process of installing
Ruby on macOS can result in the operating system failing to boot.


1. Install `gpg` and `curl`
* `brew install gpg curl`

2. Install RVM by following the instructions [here](https://rvm.io/rvm/install)
* If you have an issue installing the GPG keys, contact your sysadmin
* @Sysadmins, this could be a DNS issue. Try switching to 8.8.8.8 temporarily.
Expand All @@ -65,16 +65,16 @@ Learn more about using Jekyll by reading its [documentation](https://jekyllrb.co

3. Run the RVM startup script and restart your terminals
* Run `source ~/.rvm/scripts/rvm`

4. Install the correct version of ruby for the project
* The version can be found in the [Gemfile](./Gemfile)
* Run `rvm install x.x.x` replacing Xs with the correct version

5. Run `rvm use x.x.x` to set your ruby version, and you're ready to go!

## Documentation

Flo-SCSS's documentation is built off of bootstrap's and can be found: <https://flo-scss.flo.center/>.
Flo-SCSS's documentation is built off of bootstrap's and can be found: <https://flo-scss.flo.center/>.

Read the [Getting started page](https://flo-scss.flo.center/docs/getting-started/introduction/) for information on the framework contents, templates and examples, and more.

Expand Down
61 changes: 37 additions & 24 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,44 +1,56 @@
current_version: 0.6.2
markdown: kramdown
highlighter: rouge
# Dependencies
markdown: kramdown
highlighter: rouge
kramdown:
auto_ids: true
auto_ids: true

permalink: pretty
source: site
destination: ./docs
host: flo-scss.flo.center
port: 80
baseurl: ''
url: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
encoding: UTF-8

# Server
source: "site"
destination: ./docs
host: flo-scss.flo.center
port: 80
baseurl: ""
url: "https://flo-scss.flo.center"
encoding: UTF-8
exclude:
- docs/assets/scss/

plugins:
- jekyll-redirect-from
- jekyll-sitemap
- jekyll-toc

# Social
title: Flo-SCSS
description: 'Based on The most popular HTML, CSS, and JS library in the world.'
twitter: flosports
authors: 'FloSports Engineering, Mark Otto, Jacob Thornton, and Bootstrap contributors'
social_image_path: /docs/assets/brand/bootstrap-social.png
social_logo_path: /docs/assets/brand/bootstrap-social-logo.png
current_ruby_version: 0.0.1
repo: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
slack: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
opencollective: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
blog: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
expo: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
themes: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
icons: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'

# Custom Variables
current_version: 0.6.2
current_ruby_version: 0.6.2
docs_version: 0.6.2
github_org: "https://github.com/flocasts"
repo: "https://github.com/flocasts/flo-scss"
slack: "https://www.flosports.tv"
opencollective: "https://www.flosports.tv"
blog: "https://www.flosports.tv"
expo: "https://www.flosports.tv"
themes: "https://www.flosports.tv"
icons: "https://flo-scss.flo.center"

download:
source: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
dist: >-
https://github.com/twbs/bootstrap/releases/download/v4.4.1/bootstrap-4.4.1-dist.zip
source: "https://github.com/flocasts/flo-scss/archive/v0.6.2.zip"

cdn:
css: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
# See https://www.srihash.org for info on how to generate the hashes
css: 'https://unpkg.com/@flosportsinc/flo-scss@0.6.2/dist/css/bootstrap.min.css'
css_hash: sha384-hnvsmW4CEqIE9xpwdmvw+oyi2zalIdkqZJKT8ovyObj2fiPNSLt7xdsda4JGUfSf
js: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
js: 'https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js'
js_hash: sha384-1RkA5wjfeG5u+6ycZ90q+PMlafLBaMCHvGk6PlVrQmIuTvpdA9qupxwbnPf9QbHH
js_bundle: >-
https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js
Expand All @@ -47,6 +59,7 @@ cdn:
jquery_hash: sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n
popper: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN'
popper_hash: sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN

toc:
min_level: 2
max_level: 4
Expand Down
6 changes: 4 additions & 2 deletions build/change-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ function replaceRecursively(directory, excludedDirectories, allowedExtensions, o
original = new RegExp(regExpQuote(original), 'g')
replacement = regExpQuoteReplacement(replacement)
const updateFile = DRY_RUN ? (filepath) => {
if (allowedExtensions.has(path.parse(filepath).ext)) {
const parsedPath = path.parse(filepath)
if (allowedExtensions.has(parsedPath.ext) && parsedPath.base !== 'package-lock.json') {
console.log(`FILE: ${filepath}`)
} else {
console.log(`EXCLUDED:${filepath}`)
}
} : (filepath) => {
if (allowedExtensions.has(path.parse(filepath).ext)) {
const parsedPath = path.parse(filepath)
if (allowedExtensions.has(parsedPath.ext) && parsedPath.base !== 'package-lock.json') {
sh.sed('-i', original, replacement, filepath)
}
}
Expand Down
29 changes: 18 additions & 11 deletions build/config-updater.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
const yaml = require("js-yaml");
const fs = require("fs");
'use strict'

const yaml = require('js-yaml')
const fs = require('fs')

// Get document, or throw exception on error
module.exports.readVersion = content => {
module.exports.readVersion = (content) => {
try {
const doc = yaml.safeLoad(content);
return doc.current_version;
const doc = yaml.safeLoad(content)
return doc.current_version
} catch (e) {
console.log(e);
console.log(e)
}
};
}

// Get document, or throw exception on error
module.exports.writeVersion = (content, version) => {
try {
const doc = yaml.safeLoad(content);
return yaml.safeDump({ ...doc, current_version: version });
const doc = yaml.safeLoad(content)
return yaml.safeDump({
...doc,
current_version: version,
current_ruby_version: version,
docs_version: version
})
} catch (e) {
console.log(e);
console.log(e)
}
};
}
140 changes: 140 additions & 0 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// package metadata file for Meteor.js

Package.describe({
name: 'twbs:bootstrap', // https://atmospherejs.com/twbs/bootstrap
name: 'flosports:flo-scss', // https://atmospherejs.com/twbs/bootstrap
summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.',
version: 'flo-scss',
git: 'https://github.com/twbs/bootstrap.git'
version: '0.6.2',
git: 'https://github.com/flocasts/flo-scss'
});

Package.onUse(function (api) {
Expand Down
Loading

0 comments on commit 0c5547d

Please sign in to comment.