Skip to content

Upgrade Bootstrap to 3.0.0 #3178

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.

Sign up for GitHub

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

Closed
wants to merge 126 commits into from
Closed

Upgrade Bootstrap to 3.0.0 #3178

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
1d83c8d
Replace `spanx` by `col-md-x` and `row-fluid` by `row` for bootstrap …
bertpareyn Aug 29, 2013
9efacdf
Upgrade modals, buttons and navigation to Bootstrap 3
bertpareyn Aug 30, 2013
ea833eb
Upgrade index, dashboard and content profile widgets to Bootstrap 3, …
bertpareyn Sep 3, 2013
bf4886a
Upgrade search pages, uploadnewversion and register to bootstrap3
bertpareyn Sep 3, 2013
dd5f778
Upgrade the libraries to bootstrap 3.0
bertpareyn Sep 3, 2013
3258db3
Update form validation, Update progress indication
bertpareyn Sep 4, 2013
22ee8dd
Update notify to bootstrap 3.0, Updates to the content profile page
bertpareyn Sep 4, 2013
5f665e8
Make large list options flexible
bertpareyn Sep 5, 2013
e56b767
Address large list options visual issues
bertpareyn Sep 5, 2013
2578e3e
Upgrade the admin UI to bootstrap 3.0
bertpareyn Sep 5, 2013
36f859a
Upgrade Admin UI modals to Bootstrap 3.0
bertpareyn Sep 5, 2013
827935c
Adjust footer and header in Admin UI
bertpareyn Sep 5, 2013
5176b4f
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Sep 9, 2013
0486c9f
Refinements to the responsive left hand navigation
bertpareyn Sep 9, 2013
080e821
Remove unnecessary page CSS
bertpareyn Sep 9, 2013
4556728
Merge origin/master and fix conflicts
bertpareyn Sep 11, 2013
6b2edad
Merge origin/master and fix conflicts
bertpareyn Sep 25, 2013
aa6d504
Address Bootstrap 3 top navigation issues
bertpareyn Sep 26, 2013
69ad820
More top navigation and register widget work
bertpareyn Sep 26, 2013
9f54c5a
Activity, notifications and lists adjustments for Bootstrap 3
bertpareyn Sep 27, 2013
d798728
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Sep 30, 2013
299e5fb
Further improvements to Bootstrap 3 upgrade
bertpareyn Sep 30, 2013
df7d478
Bootstrap tweaks
bertpareyn Oct 1, 2013
79cc5ec
Admin UI fixes for bootstrap 3 upgrade
bertpareyn Oct 4, 2013
4f43393
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Oct 7, 2013
78d47dc
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Oct 10, 2013
8707aaf
Align left hand navigation with top of content
bertpareyn Oct 10, 2013
6be0e04
Merge origin/master and fix conflicts
bertpareyn Oct 17, 2013
7696f44
Merge origin/master and fix conflicts
bertpareyn Oct 21, 2013
1e0403c
Merge origin/master and fix conflicts, update various widgets to comp…
bertpareyn Oct 30, 2013
772a712
Fix qunit error
bertpareyn Oct 30, 2013
2606fcf
Upgrade Bootstrap to 3.0.1
bertpareyn Oct 31, 2013
9c19b6d
Merge origin/master and fix conflicts, bring new components up to dat…
bertpareyn Oct 31, 2013
f9fd288
Merge origin/master and fix conflicts
bertpareyn Oct 31, 2013
c87d6d9
Merge origin/master and fix conflicts
bertpareyn Nov 6, 2013
f3fa388
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Nov 14, 2013
616e8c5
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Nov 18, 2013
6826b24
Merge origin/master and fix conflicts
bertpareyn Nov 28, 2013
737bc2c
Initial implementation of responsive left hand navigation and clips t…
bertpareyn Dec 3, 2013
9767f75
Hide clips on group page when added to the left hand navigation
bertpareyn Dec 3, 2013
a6b3fb0
Merge origin/master and fix conflicts
bertpareyn Dec 3, 2013
2398523
Upgrade Bootstrap from 3.0.1 --> 3.0.2
bertpareyn Dec 3, 2013
54bf33b
Finish implementing responsive content left hand nav basics, componen…
bertpareyn Dec 4, 2013
d0e1421
Finish implementation of responsive search page
bertpareyn Dec 5, 2013
940a28d
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Dec 5, 2013
2daa779
Add in responsive nav animation, improvements to the search page sear…
bertpareyn Dec 5, 2013
828e003
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Dec 6, 2013
635cb8c
Refinements to lhnav margins/paddings based on feedback, responsive r…
bertpareyn Dec 6, 2013
e66eede
Upgrade to Bootstrap 3.0.3
bertpareyn Dec 6, 2013
e13913f
Implement responsive clips
bertpareyn Dec 6, 2013
d5113cb
Responsive work in: admin area, product video, top navigation and sig…
bertpareyn Dec 9, 2013
f4436c4
Upgrade bootstrap.js to 3.0.3, update unfollow modal, threedot all th…
bertpareyn Dec 9, 2013
417cd7a
Merge origin/master and fix conflicts
bertpareyn Dec 9, 2013
405e0c1
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Dec 10, 2013
bcd601e
Responsive list options, responsive notifications, fix minor issue in…
bertpareyn Dec 11, 2013
5790771
Responsive notifications, Responsive search on index
bertpareyn Dec 11, 2013
35fb56f
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Dec 13, 2013
a93df1e
Merge origin/master and fix conflicts
bertpareyn Dec 16, 2013
e1a7308
Merge origin/master and fix conflicts
bertpareyn Dec 18, 2013
924e34b
Fix bootstrap3 upgrade visual regressions in register, top navigation…
bertpareyn Dec 20, 2013
6279587
Bootstrap 3 follow-up
bertpareyn Jan 6, 2014
a4da57b
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 6, 2014
61449cb
Content profile followup, comments, manageaccess, documentpreview, et…
bertpareyn Jan 6, 2014
ba431d4
Follow up on bootstrap error pages, admin UI, docs UI and search
bertpareyn Jan 6, 2014
bc71004
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 6, 2014
0083548
Follow up on bootstrap 3 discussion page
bertpareyn Jan 7, 2014
00d9fb1
Enable share in the left hand nav, tweaks for mobile
bertpareyn Jan 7, 2014
816f2dd
Don't show productvideo modal on mobile, instead embed video straight…
bertpareyn Jan 7, 2014
442d4c6
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 7, 2014
9988371
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 7, 2014
c280f55
Bootstrap 3 modifications for the changepic widget
bertpareyn Jan 8, 2014
38871bb
Left hand navigation tweaks
bertpareyn Jan 8, 2014
6c13303
Replace div with footer and main element
bertpareyn Jan 8, 2014
86cf090
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 8, 2014
cd4e8a1
Merge origin/master and fix conflicts
bertpareyn Jan 8, 2014
d3205a3
Merge origin/master and fix conflicts
bertpareyn Jan 9, 2014
6de2c03
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 13, 2014
62a7241
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 14, 2014
375c78a
Use CSS flexbox to improve threedots
bertpareyn Jan 14, 2014
56e21e4
Fix broken font awesome reference in build (update paths after upgrad…
bertpareyn Jan 14, 2014
cae55a6
Follow up on bootstrap 3 regressions
bertpareyn Jan 15, 2014
66cfeb8
break-word on media-body to avoid overflow in comments
bertpareyn Jan 15, 2014
7cde329
Merge origin/master and fix conflicts
bertpareyn Jan 15, 2014
d889b70
Break word in activities as well
bertpareyn Jan 16, 2014
dc9b09c
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 16, 2014
aea71c5
Follow up on Bootstrap3 review
bertpareyn Jan 17, 2014
5e7d8d0
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 17, 2014
65cea16
(Issue 3384) Use id for link container rather than positioning
mrvisser Jan 17, 2014
b3fe67f
Merge pull request #15 from mrvisser/issue-3384
bertpareyn Jan 17, 2014
511a023
Bootstrap 3 followup
bertpareyn Jan 17, 2014
dc6e0d6
Bootstrap 3 followup
bertpareyn Jan 18, 2014
94db395
Bootstrap 3 followup
bertpareyn Jan 18, 2014
3bd8b46
Follow up on the left hand navigation review
bertpareyn Jan 18, 2014
90dd75a
Remove lingering event
bertpareyn Jan 18, 2014
483b7d5
Follow up on bootstrap 3 CSS review
bertpareyn Jan 19, 2014
c1146d7
Follow up on bootstrap.notify, docs and minor issues
bertpareyn Jan 19, 2014
e4de13b
Bootstrap 3 Left hand navigation refinements
bertpareyn Jan 19, 2014
7bf892f
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 19, 2014
06456d4
Merge origin/master and fix conflicts
bertpareyn Jan 21, 2014
7bec567
Bootstrap followup
bertpareyn Jan 21, 2014
7eb845f
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 24, 2014
1bf8cf3
Bootstrap 3 followup
bertpareyn Jan 24, 2014
d662d33
Bootstrap 3 followup
bertpareyn Jan 24, 2014
3258f85
Add documentation for the oae-lhnavigation component
bertpareyn Jan 27, 2014
d8f1c19
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 27, 2014
832a7e5
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 28, 2014
6033c5e
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Jan 31, 2014
e31f301
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Feb 3, 2014
5c442dc
Follow up on Bootstrap 3 review
bertpareyn Feb 3, 2014
2c93bfd
Merge origin/master and fix conflicts
bertpareyn Feb 3, 2014
7f5650a
Follow up on Bootstrap 3 review
bertpareyn Feb 3, 2014
f12a52f
Follow up on Bootstrap 3 review
bertpareyn Feb 3, 2014
2ba701a
Follow up on Bootstrap 3 review
bertpareyn Feb 3, 2014
927e1be
Fix my library display issues on IE9
Feb 5, 2014
d84a37f
Merge pull request #59 from timdegroote/ie9-fix
bertpareyn Feb 5, 2014
80bd7ca
Pass in baseURL in content and discussion left hand navigation
bertpareyn Feb 5, 2014
513f17f
Follow up on Bootstrap 3 review
bertpareyn Feb 5, 2014
969920a
Use CSS to hide the lhnav collapse button
bertpareyn Feb 5, 2014
bcb1260
Optimize re-rendering content and discussion previews when updates ha…
bertpareyn Feb 5, 2014
ff995f8
Improve selector for clearing preview container
bertpareyn Feb 5, 2014
0455f37
Update jquery spectrum plugin
bertpareyn Feb 10, 2014
75ab3b8
Merge origin/master and fix conflicts
bertpareyn Feb 10, 2014
b67194f
Show the lhnav toggle button for anonymous users on user and group pages
bertpareyn Feb 10, 2014
6388af8
Merge origin/master and fix conflicts
bertpareyn Feb 12, 2014
f889d31
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Feb 12, 2014
2a81fcd
Merge branch 'master' of https://github.com/sakaiproject/3akai-ux int…
bertpareyn Feb 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions admin/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
<div id="admin-header-container"><!-- --></div>

<div id="admin-content-container">
Copy link
Contributor

@sathomas sathomas Sep 5, 2013

Choose a reason for hiding this comment

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

Is any code looking for <div> specifically? If not, would suggest

<main id="admin-content-container" role="main">

instead for accessibility.

<div class="row-fluid">
<div id="admin-lhnav-container" class="span2 hide"><!-- --></div>
<div id="admin-content" class="span10">
<div class="row">
<div id="admin-lhnav-container" class="col-md-2 hide"><!-- --></div>
<div id="admin-content" class="col-md-10">
<!-- Login -->
<div id="admin-login-container" class="hide">
<h2>Sign in to the OAE Administration Panel</h2>
Expand Down Expand Up @@ -69,8 +69,8 @@ <h2>Sign in to the OAE Administration Panel</h2>
<div id="admin-footer-container"><!-- --></div>
Copy link
Contributor

@sathomas sathomas Sep 5, 2013

Choose a reason for hiding this comment

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

Similar to previous comment, would suggest

<footer id="admin-footer-container" role="contentinfo">

(assuming footer is standard copyright info, etc.)

Copy link
Contributor

@nicolaasmatthijs nicolaasmatthijs Sep 5, 2013

Choose a reason for hiding this comment

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

Yes, it is. Do you know if this will be rendering correctly on IE9?

Copy link
Contributor

@sathomas sathomas Sep 5, 2013

Choose a reason for hiding this comment

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

no problems with ie9. i think for ie8 you just need to add

footer {
    display: block;
}

since, by default, unrecognized HTML5 elements are supposed to be rendered as <span>

Copy link
Contributor

@nicolaasmatthijs nicolaasmatthijs Sep 5, 2013

Choose a reason for hiding this comment

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

Great. We don't officially support IE8, so no need to worry about that.


<div id="admin-header-template"><!--
<div class="row-fluid">
<div class="span12" id="admin-header-content">
<div class="row">
<div class="col-md-12" id="admin-header-content">
{if !oae.data.me.anon}
<div id="admin-header-user" class="pull-right">
<button type="button" class="btn btn-inverse" id="admin-header-user-logout">Log out</button>
Expand Down Expand Up @@ -113,8 +113,8 @@ <h1>${context.displayName|encodeForHTML}</h1>
--></div>

<div id="admin-footer-template"><!--
<div class="row-fluid">
<div class="span12" id="admin-footer-content">
<div class="row">
<div class="col-md-12" id="admin-footer-content">
{if !oae.data.me.anon && (context.isGlobalAdminServer || context.isTenantOnGlobalAdminServer)}
<ul class="inline">
<li>
Expand Down
6 changes: 3 additions & 3 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ <h1>API Reference</h1>
</div>
Copy link
Contributor

@nicolaasmatthijs nicolaasmatthijs Sep 13, 2013

Choose a reason for hiding this comment

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

Visual regressions on the docs page:

  • The titles in the left hand navigation are a different font
  • The arrows in the left hand navigation are not vertically centred
  • Titles inside of the docs content are a different font

<!-- CONTENT -->
<div id="doc-content-container">
Copy link
Contributor

@sathomas sathomas Sep 5, 2013

Choose a reason for hiding this comment

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

Another possible place to use

<main id="doc-content-container" role="main">

Copy link
Contributor

@nicolaasmatthijs nicolaasmatthijs Feb 5, 2014

Choose a reason for hiding this comment

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

This hasn't been followed up yet

<div class="row-fluid">
<div id="doc-modules-container" class="span3"><!----></div>
<div id="doc-module-container" class="span9"><!----></div>
<div class="row">
<div id="doc-modules-container" class="col-md-3"><!----></div>
<div id="doc-module-container" class="col-md-9"><!----></div>
</div>
</div>

Expand Down
124 changes: 64 additions & 60 deletions node_modules/oae-core/accountpreferences/accountpreferences.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 35 additions & 31 deletions node_modules/oae-core/changepic/changepic.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions node_modules/oae-core/changepic/css/changepic.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion node_modules/oae-core/changepic/js/changepic.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 8 additions & 12 deletions node_modules/oae-core/comments/comments.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/oae-core/comments/css/comments.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading