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.

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

update to use bootstrap 3 #32

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to use bootstrap 3 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"backbone": "1.0.0",
"backbone.marionette": "v1.0.3",
"aloha-editor": "oerpub/Aloha-Editor#master",
"bootstrap": "v2.3.2",
"bootstrap": "v3.0.0",
"filtered-collection": "dlikhten/filtered-collection",
"jsdifflib": "philschatz/jsdifflib#master"
},
Expand Down
30 changes: 15 additions & 15 deletions scripts/config.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@ require.config
select2: "#{BOWER}/select2/select2"
moment: "#{BOWER}/moment/moment"
# Bootstrap Plugins
bootstrapAffix: "#{BOWER}/bootstrap/js/bootstrap-affix"
bootstrapAlert: "#{BOWER}/bootstrap/js/bootstrap-alert"
bootstrapButton: "#{BOWER}/bootstrap/js/bootstrap-button"
bootstrapCarousel: "#{BOWER}/bootstrap/js/bootstrap-carousel"
bootstrapCollapse: "#{BOWER}/bootstrap/js/bootstrap-collapse"
bootstrapDropdown: "#{BOWER}/bootstrap/js/bootstrap-dropdown"
bootstrapModal: "#{BOWER}/bootstrap/js/bootstrap-modal"
bootstrapPopover: "#{BOWER}/bootstrap/js/bootstrap-popover"
bootstrapScrollspy: "#{BOWER}/bootstrap/js/bootstrap-scrollspy"
bootstrapTab: "#{BOWER}/bootstrap/js/bootstrap-tab"
bootstrapTooltip: "#{BOWER}/bootstrap/js/bootstrap-tooltip"
bootstrapTransition: "#{BOWER}/bootstrap/js/bootstrap-transition"
bootstrapTypeahead: "#{BOWER}/bootstrap/js/bootstrap-typeahead"
bootstrapTags: "#{BOWER}/bootstrapTags/dist/bootstrap-tagsinput.min"
bootstrapTagsCss: "#{BOWER}/bootstrapTags/dist/bootstrap-tagsinput"
bootstrapAffix: "#{BOWER}/bootstrap/js/affix"
bootstrapAlert: "#{BOWER}/bootstrap/js/alert"
bootstrapButton: "#{BOWER}/bootstrap/js/button"
bootstrapCarousel: "#{BOWER}/bootstrap/js/carousel"
bootstrapCollapse: "#{BOWER}/bootstrap/js/collapse"
bootstrapDropdown: "#{BOWER}/bootstrap/js/dropdown"
bootstrapModal: "#{BOWER}/bootstrap/js/modal"
bootstrapPopover: "#{BOWER}/bootstrap/js/popover"
bootstrapScrollspy: "#{BOWER}/bootstrap/js/scrollspy"
bootstrapTab: "#{BOWER}/bootstrap/js/tab"
bootstrapTooltip: "#{BOWER}/bootstrap/js/tooltip"
bootstrapTransition: "#{BOWER}/bootstrap/js/transition"
bootstrapTypeahead: "#{BOWER}/bootstrap/js/typeahead"
bootstrapTags: "#{BOWER}/bootstrapTags/dist/tagsinput.min"
bootstrapTagsCss: "#{BOWER}/bootstrapTags/dist/tagsinput"

# ## Handlebars Dependencies
Handlebars: "#{BOWER}/require-handlebars-plugin/Handlebars"
Expand Down
16 changes: 8 additions & 8 deletions scripts/configs/aloha.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ define ['jquery'], ($) ->
'oer/multipart'
'oer/copy'
'oer/cleanup'
'oer/figure'
'oer/media-embed'
# 'oer/figure'
# 'oer/media-embed'
'oer/metadata'
]

Expand Down Expand Up @@ -114,12 +114,12 @@ define ['jquery'], ($) ->
console.log 'Updated Image src as a result of upload'

note: [
{ label: 'Note', cls: 'note', hasTitle: true }
{ label: 'Aside', cls: 'note', hasTitle: true, type: 'aside' }
{ label: 'Warning', cls: 'note', hasTitle: true, type: 'warning' }
{ label: 'Tip', cls: 'note', hasTitle: true, type: 'tip' }
{ label: 'Important', cls: 'note', hasTitle: true, type: 'important' }
{ label: 'Teacher\'s Guide', cls: 'note', hasTitle: true, type: 'teachers-guide' }
{ label: 'Note', typeClass: 'note', hasTitle: true }
{ label: 'Aside', typeClass: 'note', hasTitle: true, dataType: 'aside' }
{ label: 'Warning', typeClass: 'note', hasTitle: true, dataType: 'warning' }
{ label: 'Tip', typeClass: 'note', hasTitle: true, dataType: 'tip' }
{ label: 'Important', typeClass: 'note', hasTitle: true, dataType: 'important' }
{ label: 'Teacher\'s Guide', typeClass: 'note', hasTitle: true, dataType: 'teachers-guide' }
]
block:
dragdrop: "1"
Expand Down
10 changes: 10 additions & 0 deletions styles/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@
@module-color-light: #FAEFEA;
@folder-color: #999; // same as the folder icon
@editor-background-color: #ccc;


// HACK: These are remnants from bootstrap 2 and should be refactored
@baseFontSize: 14px;
@grayLight: #ccc;
@fontSizeSmall: 10px;
@linkColor: #00c;
@linkColorHover: #00c;
@grayDark: #666;
.buttonBackground(...) {}
8 changes: 6 additions & 2 deletions templates/layouts/workspace/bookshelf.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ <h3 class="handle" title="Expand/collapse this panel">
</h3>

<!-- book metadata modal -->
<div id="edit-book-modal" class="modal hide fade" tabindex="-1" role="dialog" style="width: 660px;">
<div id="edit-book-modal" class="modal fade" tabindex="-1" role="dialog" style="width: 660px;">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-cancel aria-hidden="true">×</button>
<h3 id="diffs-modal-label">Edit the authors and other metadata on this book</h3>
<h3 id="diffs-modal-label" class="modal-title">Edit the authors and other metadata on this book</h3>
</div>
<div class="modal-body" style="max-height: 400px;">

Expand Down Expand Up @@ -186,3 +188,5 @@ <h4 style="display:inline-block;" data-edit-toggle>
<button class="btn btn-primary" data-tab-next>Next</button>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion templates/layouts/workspace/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container-fluid">
<div class="row-fluid">

<form class="navbar-form pull-left" id="workspace-menu-toolbar"></form>
<form class="navbar-form" id="workspace-menu-toolbar"></form>

</div>
</div>
Expand Down
8 changes: 6 additions & 2 deletions templates/workspace/menu/add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@
<!-- book create -->
<div
id="create-book-modal"
class="modal hide fade"
class="modal fade"
tabindex="-1"
role="dialog"
style="width: 660px; text-align: left;"
>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-cancel aria-hidden="true">×</button>
<h3>Title for new book</h3>
<h3 class="modal-title">Title for new book</h3>
</div>
<div class="modal-body">
<form class="form-horizontal">
Expand All @@ -36,3 +38,5 @@ <h3>Title for new book</h3>
<button class="btn btn-primary" data-submit data-dismiss="modal">Next</button>
</div>
</div>
</div>
</div>