codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-16 00:19:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into feature/bootstrap3

Browse source 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
This commit is contained in:
Scott Erickson 2014-01-28 12:46:33 -08:00
parent 6e9f93d299
commit 407d2c7768
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/styles/editor/level/thangs_tab.sass
View file

@ -1,8 +1,6 @@
@import "../../bootstrap/mixins"
#editor-level-thangs-tab-view
position: relative
$addPaletteIconColumns: 3
$extantThangsWidth: 300px
$addPaletteIconWidth: 40px

21
app/templates/editor/level/edit.jade
View file

@ -3,7 +3,26 @@ extends /templates/base
block outer_content
.outer-content
.top-controls-area
nav.navbar.navbar-default
.navbar-header
a.navbar-brand
span(data-i18n="editor.level_title") Level Editor
span :
span.level-title #{level.attributes.name}
ul.nav.nav-pills
li.active
a(href="#editor-level-thangs-tab-view", data-toggle="tab", data-i18n="editor.level_tab_thangs") Thangs
li
a(href="#editor-level-scripts-tab-view", data-toggle="tab", data-i18n="editor.level_tab_scripts") Scripts
li
a(href="#editor-level-settings-tab-view", data-toggle="tab", data-i18n="editor.level_tab_settings") Settings
li
a(href="#editor-level-components-tab-view", data-toggle="tab", data-i18n="editor.level_tab_components") Components
li
a(href="#editor-level-systems-tab-view", data-toggle="tab", data-i18n="editor.level_tab_systems") Systems
//.top-controls-area
h2.level-title-header
span(data-i18n="editor.level_title") Level Editor
span :