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

Fixed

Browse source
This commit is contained in:
Scott Erickson 2014-01-27 16:59:34 -08:00
parent 9c7ac3dfdc
commit d6e21192f5
12 changed files with 200 additions and 204 deletions

30
app/styles/base.sass
View file

@ -4,21 +4,11 @@
h1 h2 h3 h4
letter-spacing: 2px
#widget-bounds
display: none
.navbar a.navbar-brand
#top-nav
a.navbar-brand
padding: 4px 20px 0px 20px
margin-left: -20px
.main-content-area
position: relative
width: 1024px
margin: 56px auto 0
min-height: 600px
padding: 14px 12px 5px 12px
@include box-sizing(border-box)
.navbuttontext, .fancy-select .trigger
font-family: 'Bangers', cursive
font-size: 20px
@ -31,11 +21,11 @@ h1 h2 h3 h4
text-overflow: ellipsis
white-space: nowrap
display: inline-block
padding: 0
padding: 0 5px 0 0
margin: 0
height: 18px
.navbar .nav.navbar-link-text, .navbar .nav.navbar-link-text > li > a
.nav.navbar-link-text, .nav.navbar-link-text > li > a
font-family: 'Bangers', cursive
font-weight: normal
font-size: 25px
@ -44,6 +34,18 @@ h1 h2 h3 h4
&:hover
color: #f8e413
.navbar-link-text a:hover
background: darken($body-bg, 3%)
.main-content-area
position: relative
width: 1024px
margin: 56px auto 0
min-height: 600px
padding: 14px 12px 5px 12px
@include box-sizing(border-box)
.navbar .btn, .navbar .btn-group, .navbar .fancy-select
margin-top: 13px

8
app/styles/bootstrap/_variables.scss
View file

@ -343,7 +343,7 @@ $navbar-inverse-toggle-border-color: #333 !default;
// -------------------------
$nav-link-padding: 10px 15px !default;
$nav-link-hover-bg: lighten(#948754, 8%);
$nav-link-hover-bg: lighten($brand-primary, 8%);
$nav-link-hover-color: #f8e413;
$nav-disabled-link-color: $gray-light !default;
@ -356,12 +356,12 @@ $nav-tabs-border-color: #ddd !default;
$nav-tabs-link-hover-border-color: $gray-lighter !default;
$nav-tabs-active-link-hover-bg: $body-bg !default;
$nav-tabs-active-link-hover-color: $gray !default;
$nav-tabs-active-link-hover-bg: $brand-primary !default;
$nav-tabs-active-link-hover-color: $gray-darker !default;
$nav-tabs-active-link-hover-border-color: #ddd !default;
$nav-tabs-justified-link-border-color: #ddd !default;
$nav-tabs-justified-active-link-border-color: $body-bg !default;
$nav-tabs-justified-active-link-border-color: $brand-primary !default;
// Pills
$nav-pills-border-radius: $border-radius-base !default;

2
app/styles/play/level/goals.sass
View file

@ -22,7 +22,7 @@
margin-right: 5px
ul
margin-left: 5px
padding-left: 0
margin-bottom: 0
color: black

3
app/styles/play/level/modal/multiplayer.sass
View file

@ -11,3 +11,6 @@
text-align: center
height: 30px
font-size: 11px
.form
margin-left: 20px

3
app/templates/account/settings.jade
View file

@ -33,8 +33,7 @@ block content
label.control-label(for="email", data-i18n="general.email") Email
input#email.form-control(name="email", type="text", value="#{me.get('email')}")
if !isProduction
.form-group
div.checkbox
.form-group.checkbox
label(for="email", data-i18n="forms.admin") Admin
input#admin(name="admin", type="checkbox", checked=me.get('permissions').indexOf('admin')>-1))

3
app/templates/modal/error.jade
View file

@ -1,4 +1,5 @@
.modal.hide.fade#modal-error
.modal.fade#modal-error
.modal-dialog
.modal-header
.button.close(type="button", data-dismiss="modal", aria-hidden="true") ×
h3 Error #{status}: #{statusText}

2
app/templates/modal/signup.jade
View file

@ -1,7 +1,5 @@
extends /templates/modal/modal_base
.modal-dialog
.modal-content
block modal-header-content
h3(data-i18n="signup.create_account_title") Create Account to Save Progress

1
app/templates/play/level/modal/docs.jade
View file

@ -1,4 +1,5 @@
// TODO: refactor to be like other modals
.modal-dialog
.modal-header
button(type='button', data-dismiss="modal", aria-hidden="true").close ×
h3(data-i18n="play_level.guide_title") Guide

1
app/templates/play/level/modal/infinite_loop.jade
View file

@ -1,3 +1,4 @@
.modal-dialog
.modal-header
button(type='button', data-dismiss="modal", aria-hidden="true").close ×
h3(data-i18n="play_level.infinite_loop_title") Infinite Loop Detected

25
app/templates/play/level/modal/multiplayer.jade
View file

@ -1,17 +1,16 @@
// TODO: refactor to be like other modals
.modal-dialog
.modal-header
button(type='button', data-dismiss="modal", aria-hidden="true").close ×
h3(data-i18n="play_level.multiplayer_title") Multiplayer Settings
.modal-body
// This section is for later
.form-horizontal
.form-group
label.control-label(for="multiplayer") Multiplayer
.control
input#multiplayer.input-large.form-control(name="multiplayer", type="checkbox", checked=multiplayer)
span.help-inline Enable others to join your game.
.form-horizontal.form
.form-group.checkbox
label.control-label(for="multiplayer")
input#multiplayer(name="multiplayer", type="checkbox", checked=multiplayer)
| Multiplayer
span.help-block Enable others to join your game.
hr
@ -26,15 +25,5 @@
p(data-i18n="play_level.multiplayer_coming_soon") More multiplayer features to come!
//#multiplayer-team-selection.hide
// h4 Multiplayer Team Selection
// form
// label.radio
// input(type="radio", name="team-selection", value="humans")
// span Red Team
// label.radio
// input(type="radio", name="team-selection", value="ogres")
// span Blue Team
.modal-footer
a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="modal.close").btn.btn-primary Close

1
app/templates/play/level/modal/reload.jade
View file

@ -1,3 +1,4 @@
.modal-dialog
.modal-header
button(type='button', data-dismiss="modal", aria-hidden="true").close ×
h3(data-i18n="play_level.reload_title") Reload All Code?

1
app/templates/play/level/modal/victory.jade
View file

@ -1,4 +1,5 @@
// TODO: refactor to be like other modals
.modal-dialog
.modal-header
button(type='button', data-dismiss="modal", aria-hidden="true").close ×
h3