diff --git a/app/styles/account/profile-view.sass b/app/styles/account/profile-view.sass deleted file mode 100644 index a122188f3..000000000 --- a/app/styles/account/profile-view.sass +++ /dev/null @@ -1,344 +0,0 @@ -@import "app/styles/bootstrap/variables" - -#profile-view - $sideBackground: rgb(220, 220, 220) - #login-message - h1, h2, h3, h4 - font-family: Arial, Helvetica, sans-serif - color: #333333 - width: 100% - text-align: center - margin-top: 200px - .profile-control-bar - background-color: $sideBackground - width: 100% - text-align: center - - .profile-completion-progress - width: 100% - height: 33px - margin-bottom: 0 - border-radius: 0 - background-color: darken($sideBackground, 15%) - - .progress-bar - line-height: 33px - font-size: 16px - - .progress-text - position: absolute - width: 100% - text-align: center - line-height: 33px - font-size: 16px - color: white - text-shadow: 0px 1px 0px black - - button, a.btn - margin: 10px 2px 10px 2px - - &:disabled - border-radius: 0 - opacity: 1 - - i - margin-right: 5px - - .sample-profile - position: absolute - right: 5px - - .main-content-area - padding: 0 - background-color: white - - .flat-button - width: 100% - margin-bottom: 10px - background: rgb(78, 78, 78) - border: 0 - border-radius: 0 - padding: 10px - - .public-profile-container - padding: 20px - - img.profile-photo - width: 256px - border-radius: 6px - - .job-profile-container - width: 100% - height: 100% - min-height: 600px - padding: 0 - display: table - - h1, h2, h3, h4, h5, h6 - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif - color: #555 - - ul.links, ul.projects, ul.sessions - margin: 0 - padding: 0 - - li - list-style: none - - .job-profile-row - height: 100% - display: table-row - $side-width: 250px - $side-padding: 5px - $middle-width: 524px - $middle-padding: 20px - - .full-height-column - height: 100% - padding: $side-padding - display: table-cell - vertical-align: top - - h3:first-child - margin: 5px 0 5px 0 - - .left-column - width: $side-width - 2 * $side-padding - padding: $side-padding - background-color: $sideBackground - - .sub-column - width: $side-width - 2 * $side-padding - overflow-wrap: break-word - - #profile-photo-container - position: relative - margin-bottom: 10px - - img.profile-photo - width: $side-width - 2 * $side-padding - border-radius: 6px - - .profile-caption - background-color: rgba(0, 0, 0, 0.5) - color: white - border-bottom-right-radius: 6px - border-bottom-left-radius: 6px - position: absolute - width: 100% - bottom: 0px - text-align: center - - ul.links - text-align: center - li.has-icon - display: inline-block - img - margin: 0 0 10px 0 - li.has-icon:not(:nth-child(5)) - img - margin: 0 5px 10px 5px - - #contact-candidate - margin-top: 20px - background-color: rgb(177, 55, 25) - padding: 15px - font-size: 20px - - .middle-column - width: $middle-width - 2 * $middle-padding - padding-left: $middle-padding - padding-right: $middle-padding - background-color: white - - .sub-column - width: $middle-width - 2 * $middle-padding - overflow-wrap: break-word - - &.double-column - width: $middle-width + $side-width + 2 * $side-padding - 2 * $middle-padding - $middle-padding-double: 30px - padding-left: $middle-padding-double - padding-right: $middle-padding-double - - .sub-column - width: $middle-width + $side-width + 2 * $side-padding - 2 * $middle-padding - 2 * $middle-padding-double - overflow-wrap: break-word - - code - background-color: $sideBackground - color: #555 - margin: 2px 0 - display: inline-block - text-transform: lowercase - - .long-description - margin-top: 10px - img - max-width: 524px - 60px - max-height: 200px - - .experience-header - margin-top: 25px - - .header-icon - margin-right: 10px - width: 32px - height: 32px - - .experience-entry - margin-bottom: 15px - - .duration - margin-left: 10px - margin-bottom: 10px - - #job-profile-notes - width: 100% - height: 100px - - #remark-treema - background-color: white - border: 0 - padding-top: 0 - - .right-column - width: $side-width - background-color: $sideBackground - - .sub-column - width: $side-width - 2 * $side-padding - overflow-wrap: break-word - - > h3:first-child - background-color: white - padding: 5px 5px - margin: 5px 2px 5px 2px - - ul.projects - li - margin-bottom: 10px - padding: 5px 3px - border: 2px solid $sideBackground - transition: .5s ease-in-out - position: relative - background-color: white - - &:hover - border-color: rgb(100, 130, 255) - - a - position: relative - z-index: 2 - - > a - position: absolute - width: 100% - height: 100% - top: 0 - left: 0 - z-index: 1 - - .project-image - width: 230px - height: 115px - background-size: cover - background-repeat: no-repeat - background-position: center - - -webkit-filter: grayscale(100%) - -webkit-transition: .5s ease-in-out - -moz-filter: grayscale(100%) - -moz-transition: .5s ease-in-out - -o-filter: grayscale(100%) - -o-transition: .5s ease-in-out - filter: grayscale(100%) - transition: .5s ease-in-out - - ul.projects li:hover .project-image, .project-image:hover - -webkit-filter: grayscale(0%) - -moz-filter: grayscale(0%) - -o-filter: grayscale(0%) - filter: grayscale(0%) - - .main-content-area - - .job-profile-container - .editable-section - position: relative - transition: box-shadow 0.5s easeInOutQuad - min-height: 30px - - &.just-saved - box-shadow: 0px 0px 20px 0px #080 - z-index: 1 - - .editable-form - display: none - background-color: white - padding: 5px 5px 5px 5px - - .skill-array-item - display: inline-block - - input - width: 120px - margin: 5px - - .project-image - width: 210px - height: 105px - cursor: pointer - - .editable-icon - display: none - - .job-profile-container.editable-profile - - .full-height-column.deemphasized - background-color: $sideBackground - - .saving - opacity: 0.75 - - .editable-thinner - padding-right: 30px - - .editable-icon - display: block - position: absolute - right: 5px - top: 5px - font-size: 20px - color: $blue - opacity: 0.5 - - .edit-label - color: $blue - font-weight: 300 - - .edit-example-button - background-color: transparentize($blue, 0.25) - - .edit-example-text - color: $blue - - code.edit-example-tag - color: $blue - - .emphasized - outline: 1px solid $green - - .editable-section.deemphasized:not(.just-saved), .our-notes-section.deemphasized - opacity: 0.5 - - .editable-section:hover - cursor: pointer - outline: 1px solid $blue - - .editable-icon - opacity: 1.0 - cursor: pointer - - .editable-form - cursor: default diff --git a/app/styles/admin/candidates.sass b/app/styles/admin/candidates.sass deleted file mode 100644 index 1a34e9f12..000000000 --- a/app/styles/admin/candidates.sass +++ /dev/null @@ -1,74 +0,0 @@ -#admin-candidates-view - - h1, h2, h3 - font: Arial - - .see-candidates-header - margin: 30px - text-align: center - - #see-candidates - cursor: pointer - - .employer_icon - width: 125px - float: left - margin: 0px 15px 15px 0px - - .information_row - height: 150px - padding-right: 15px - - #leftside - width: 500px - float: left - - #rightside - width: 500px - float: left - - .tablesorter - //img - // display: none - - .tablesorter-header - cursor: pointer - &:hover - color: black - - &:first-child - // Make sure that "Developer #56" doesn't wrap onto second row - min-width: 110px - - .tablesorter-headerAsc - background-color: #cfc - - .tablesorter-headerDesc - background-color: #ccf - - tr - cursor: pointer - - tr.expired - opacity: 0.5 - - code - background-color: rgb(220, 220, 220) - color: #555 - margin: 2px 0 - display: inline-block - text-transform: lowercase - - td:nth-child(3) select - min-width: 100px - td:nth-child(6) select - min-width: 50px - td:nth-child(7) select - min-width: 100px - -#employers-view, #profile-view.viewed-by-employer - #outer-content-wrapper, #intermediate-content-wrapper, #inner-content-wrapper - background: #949494 - - .main-content-area - background-color: #EAEAEA \ No newline at end of file diff --git a/app/styles/play/ladder_home.sass b/app/styles/play/ladder_home.sass index 38eb07af8..451494ac5 100644 --- a/app/styles/play/ladder_home.sass +++ b/app/styles/play/ladder_home.sass @@ -1,7 +1,7 @@ @import "app/styles/mixins" @import "app/styles/bootstrap/variables" -#ladder-home-view +#main-ladder-view .level width: 100% position: relative diff --git a/app/styles/recruitment_base.sass b/app/styles/recruitment_base.sass deleted file mode 100644 index 6501c7303..000000000 --- a/app/styles/recruitment_base.sass +++ /dev/null @@ -1,52 +0,0 @@ -@import "app/styles/mixins" -@import "app/styles/bootstrap/variables" - -#employers-wrapper - background-color: #B4B4B4 - height: 100% - #outer-content-wrapper, #intermediate-content-wrapper, #inner-content-wrapper - background: #B4B4B4 - - .navbar, #top-nav, .content.clearfix - background-color: #B4B4B4 - - .footer - border-top: none - background-color: #B4B4B4 - padding-bottom: 50px - - -#employer-content-area - margin: auto - -.employer-modal-background-wrapper - background-color: white - border: 2px #333333 solid - border-radius: 4px - h1, h2, h3, h4, h5 - color: black - font-family: Arial, Helvetica, sans-serif - .input-large - font-size: 28px - height: 60px - border: 2px rgb(231,231,231) solid - box-shadow: none - width: 70% - margin-left: 15% - #create-account-button, #contract-agreement-button, #login-button - background: #fce232 /* Old browsers */ - background: -moz-linear-gradient(top, #fce232 0%, #ea8e2b 100%) - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fce232), color-stop(100%,#ea8e2b)) - background: -webkit-linear-gradient(top, #fce232 0%,#ea8e2b 100%) - background: -o-linear-gradient(top, #fce232 0%,#ea8e2b 100%) - background: -ms-linear-gradient(top, #fce232 0%,#ea8e2b 100%) - background: linear-gradient(to bottom, #fce232 0%,#ea8e2b 100%) - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fce232', endColorstr='#ea8e2b',GradientType=0 ) - height: 60px - font-size: 24px - color: black - .login-link - text-decoration: underline - #login-button - margin-left: 40% - width: 20% diff --git a/app/templates/recruitment_base.jade b/app/templates/recruitment_base.jade deleted file mode 100644 index b04d4848d..000000000 --- a/app/templates/recruitment_base.jade +++ /dev/null @@ -1,21 +0,0 @@ -body - #fb-root - #employers-wrapper - block header - .nav - .content.clearfix - .navbar-header - a.navbar-brand(href='/') - img(src="/images/pages/base/recruitment_logo.png", title="CodeCombat - Learn how to code by playing a game", alt="CodeCombat") - block outer_content - #outer-content-wrapper - - #intermediate-content-wrapper - - #inner-content-wrapper - .main-content-area#employer-content-area - block content - p If this is showing, you dun goofed - - block footer - .footer \ No newline at end of file diff --git a/app/views/admin/PendingPatchesView.coffee b/app/views/admin/PendingPatchesView.coffee index f6234db00..1f578f3cb 100644 --- a/app/views/admin/PendingPatchesView.coffee +++ b/app/views/admin/PendingPatchesView.coffee @@ -7,7 +7,7 @@ class PendingPatchesCollection extends CocoCollection url: '/db/patch?view=pending' model: Patch -module.exports = class PatchesView extends RootView +module.exports = class PendingPatchesView extends RootView id: 'pending-patches-view' template: template diff --git a/app/views/courses/ClassroomSettingsModal.coffee b/app/views/courses/ClassroomSettingsModal.coffee index dbad58b90..824973ff8 100644 --- a/app/views/courses/ClassroomSettingsModal.coffee +++ b/app/views/courses/ClassroomSettingsModal.coffee @@ -2,7 +2,7 @@ Classroom = require 'models/Classroom' ModalView = require 'views/core/ModalView' template = require 'templates/courses/classroom-settings-modal' -module.exports = class AddLevelSystemModal extends ModalView +module.exports = class ClassroomSettingsModal extends ModalView id: 'classroom-settings-modal' template: template diff --git a/app/views/courses/StudentLogInModal.coffee b/app/views/courses/StudentLogInModal.coffee index ffebbab8e..91c2d86fc 100644 --- a/app/views/courses/StudentLogInModal.coffee +++ b/app/views/courses/StudentLogInModal.coffee @@ -4,7 +4,7 @@ auth = require 'core/auth' forms = require 'core/forms' User = require 'models/User' -module.exports = class StudentSignInModal extends ModalView +module.exports = class StudentLogInModal extends ModalView id: 'student-log-in-modal' template: template diff --git a/app/views/i18n/I18NEditThangTypeView.coffee b/app/views/i18n/I18NEditThangTypeView.coffee index 52c058e9b..00f67aeee 100644 --- a/app/views/i18n/I18NEditThangTypeView.coffee +++ b/app/views/i18n/I18NEditThangTypeView.coffee @@ -1,8 +1,8 @@ I18NEditModelView = require './I18NEditModelView' ThangType = require 'models/ThangType' -module.exports = class ThangTypeI18NView extends I18NEditModelView - id: 'thang-type-i18n-view' +module.exports = class I18NEditThangTypeView extends I18NEditModelView + id: 'i18n-thang-type-view' modelClass: ThangType buildTranslationList: -> diff --git a/app/views/ladder/MainLadderView.coffee b/app/views/ladder/MainLadderView.coffee index 66cc9c373..ebd2eca0c 100644 --- a/app/views/ladder/MainLadderView.coffee +++ b/app/views/ladder/MainLadderView.coffee @@ -11,8 +11,8 @@ class LevelSessionsCollection extends CocoCollection super() @url = "/db/user/#{me.id}/level.sessions?project=state.complete,levelID" -module.exports = class LadderHomeView extends RootView - id: 'ladder-home-view' +module.exports = class MainLadderView extends RootView + id: 'main-ladder-view' template: template constructor: (options) -> diff --git a/app/views/modal/SignupModal.coffee b/app/views/modal/SignupModal.coffee deleted file mode 100644 index d8311dce5..000000000 --- a/app/views/modal/SignupModal.coffee +++ /dev/null @@ -1,4 +0,0 @@ -AuthModal = require 'views/core/AuthModal' - -module.exports = class SignupModalView extends AuthModal - mode: 'signup' diff --git a/app/views/play/modal/ShareProgressModal.coffee b/app/views/play/modal/ShareProgressModal.coffee index 4b3c34943..4ea07b376 100644 --- a/app/views/play/modal/ShareProgressModal.coffee +++ b/app/views/play/modal/ShareProgressModal.coffee @@ -2,7 +2,7 @@ ModalView = require 'views/core/ModalView' template = require 'templates/play/modal/share-progress-modal' storage = require 'core/storage' -module.exports = class SubscribeModal extends ModalView +module.exports = class ShareProgressModal extends ModalView id: 'share-progress-modal' template: template plain: true