diff --git a/app/styles/account/settings.sass b/app/styles/account/settings.sass
index b4625263d..4eccfb708 100644
--- a/app/styles/account/settings.sass
+++ b/app/styles/account/settings.sass
@@ -37,7 +37,6 @@
font-size: 12px
.form
- margin: 0 20px
max-width: 600px
#wizard-settings-tab-view
diff --git a/app/styles/editor/level/edit.sass b/app/styles/editor/level/edit.sass
index 0830b7914..0b807e247 100644
--- a/app/styles/editor/level/edit.sass
+++ b/app/styles/editor/level/edit.sass
@@ -45,7 +45,7 @@
.tab-pane
// makes sure the pane itself fills the whole ratio'd space
position: absolute
- top: 0
+ top: 10px
bottom: 0
left: 0
right: 0
diff --git a/app/styles/kinds/search.sass b/app/styles/kinds/search.sass
index 863790ac3..4c6ab5306 100644
--- a/app/styles/kinds/search.sass
+++ b/app/styles/kinds/search.sass
@@ -20,6 +20,3 @@
.bar
width: 100%
-
- form
- margin: 0 20px
\ No newline at end of file
diff --git a/app/styles/play/level/modal/multiplayer.sass b/app/styles/play/level/modal/multiplayer.sass
index 6e2452a0a..a5c85ad87 100644
--- a/app/styles/play/level/modal/multiplayer.sass
+++ b/app/styles/play/level/modal/multiplayer.sass
@@ -11,6 +11,3 @@
text-align: center
height: 30px
font-size: 11px
-
- .form
- margin-left: 20px
\ No newline at end of file
diff --git a/app/templates/account/settings.jade b/app/templates/account/settings.jade
index 8db89c787..ba1ab1757 100644
--- a/app/templates/account/settings.jade
+++ b/app/templates/account/settings.jade
@@ -25,7 +25,7 @@ block content
.tab-content#settings-panes
#general-pane.tab-pane
p
- .form.form-horizontal
+ .form
.form-group
label.control-label(for="name", data-i18n="general.name") Name
input#name.form-control(name="name", type="text", value="#{me.get('name')||''}", placeholder="#{gravatarName}")
@@ -61,7 +61,7 @@ block content
#password-pane.tab-pane
p
- .form-horizontal.form
+ .form
.form-group
label.control-label(for="password", data-i18n="account_settings.new_password") New Password
input#password.form-control(name="password", type="password")
@@ -73,13 +73,13 @@ block content
h3(data-i18n="account_settings.email_subscriptions") Email Subscriptions
p
- .form.form-horizontal
+ .form
.form-group.checkbox
label.control-label(for="email_announcement", data-i18n="account_settings.email_announcements") Announcements
input#email_announcement(name="email_announcement", type="checkbox", checked=subs.announcement)
span.help-block(data-i18n="account_settings.email_announcements_description") Get emails on the latest news and developments at CodeCombat.
- .form.form-horizontal
+ .form
.form-group.checkbox
label.control-label(for="email_notification", data-i18n="account_settings.email_notifications") Notifications
input#email_notification(name="email_notification", type="checkbox", checked=subs.notification)
@@ -91,7 +91,7 @@ block content
a(href="/contribute", data-i18n="account_settings.contribute_page") contribute page
span(data-i18n="account_settings.contribute_suffix") to find out more.
- .form.form-horizontal
+ .form
.form-group.checkbox
label.control-label(for="email_developer")
span(data-i18n="classes.archmage_title")
diff --git a/app/templates/cla.jade b/app/templates/cla.jade
index c022b6900..a55e08b09 100644
--- a/app/templates/cla.jade
+++ b/app/templates/cla.jade
@@ -89,14 +89,13 @@
else
h3 SIGN HERE
- .form-horizontal
- .control-group
- label.control-label Github Username
- .controls
- input(name="github-username", type="text")#github-username
- span.help-block Please include if contributing to the
- a(href="github.com/codecombat/codecombat") Github repository
- | .
+ .form
+ .form-group
+ label(for="github-username") Github Username
+ input(name="github-username", type="text")#github-username.form-control
+ span.help-block Please include if contributing to the
+ p(href="github.com/codecombat/codecombat") Github repository
+ | .
p
| Please press I AGREE below to indicate your agreement.
button.btn#agreement-button I AGREE
diff --git a/app/templates/editor/level/component/new.jade b/app/templates/editor/level/component/new.jade
index 2b3e78361..6af6f987c 100644
--- a/app/templates/editor/level/component/new.jade
+++ b/app/templates/editor/level/component/new.jade
@@ -4,15 +4,13 @@ block modal-header-content
h3(data-i18n="editor.new_component_title") Create New Component
block modal-body-content
- form.form-horizontal
- .control-group
+ form.form
+ .form-group
label(for="level-component-system", data-i18n="editor.new_component_field_system").control-label System
- .controls
- input#level-component-system.input-large(name="system", type="text")
- .control-group
+ input.form-control#level-component-system(name="system", type="text")
+ .form-group
label(for="level-component-name", data-i18n="general.name").control-label Name
- .controls
- input#level-component-name.input-large(name="name", type="text")
+ input.form-control#level-component-name(name="name", type="text")
block modal-footer-content
button(data-dismiss="modal", data-i18n="common.cancel").btn Cancel
diff --git a/app/templates/editor/level/fork.jade b/app/templates/editor/level/fork.jade
index 4c914e66f..255fc8d80 100644
--- a/app/templates/editor/level/fork.jade
+++ b/app/templates/editor/level/fork.jade
@@ -4,11 +4,10 @@ block modal-header-content
h3(data-i18n="editor.fork_title") Fork New Version
block modal-body-content
- form#save-level-form.form-horizontal
- .control-group
- label.control-label(for="level-name") Name
- .controls
- textarea#level-name.input-large(name="name", type="text")
+ form#save-level-form.form
+ .form-group
+ label(for="level-name") Name
+ input#level-name(name="name", type="text").form-control
block modal-footer-content
button.btn(data-dismiss="modal") Cancel
diff --git a/app/templates/editor/level/save.jade b/app/templates/editor/level/save.jade
index 7bff18551..8ada52b23 100644
--- a/app/templates/editor/level/save.jade
+++ b/app/templates/editor/level/save.jade
@@ -3,22 +3,19 @@ extends /templates/modal/save_version
block modal-body-content
h3= "Level: " + level.get('name') + " - " + (levelNeedsSave ? "Modified" : "Not Modified")
if levelNeedsSave
- form#save-level-form.form-horizontal
- .control-group
+ form#save-level-form.form
+ .form-group
label.control-label(for="level-commit-message") Commit Message
- .controls
- textarea#level-commit-message.input-large(name="commit-message", type="text")
+ textarea.form-control#level-commit-message(name="commit-message", type="text")
if level.isPublished()
- .control-group
+ .form-group.checkbox
label.control-label(for="level-version-is-major") Major Changes?
- .controls
- input#level-version-is-major.input-large(name="version-is-major", type="checkbox")
- span.help-block (Could this update break old solutions of the level?)
+ input#level-version-is-major(name="version-is-major", type="checkbox")
+ span.help-block (Could this update break old solutions of the level?)
if !level.isPublished()
- .control-group
+ .form-group.checkbox
label.control-label(for="level-publish") Publish This Level (irreversible)?
- .controls
- input#level-publish.input-large(name="publish", type="checkbox")
+ input#level-publish(name="publish", type="checkbox")
if modifiedComponents.length
hr
@@ -26,19 +23,17 @@ block modal-body-content
each component in modifiedComponents
- var id = component.get('_id')
h4= "Component: " + component.get('system') + '.' + component.get('name')
- form.component-form.form-horizontal(id="save-component-" + id + "-form")
+ form.component-form(id="save-component-" + id + "-form")
input(name="component-original", type="hidden", value=component.get('original'))
input(name="component-parent-major-version", type="hidden", value=component.get('version').major)
- .control-group
+ .form-group
label.control-label(for=id + "-commit-message") Commit Message
- .controls
- textarea.input-large(id=id + "-commit-message", name="commit-message", type="text")
+ textarea.form-control(id=id + "-commit-message", name="commit-message", type="text")
if component.isPublished()
- .control-group
+ .form-group.checkbox
label.control-label(for=id + "-version-is-major") Major Changes?
- .controls
- input.input-large(id=id + "-version-is-major", name="version-is-major", type="checkbox")
- span.help-block (Could this update break anything depending on this Component?)
+ input(id=id + "-version-is-major", name="version-is-major", type="checkbox")
+ span.help-block (Could this update break anything depending on this Component?)
if modifiedSystems.length
hr
@@ -46,16 +41,14 @@ block modal-body-content
each system in modifiedSystems
- var id = system.get('_id')
h4= "System: " + system.get('name')
- form.system-form.form-horizontal(id="save-system-" + id + "-form")
+ form.system-form(id="save-system-" + id + "-form")
input(name="system-original", type="hidden", value=system.get('original'))
input(name="system-parent-major-version", type="hidden", value=system.get('version').major)
- .control-group
+ .form-group
label.control-label(for=id + "-commit-message") Commit Message
- .controls
- textarea.input-large(id=id + "-commit-message", name="commit-message", type="text")
+ textarea.form-control(id=id + "-commit-message", name="commit-message", type="text")
if system.isPublished()
- .control-group
+ .form-group.checkbox
label.control-label(for=id + "-version-is-major") Major Changes?
- .controls
- input.input-large(id=id + "-version-is-major", name="version-is-major", type="checkbox")
- span.help-block (Could this update break anything depending on this System?)
+ input(id=id + "-version-is-major", name="version-is-major", type="checkbox")
+ span.help-block (Could this update break anything depending on this System?)
diff --git a/app/templates/editor/level/system/new.jade b/app/templates/editor/level/system/new.jade
index a89de7c32..7bdf9f762 100644
--- a/app/templates/editor/level/system/new.jade
+++ b/app/templates/editor/level/system/new.jade
@@ -4,11 +4,10 @@ block modal-header-content
h3(data-i18n="editor.create_system_title") Create New System
block modal-body-content
- form.form-horizontal
- .control-group
+ form.form
+ .form-group
label(for="level-system-name", data-i18n="general.name").control-label Name
- .controls
- input#level-system-name.input-large(name="name", type="text")
+ input.form-control#level-system-name(name="name", type="text")
block modal-footer-content
button(data-dismiss="modal", data-i18n="common.cancel").btn Cancel
diff --git a/app/templates/kinds/search.jade b/app/templates/kinds/search.jade
index 7f5362696..15728c47b 100644
--- a/app/templates/kinds/search.jade
+++ b/app/templates/kinds/search.jade
@@ -14,7 +14,7 @@ block content
.modal-header
h3 Create New #{modelLabel}
.modal-body
- form.form-horizontal
+ form.form
.form-group
label.control-label(for="name") Name
input#name.form-control(name="name", type="text")
diff --git a/app/templates/modal/save_version.jade b/app/templates/modal/save_version.jade
index 2fbdbcf80..3c6a35f48 100644
--- a/app/templates/modal/save_version.jade
+++ b/app/templates/modal/save_version.jade
@@ -4,11 +4,11 @@ block modal-header-content
h3(data-i18n="versions.save_version_title") Save New Version
block modal-body-content
- form.form-horizontal
+ form.form
.form-group
label.control-label(for="commitMessage", data-i18n="general.commit_msg") Commit Message
textarea#commit-message.input-large.form-control(name="commitMessage", type="text")
- .control-group
+ .form-group
label.control-label(for="level-version-is-major", data-i18n="versions.new_major_version") New Major Version
input#major-version.input-large.form-control(name="version-is-major", type="checkbox")
span.help-block
diff --git a/app/templates/modal/wizard_settings.jade b/app/templates/modal/wizard_settings.jade
index 86c5c463e..7a789dce4 100644
--- a/app/templates/modal/wizard_settings.jade
+++ b/app/templates/modal/wizard_settings.jade
@@ -8,16 +8,14 @@ block modal-body-content
canvas(width="120px", height="150px")
.settings
- .form-vertical
- .control-group
+ .form-vertical.form
+ .form-group
label.control-label(for="name")
| Name
button.btn.btn-mini.btn-primary#random-name Random
- .controls
- input#wizard-settings-name.input-large(name="name", type="text", value="#{me.get('name')||''}")
- .control-group
- label.control-label(for="wizardColor1") Hat Color
- .controls
+ input#wizard-settings-name(name="name", type="text", value="#{me.get('name')||''}")
+ .form-group
+ label.control-label(for="wizardColor1") Hat Color
.selector#wizard-settings-color-1
block modal-footer-content
diff --git a/app/templates/play/level/modal/multiplayer.jade b/app/templates/play/level/modal/multiplayer.jade
index 3be6ee3f7..7b3034a10 100644
--- a/app/templates/play/level/modal/multiplayer.jade
+++ b/app/templates/play/level/modal/multiplayer.jade
@@ -5,7 +5,7 @@
h3(data-i18n="play_level.multiplayer_title") Multiplayer Settings
.modal-body
- .form-horizontal.form
+ .form
.form-group.checkbox
label.control-label(for="multiplayer")
input#multiplayer(name="multiplayer", type="checkbox", checked=multiplayer)
diff --git a/app/views/kinds/ModalView.coffee b/app/views/kinds/ModalView.coffee
index eb86a09ed..72fd25c52 100644
--- a/app/views/kinds/ModalView.coffee
+++ b/app/views/kinds/ModalView.coffee
@@ -27,7 +27,7 @@ module.exports = class ModalView extends CocoView
afterRender: ->
super()
if @modalWidthPercent
- @$el.css width: "#{@modalWidthPercent}%", "margin-left": "#{-@modalWidthPercent / 2}%"
+ @$el.find('.modal-dialog').css width: "#{@modalWidthPercent}%"
@$el.on 'hide.bs.modal', =>
@onHidden() unless @hidden
@hidden = true