Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap Theme #3

Merged
merged 36 commits into from
Jul 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
81c356c
Initial Import of new Bootstrap Theme
csexton Feb 24, 2016
1ebc5ab
Move radius theme into it's own folder
csexton Feb 25, 2016
5a4fc08
Move folders
csexton Feb 25, 2016
2f28c78
Fix load order of JS and add font css
csexton Feb 25, 2016
1a411c7
Fix header logo
csexton Feb 26, 2016
e7268a9
Merge branch 'bootstrap-theme' of https://github.com/RadiusNetworks/r…
ajhewitt Feb 26, 2016
811d93d
Remove less source files
csexton Mar 1, 2016
1498348
Remove map files
csexton Mar 1, 2016
989413e
dos2unix and fix `pre` background color
csexton Mar 1, 2016
9033002
dos2unix
csexton Mar 1, 2016
6091310
dos2unix
csexton Mar 1, 2016
a890463
Remove the localize js module
csexton Mar 1, 2016
d2e5ba9
Remove less source files
csexton Mar 1, 2016
f50f865
Merge branch 'bootstrap-theme' of https://github.com/RadiusNetworks/r…
ajhewitt Mar 1, 2016
7921425
Clean up newlines
csexton Mar 8, 2016
6a19e84
Merge branch 'master' of https://github.com/RadiusNetworks/radius-rai…
ajhewitt Mar 18, 2016
2cd6322
test stub flot makefile
ajhewitt Mar 20, 2016
c42fa43
remove chart-flot to investigate Heroku asset pipeline issue
ajhewitt Mar 21, 2016
b4c8862
remove chart-flot to investigate Heroku asset pipeline issue
ajhewitt Mar 21, 2016
03ed85a
Revert "remove chart-flot to investigate Heroku asset pipeline issue"
ajhewitt Mar 21, 2016
b23b054
Revert "remove chart-flot to investigate Heroku asset pipeline issue"
ajhewitt Mar 21, 2016
ab0dee5
Revert "test stub flot makefile"
ajhewitt Mar 21, 2016
c48407b
Clean up files missing extensions and causing issues with asset pipel…
ajhewitt Mar 21, 2016
ae990f3
Merge branch 'bootstrap-theme' of https://github.com/RadiusNetworks/r…
ajhewitt Mar 21, 2016
b462aeb
Merge branch 'bootstrap-theme' of github.com:RadiusNetworks/radius-ra…
csexton Mar 21, 2016
80b28cc
Bumping the version number to 2.0
csexton Mar 21, 2016
ee8850d
Flot Makefile came back after a previous change was reverted, remove
ajhewitt Mar 21, 2016
c10bb7b
Flot tz files came back after a previous change was reverted, remove
ajhewitt Mar 21, 2016
c554f8e
add chosen and moment to JS imports
ajhewitt Mar 25, 2016
9ebb1c9
inject timezone data into moment-timezone.js
ajhewitt Apr 5, 2016
8716790
fix issue #288
ajhewitt Apr 14, 2016
763b5d4
add css loaders to theme
ajhewitt Apr 18, 2016
86f1107
fix issue gossamer#305
ajhewitt Apr 19, 2016
2ec1046
Relax Rails version requirement to allow for 5
csexton Jul 8, 2016
1b1ef8f
Merge branch 'bootstrap-theme' of github.com:RadiusNetworks/radius-ra…
csexton Jul 25, 2016
3a8bb62
Update README with notes about the new bootstrap theme
csexton Jul 25, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
31 changes: 8 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ gem 'radius-rails', github: "RadiusNetworks/radius-rails"

```

Note: If the app you are using doesn't use the updated Twitter Bootstrap Theme, then you will want to use the tag `v0.1.0`:

```ruby
gem 'radius-rails', github: "RadiusNetworks/radius-rails", tag: "v0.1.0"
```

## Usage

This will give you access to the common Radius Networks assets needed in most web apps.
Expand All @@ -20,10 +26,8 @@ This will give you access to the common Radius Networks assets needed in most we
Stylesheets can be pulled in with the [asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html) or using [Sass](http://sass-lang.com/):

```scss
@import "normalize";
@import "font-awesome";
@import "bonveno-webfont";
@import "environment-ribbon";
@import "radius-theme";
@import "corporate-bar";
```

You can pull in the favicon by adding the image to the header of your layout:
Expand Down Expand Up @@ -56,28 +60,9 @@ body
== render 'radius/environment_ribbon'
```

#### Corporate Bar Header

Add the `corporate_bar` partial right after the opening body tag.

```slim
body
== render 'radius/corporate_bar'
```

#### Google Analytics

```slim
== render 'radius/ga'
```

#### Zendesk Support Tab

Most of the time you only want this on some views, so you can optionally include it by checking the `controller_name`.

```slim
- if !(controller_name == "static" && action_name == "index")
== render 'radius/zendesk'
```


20 changes: 20 additions & 0 deletions app/assets/components/Chart.js/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "Chart.js",
"version": "1.0.2",
"description": "Simple HTML5 Charts using the canvas element",
"homepage": "https://github.com/nnnick/Chart.js",
"author": "nnnick",
"main": [
"Chart.js"
],
"dependencies": {},
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.2",
"commit": "930b16a0af59201dcfcd1594b0e7540db4d04c9f"
},
"_source": "git://github.com/nnnick/Chart.js.git",
"_target": "1.0.2",
"_originalSource": "Chart.js"
}
13 changes: 13 additions & 0 deletions app/assets/components/Chart.js/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
language: node_js
node_js:
- "0.11"
- "0.10"

before_script:
- npm install

script:
- gulp test

notifications:
slack: chartjs:pcfCZR6ugg5TEcaLtmIfQYuA
55 changes: 55 additions & 0 deletions app/assets/components/Chart.js/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
Contributing to Chart.js
========================

Contributions to Chart.js are welcome and encouraged, but please have a look through the guidelines in this document before raising an issue, or writing code for the project.


Using issues
------------

The [issue tracker](https://github.com/nnnick/Chart.js/issues) is the preferred channel for reporting bugs, requesting new features and submitting pull requests.

If you're suggesting a new chart type, please take a look at [writing new chart types](https://github.com/nnnick/Chart.js/blob/master/docs/06-Advanced.md#writing-new-chart-types) in the documentation, and some of the [community extensions](https://github.com/nnnick/Chart.js/blob/master/docs/06-Advanced.md#community-extensions) that have been created already.

To keep the library lightweight for everyone, it's unlikely we'll add many more chart types to the core of Chart.js, but issues are a good medium to design and spec out how new chart types could work and look.

Please do not use issues for support requests. For help using Chart.js, please take a look at the [`chartjs`](http://stackoverflow.com/questions/tagged/chartjs) tag on Stack Overflow.


Reporting bugs
--------------

Well structured, detailed bug reports are hugely valuable for the project.

Guidlines for reporting bugs:

- Check the issue search to see if it has already been reported
- Isolate the problem to a simple test case
- Provide a demonstration of the problem on [JS Bin](http://jsbin.com) or similar

Please provide any additional details associated with the bug, if it's browser or screen density specific, or only happens with a certain configuration or data.


Pull requests
-------------

Clear, concise pull requests are excellent at continuing the project's community driven growth. But please review [these guidelines](https://github.com/blog/1943-how-to-write-the-perfect-pull-request) and the guidelines below before starting work on the project.

Guidlines:

- Please create an issue first:
- For bugs, we can discuss the fixing approach
- For enhancements, we can discuss if it is within the project scope and avoid duplicate effort
- Please make changes to the files in [`/src`](https://github.com/nnnick/Chart.js/tree/master/src), not `Chart.js` or `Chart.min.js` in the repo root directory, this avoids merge conflicts
- Tabs for indentation, not spaces please
- If adding new functionality, please also update the relevant `.md` file in [`/docs`](https://github.com/nnnick/Chart.js/tree/master/docs)
- Please make your commits in logical sections with clear commit messages

Joining the Project
-------------
- Active committers and contributors are invited to introduce yourself and request commit access to this project. Please send an email to hello@nickdownie.com or file an issue.

License
-------

By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/nnnick/Chart.js/blob/master/LICENSE.md).
Loading