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

sandbox the new implementation of bootstrap so that it applies only w… #110

Merged
merged 2 commits into from
Dec 19, 2016

Conversation

alisman
Copy link
Collaborator

@alisman alisman commented Dec 13, 2016

What? Why?

We want to have a fresh copy of bootstrap in the context of new components we are introducing. We want to try to insulate the new markup from customizations to bootstrap in the legacy project. To solve this, we build bootstrap with a wrapper class .cbioportal-frontend so that the new bootstrap styles will only appy when that class is applied to the root of a component

Checks

  • Follows 7 rules of great commit messages. For most PRs a single commit should suffice, in some cases multiple topical commits can be useful. During review it is ok to see tiny commits (e.g. Fix reviewer comments), but right before the code gets merged to master or rc branch, any such commits should be squashed since they are useless to the other developers. Definitely avoid merge commits, use rebase instead.
  • Follows the Airbnb React/JSX Style guide.
  • Make sure your commit messages end with a Signed-off-by string (this line
    can be automatically added by git if you run the git-commit command with
    the -s option)

@alisman alisman force-pushed the bootstrap branch 4 times, most recently from 67eee8b to 92f10c7 Compare December 13, 2016 17:32
@@ -139,8 +140,5 @@
"tslint-react": "^1.0.0",
"webpack-dev-server": "^1.15.0",
"yargs": "^4.8.0"
},
"pre-commit": [
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just driving me crazy

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can restore it when we settle on linting rules

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to keep it in, since you can just ignore it with -n if you are certain you don't want the lint checking, seems like a pain update files afterwards, but your call.

Copy link
Member

@inodb inodb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Looks good to me, made a few comments, but do what you think is best.

One thing, try to follow 7 rules of commit messages:

http://chris.beams.io/posts/git-commit/#seven-rules

The description of this PR should prolly be in the commit message itself.

<script src="reactapp/js/common.bundle.js"></script>
<link href="reactapp/css/bootstrap.min.css" rel="stylesheet"></link>
<script src="reactapp/common.bundle.js"></script>
<link href="reactapp/prefixed-bootstrap.min.css" rel="stylesheet"></link>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it essential to change these paths? Might be better to keep them the same, so in the parent cBioPortal project we don't have to change anything.

@@ -139,8 +140,5 @@
"tslint-react": "^1.0.0",
"webpack-dev-server": "^1.15.0",
"yargs": "^4.8.0"
},
"pre-commit": [
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to keep it in, since you can just ignore it with -n if you are certain you don't want the lint checking, seems like a pain update files afterwards, but your call.

cssFilename: 'reactapp/css/app.css',
filename: 'reactapp/[name].app.js',
chunkFilename: 'reactapp/[name].chunk.js',
cssFilename: 'reactapp/app.css',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned above, maybe better to keep current directory structure to prevent having to update parent project, but again your call.

…ithin a css class context .cbioportal-frontend
@alisman alisman merged commit 5a13a79 into cBioPortal:master Dec 19, 2016
onursumer added a commit to onursumer/cbioportal-frontend that referenced this pull request Dec 18, 2019
…or-no-checkbox

Removed checkboxes from protein impact type selector
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 11, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 16, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 18, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 19, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 20, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 23, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 24, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 25, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 26, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 27, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 27, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request May 27, 2022
alisman pushed a commit to alisman/cbioportal-frontend that referenced this pull request Jun 2, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request Jun 6, 2022
onursumer pushed a commit to onursumer/cbioportal-frontend that referenced this pull request Jun 6, 2022
alisman pushed a commit to onursumer/cbioportal-frontend that referenced this pull request Jun 8, 2022
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