Skip to content
This repository was archived by the owner on Sep 1, 2022. It is now read-only.

update components#3

Merged
minrk merged 7 commits intojupyter:masterfrom
minrk:working
Jun 4, 2013
Merged

update components#3
minrk merged 7 commits intojupyter:masterfrom
minrk:working

Conversation

@minrk
Copy link
Copy Markdown
Member

@minrk minrk commented May 31, 2013

  • add font-awesome
  • specify minimum rather than full version in bower.json
  • bower can install CodeMirror
  • exclude duplicate, unused jquery-ui subfiles, only keeping the large merged ones
  • run fab update

this updated bootstrap, jquery, jquery-ui, CodeMirror, and marked

@Carreau
Copy link
Copy Markdown
Member

Carreau commented May 31, 2013

Seem legit to me.

Any short term plan for Font Awesome ? you or @ellisonbg plan to work on it ?

@minrk
Copy link
Copy Markdown
Member Author

minrk commented Jun 2, 2013

I'm working on bootstrapifying the menu bar, and that needs icons, and bootstrap's shipped icon set isn't very useful.

@Carreau
Copy link
Copy Markdown
Member

Carreau commented Jun 2, 2013

I'm working on bootstrapifying the menu bar, and that needs icons, and bootstrap's shipped icon set isn't very useful.

Yes, I figured that out fro a quick read-through hipchat.
I looked at that some time ago, and it could allow us to build custom font if there are some specific Icon we want to make.

@Carreau
Copy link
Copy Markdown
Member

Carreau commented Jun 2, 2013

Hum... did the merge button diseapear of was I never admin of this repo ?

@minrk
Copy link
Copy Markdown
Member Author

minrk commented Jun 2, 2013

sorry, you should have permission now

@Carreau
Copy link
Copy Markdown
Member

Carreau commented Jun 2, 2013

Ah! Js update page live when you are given the permission...nice !
I'm fine with this. If it makes your dev easier, merge whenever you wish.

@minrk minrk mentioned this pull request Jun 2, 2013
Merged
20 tasks
minrk added a commit that referenced this pull request Jun 4, 2013
@minrk
Merge pull request #3 from minrk/working
2a98f49 
update components

- add font-awesome
- specify minimum rather than full version in bower.json
- bower can install CodeMirror
- exclude duplicate, unused jquery-ui subfiles, only keeping the large merged ones
- run `fab update`

this updated bootstrap, jquery, jquery-ui, CodeMirror, and marked
@minrk minrk merged commit 2a98f49 into jupyter:master Jun 4, 2013
@minrk minrk deleted the working branch June 4, 2013 21:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@minrk @Carreau