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

Bootstrap Theme #3

merged 36 commits into from
Jul 25, 2016

Conversation

ajhewitt
Copy link
Contributor

New bootstrap theme (now in production on Gossamer)

csexton and others added 30 commits February 24, 2016 21:09
There are quite a large number of css and js plugins that the theme
included that seem unnecessary, but might provide good reference in the
future. So I am checking in the base theme with minimal changes. The
idea is that we can have a suite of components and plugins that we might
use for building out the different Radius apps.

Main changes include:

- renaming bower_components to components
- create base angle.js and angle.css that can be included in downstream
  apps
- bump the version number
- manually moving the fonts to the fonts and stylesheets folders (used
  erb to re-write the .css files for the proper asset paths
- Stole the `fa_icon` helper from https://github.com/bokmann/font-awesome-rails
AFAICT we don't need these.
…ils into bootstrap-theme

* 'bootstrap-theme' of github.com:RadiusNetworks/radius-rails:
  Clean up files missing extensions and causing issues with asset pipeline compiler
  Revert "test stub flot makefile"
  Revert "remove chart-flot to investigate Heroku asset pipeline issue"
  Revert "remove chart-flot to investigate Heroku asset pipeline issue"
  remove chart-flot to investigate Heroku asset pipeline issue
  remove chart-flot to investigate Heroku asset pipeline issue
  test stub flot makefile
  Update Google Analytics tracking code per AJ
Why:

- This is a breaking change
- Want to track the version on gossamer
@csexton
Copy link
Member

csexton commented Apr 14, 2016

I am cool with this, but we should be careful when updating this gem in other projects until they are updated to use these styles. Before we merge we should tag master as v1, and roll this out as v2.

ajhewitt and others added 5 commits April 18, 2016 16:42
Needed for the new Display Kit repo
…ils into bootstrap-theme

* 'bootstrap-theme' of github.com:RadiusNetworks/radius-rails:
  fix issue gossamer#305
  add css loaders to theme
  fix issue #288
  inject timezone data into moment-timezone.js
  add chosen and moment to JS imports
  Flot tz files came back after a previous change was reverted, remove
  Flot Makefile came back after a previous change was reverted, remove
Drop some of the documentation for the older theme, and replace it with
sparse, but accurate, notes.
@csexton csexton merged commit 08faee4 into master Jul 25, 2016
@csexton csexton deleted the bootstrap-theme branch July 25, 2016 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants