Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Improve semantics / architecture of bootstrap templates #537

Merged
merged 9 commits into from
Jan 12, 2015
Merged

Improve semantics / architecture of bootstrap templates #537

merged 9 commits into from
Jan 12, 2015

Conversation

richstandbrook
Copy link
Contributor

Right now the bootstrap templates end up looking clunky and they have no identifiable classes so are impossible to restyle. This set of changes removes the col- classes and adds targetable classes .ui-select-placeholder .ui-select-match-text and .ui-select-clear. It moves the caret and clear buttons into the the main toggle and allows the main toggle button to be disabled (which was a aesthetics more than functionality)

koorb added 5 commits December 19, 2014 17:08
Fixes the group-by example and switches to attribute allow-clear
Adds more targetable classes .ui-select-placeholder
.ui-select-match-text .ui-select-clear
@dimirc dimirc added the unknown label Dec 19, 2014
@brianfeister
Copy link

Thanks for this @koorb, hopefully I'll have time to look into it soon. In the meantime, the build task and tag for a release is done by a repo owner since not every merge is guaranteed to be a release. Please remove the /dist files from your PR (leave them unchanged) and remove all references to v0.9.6

@brianfeister brianfeister changed the title Update bootstrap templates to be more restyle-able Improve semantics / architecture of bootstrap templates Dec 19, 2014
@richstandbrook
Copy link
Contributor Author

Sorry @brianfeister how do I remove those commits from this PR?

@brianfeister
Copy link

No worries. I would start by pulling the latest from master and merging it into your local branch, then do a hard reset http://stackoverflow.com/questions/7147270/how-can-i-make-an-hard-reset-of-a-single-file of the files in /dist, to commit SHA 3843e0d. I find the SourceTree App GUI to be the best way to do routine git tasks.

@brianfeister
Copy link

make sure to also revert the changes to package.json and bower.json

@richstandbrook
Copy link
Contributor Author

Do I need to submit a new PR?

@brianfeister
Copy link

If you push the changes to your branch the rest is automatic

Sent from my iPhone

On Dec 19, 2014, at 5:33 PM, Richard notifications@github.com wrote:

Do I need to submit a new PR?


Reply to this email directly or view it on GitHub.

@brianfeister
Copy link

@koorb - are you good to go? Sorry for my brief email reply yesterday - all you do is make the changes, save a new commit, and then push that commit to your existing branch, Github will take care of the rest.

@richstandbrook
Copy link
Contributor Author

Right @brianfeister I did it again but I've reverted it too. Starting to get the hang of how this works!

brianfeister pushed a commit that referenced this pull request Jan 12, 2015
Improve semantics / architecture of bootstrap templates
@brianfeister brianfeister merged commit 725ed48 into angular-ui:master Jan 12, 2015
@brianfeister
Copy link

Hey @koorb - thanks again for this. I found that your direction didn't work for the multi select permutation of the directive. Thanks for your pointers though, v0.9.6 includes some of what you did here and apologies for not including it, seemed like more to back out than to include.

@richstandbrook
Copy link
Contributor Author

Thats fine @brianfeister it was my first pull request and I got it in a bit of a mess, but glad it was useful.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants