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

UP-3912 Admin UI Updates #445

Merged
merged 7 commits into from Nov 11, 2014
Merged

Conversation

doodelicious
Copy link
Contributor

https://issues.jasig.org/browse/UP-3912

  • Added icons to menu items, made them to look like buttons (so they stand out);
  • Updated single-entity-select to look like multi-entity-select (without changing functionality, can still only select one);
  • In 'Manage Portlets', updated table nav to Bootstrap styles; added icons to table links;
  • Permissions manager looks more like Universailty but Bootstrap-y

@apetro
Copy link
Member

apetro commented Oct 24, 2014

Lovely. Did not locally test, but on static review looks positive. 👍 for merge.

Noting some .less files disappearing in this changeset, which seems entirely fine for master; but I suggest not making that kind of change in 4.1-patches as too much change vis a vis any local customizations to that less.

</div>
</div>
<div style="clear:both"></div>
>>>>>>> Stashed changes
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like a merge conflict snuck in.

@drewwills
Copy link
Contributor

@apetro -- FWIW, I think uPortal maintainers could be free to add or remove .less files in the respondr/common/less/ directory because the (documented/encouraged) process of skinning the portal does not involve making local changes to those files. There's nothing in those files you can't override in the mySkin/less/ directory. The exception to this statement would be the common/common.less file itself. That shouldn't disappear because local skins will be importing it directly.

@doodelicious
Copy link
Contributor Author

What I discovered is the file I removed was not called in the common.less file - at all. I think that when the conversion happened, this file was left out and styles were added other places. This was simply a clean-up on my part. You can keep it there, just be aware that code exists in that file that is not compiled anywhere.

On Nov 11, 2014, at 11:06 AM, Drew Wills notifications@github.com wrote:

@apetro https://github.com/apetro -- FWIW, I think uPortal maintainers could be free to add or remove .less files in the respondr/common/less/ directory because the (documented/encouraged) process of skinning the portal does not involve making local changes to those files. There's nothing in those files you can't override in the mySkin/less/ directory. The exception to this statement would be the common/common.less file itself. That shouldn't disappear because local skins will be importing it directly.


Reply to this email directly or view it on GitHub #445 (comment).

@@ -37,67 +37,85 @@ PORTLET DEVELOPMENT STANDARDS AND GUIDELINES
| and more, refer to:
| http://www.ja-sig.org/wiki/x/cQ
-->
<style>
.form-group {
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these rules so broad that they could impact styling from other portlets? Doesn't seem good that when this view is visible buttons everywhere on the page may get different styling. Wonder if they shouldn't be more like:

.view-chooseportlet .form-group {} and .view-chooseportlet .buttons {}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This issue is corrected in this pull request: doodelicious@22668cd

@drewwills drewwills merged commit 66d9a73 into uPortal-Project:master Nov 11, 2014
@drewwills
Copy link
Contributor

Merged out-of-band due to cleanup of conflicts.

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.

None yet

4 participants