From d08c86d68ceb22665b735054fc3bc316f85f84c1 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 31 Jan 2015 08:51:55 -0500 Subject: billing link in footer --- views/partials/footer.ejs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'views/partials/footer.ejs') diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index e3c572f..8a95fc4 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -15,6 +15,12 @@ About How To + + [[ if (logged_in && user.plan_level > 0) { ]] + Billing + [[ } else { ]] + Subscribe + [[ } ]] Terms Privacy Contact -- cgit v1.2.3-70-g09d2 From e9aaaba09e7872fd6fd164f02ea6cc28251962b8 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 24 Mar 2015 13:25:04 -0400 Subject: copyright year --- views/partials/footer.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'views/partials/footer.ejs') diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 8a95fc4..52430f7 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -25,7 +25,7 @@ Privacy Contact

- ©2014 Dot Dash 3, Inc. + © 2015 Dot Dash 3, Inc. Site by OKFocus -- cgit v1.2.3-70-g09d2 From b4ee999a47ae89c27b5cf4a86d81ded33c6c8f81 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 13 Jul 2015 17:55:25 -0400 Subject: sub rip --- public/assets/stylesheets/app.css | 149 +++++++++++++++++++++++++------------- views/about/brochure.ejs | 95 +++++++++++++++++++++++- views/partials/footer.ejs | 2 +- views/staff/_pagination.ejs | 2 +- 4 files changed, 190 insertions(+), 58 deletions(-) (limited to 'views/partials/footer.ejs') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index f4182d1..4bfa363 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -922,75 +922,120 @@ iframe.embed { width: 76vw; margin: 2vw 10vw; } -.planbox { - padding: 2vw; - border: 1px solid #ddd; - background: white; - border-radius: 25px; - font-size: 15px; - line-height: 23px; - text-align: center; -} -.planbox h3 { + +ul#plans { + margin: 0 auto; text-align: center; - margin-bottom: 10px; -} -.about_plan ul { - margin-bottom: 60px; + font-size: 14px; } -.planbox li { - list-style-type: none; - margin-bottom: 0; - font-size: 1.3vw; - padding: 0 1vw; + +ul#plans>li { + display: inline-block; + width: 300px; + vertical-align: top; + margin: 0 25px 25px 0; + position: relative; } -.paidPlan .planbox li { - padding: 0 5.6vw; + +ul#plans>li.most-popular:before { + content: 'Most Popular'; + display: block; + background: #F17E6F; + color: white; + font-size: 1em; + font-weight: 500; + letter-spacing: 1px; + text-transform: uppercase; + width: 100%; + position: absolute; + top: -31px; } -.about_custom.planbox li { - padding: 10px; - font-size: 17px; + +ul#plans .top { + background: #3A3A3A; + color: white; + padding: 30px 0; + height: 266px; } -.planbox.miscbox { - border: 0; - background: #f8f8f8; + +ul#plans h2 { + padding: 0; + font-size: 1.25em; + margin-bottom: 1.75em; + text-transform: uppercase; + letter-spacing: 3px; + font-weight: 500; } -.about_custom a { - border-bottom: 1px solid; + +ul#plans h3 { + margin: 0 0 20px; + font-weight: 200; } -/* Billing / Subscription Settings */ -.planList { - position: absolute; - left: 50%; - transform: translateX(-48%); +ul#plans h3 span.dollar { + font-size: 1.25em; + vertical-align: top; + position: relative; + top: -14px; } -.planList .about_custom { - width: 56vw; - margin: 1vw 4vw; + +ul#plans h3 span.price { + font-size: 5em; + font-weight: 100; } -.planList .planbox { - padding: 0; + +ul#plans h4 { + font-size: 0.85em; + color: #e6e6e6; + margin: 0 auto; + width: 50%; + font-weight: 500; + line-height: 30px; } -.planList .custombox { - margin: 2vw 4vw 4vw 4vw; + +ul#plans ul { + border-left: 1px solid #e5e5e5; + border-right: 1px solid #e5e5e5; } -.planList .miscbox { - line-height: 2.7vw; + +ul#plans ul li { + text-align: left; + border-bottom: 1px solid #e5e5e5; + padding: 5px 20px; + font-weight: 700; + list-style: none; + background: white; + color:#333; } -.mediaDrawer .planList h3 { - margin-top: 3px; - font-size: 21px; - font-weight: bold + +ul#plans .signup { + background: #3A3A3A; + padding: 25px 0; } -.freePlan { - text-align: left; + +.signup .button { + font-weight: bold; + padding: 16px 30px 14px; + -o-transition: background 0.2s ease-in-out; + -webkit-transition: background 0.2s ease-in-out; + transition: background 0.2s ease-in-out; + display: inline-block; + background: #F17E6F; + color: white; + text-decoration: none; + font-size: 1em; + padding: 4px 30px 3px; + border: none; + cursor: pointer; } -.planList .planbox li:first-child { - font-size: 1.9vw; - padding: 0; + + +.signup .button:hover { + color: white; + background: #ef6958; } + /* debug sync button */ .editSubscription .gear { position: absolute; diff --git a/views/about/brochure.ejs b/views/about/brochure.ejs index 855f897..80cb154 100644 --- a/views/about/brochure.ejs +++ b/views/about/brochure.ejs @@ -11,11 +11,98 @@

Subscriptions

-
- Want to get more out of VValls? Consider becoming a subscription user. -

-
+ +
    + +
  • +
    +

    Medium

    +

    $10 / mo

    +

    Great for personal sites and small blogs.

    +
    +
      +
    • + 5 Source Accounts / Hashtags +
    • +
    • + 1 Embeddable Feed +
    • +
    • + Pulls In New Posts Every Hour +
    • +
    • + Moderation and Filtering Tools +
    • +
    • + Everything the Small Plan Contains +
    • +
    • + No Juicer Branding! +
    • +
    + +
  • +
  • +
    +

    Small

    +

    $0 / mo

    +

    Free forever.

    +
    +
      +
    • + 2 Source Accounts / Hashtags +
    • +
    • + 1 Embeddable Social Media Feed +
    • +
    • + Pulls In New Posts Every 24 Hours +
    • +
    • + All Templates and Custom Styling +
    • +
    • + HTTPS Secure Connection Support +
    • +
    • + Juicer Branding +
    • +
    + +
  • +
+ + + + [[ include _plans ]]
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 52430f7..05bc128 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -2,7 +2,7 @@ [[ if (logged_in) { ]] - signed in as → + signed in as [[- user.displayName ]] [[ if (user.isStaff) { ]] Staff Area diff --git a/views/staff/_pagination.ejs b/views/staff/_pagination.ejs index 6c3bfb1..7d85c71 100644 --- a/views/staff/_pagination.ejs +++ b/views/staff/_pagination.ejs @@ -10,7 +10,7 @@ [[ if (pagination.next_page !== -1) { ]] Next page → [[ } else { ]] - → + -> [[ } ]] -- cgit v1.2.3-70-g09d2 From d4a98f11e4557f21385a91266aeb198106edb62e Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 13 Jun 2016 13:18:02 -0400 Subject: gruntfile --- Gruntfile.js | 308 +++++++++++++++++++++++++--------------------- views/partials/footer.ejs | 2 +- 2 files changed, 171 insertions(+), 139 deletions(-) (limited to 'views/partials/footer.ejs') diff --git a/Gruntfile.js b/Gruntfile.js index 233c7ff..988d040 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,143 +8,175 @@ module.exports = function(grunt) { }, js: { src: [ - "public/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js", - "public/assets/javascripts/vendor/bower_components/lodash/lodash.min.js", - "public/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js", - "public/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js", - "public/assets/javascripts/vendor/bower_components/marked/lib/marked.js", - "public/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js", - "public/assets/javascripts/vendor/tube.js", - "public/assets/javascripts/vendor/loader.js", - "public/assets/javascripts/vendor/polyfill.js", - "public/assets/javascripts/vendor/sha1.js", - "public/assets/javascripts/vendor/dataUriToBlob.js", - "public/assets/javascripts/vendor/froogaloop.js", - "public/assets/javascripts/util.js", - - "public/assets/javascripts/mx/mx.js", - "public/assets/javascripts/mx/extensions/mx.scene.js", - "public/assets/javascripts/mx/extensions/mx.movements.js", - "public/assets/javascripts/mx/extensions/mx.movementsMobile.js", - "public/assets/javascripts/mx/primitives/mx.image.js", - "public/assets/javascripts/mx/primitives/mx.text.js", - "public/assets/javascripts/mx/primitives/mx.video.js", - "public/assets/javascripts/mx/primitives/mx.youtube.js", - "public/assets/javascripts/mx/primitives/mx.vimeo.js", - "public/assets/javascripts/mx/primitives/mx.soundcloud.js", - "public/assets/javascripts/mx/primitives/mx.grid.js", - - "public/assets/javascripts/rectangles/_env.js", - - "public/assets/javascripts/rectangles/util/constants.js", - "public/assets/javascripts/rectangles/util/colors.js", - "public/assets/javascripts/rectangles/util/coords.js", - "public/assets/javascripts/rectangles/util/debug.js", - "public/assets/javascripts/rectangles/util/keys.js", - "public/assets/javascripts/rectangles/util/measurement.js", - "public/assets/javascripts/rectangles/util/minotaur.js", - "public/assets/javascripts/rectangles/util/mouse.js", - "public/assets/javascripts/rectangles/util/permissions.js", - "public/assets/javascripts/rectangles/util/sort.js", - "public/assets/javascripts/rectangles/util/uid.js", - "public/assets/javascripts/rectangles/util/undostack.js", - "public/assets/javascripts/rectangles/util/wheel.js", - - "public/assets/javascripts/rectangles/models/vec2.js", - "public/assets/javascripts/rectangles/models/vec3.js", - "public/assets/javascripts/rectangles/models/rect.js", - "public/assets/javascripts/rectangles/models/surface.js", - "public/assets/javascripts/rectangles/models/tree.js", - "public/assets/javascripts/rectangles/models/room.js", - "public/assets/javascripts/rectangles/models/wall.js", - "public/assets/javascripts/rectangles/models/floor.js", - - "public/assets/javascripts/rectangles/engine/rooms/_rooms.js", - "public/assets/javascripts/rectangles/engine/rooms/_walls.js", - "public/assets/javascripts/rectangles/engine/rooms/builder.js", - "public/assets/javascripts/rectangles/engine/rooms/clipper.js", - "public/assets/javascripts/rectangles/engine/rooms/grouper.js", - "public/assets/javascripts/rectangles/engine/rooms/mover.js", - - "public/assets/javascripts/rectangles/engine/scenery/_scenery.js", - "public/assets/javascripts/rectangles/engine/scenery/move.js", - "public/assets/javascripts/rectangles/engine/scenery/resize.js", - "public/assets/javascripts/rectangles/engine/scenery/randomize.js", - "public/assets/javascripts/rectangles/engine/scenery/sound.js", - "public/assets/javascripts/rectangles/engine/scenery/undo.js", - "public/assets/javascripts/rectangles/engine/scenery/types/_object.js", - "public/assets/javascripts/rectangles/engine/scenery/types/image.js", - "public/assets/javascripts/rectangles/engine/scenery/types/text.js", - "public/assets/javascripts/rectangles/engine/scenery/types/video.js", - "public/assets/javascripts/rectangles/engine/scenery/types/audio.js", - - "public/assets/javascripts/rectangles/engine/sculpture/_sculpture.js", - "public/assets/javascripts/rectangles/engine/sculpture/move.js", - "public/assets/javascripts/rectangles/engine/sculpture/resize.js", - "public/assets/javascripts/rectangles/engine/sculpture/types/_object.js", - "public/assets/javascripts/rectangles/engine/sculpture/types/image.js", - - "public/assets/javascripts/rectangles/engine/map/_map.js", - "public/assets/javascripts/rectangles/engine/map/ui/editor.js", - "public/assets/javascripts/rectangles/engine/map/ui/minimap.js", - "public/assets/javascripts/rectangles/engine/map/draw.js", - - "public/assets/javascripts/ui/lib/View.js", - "public/assets/javascripts/ui/lib/Router.js", - "public/assets/javascripts/ui/lib/ModalView.js", - "public/assets/javascripts/ui/lib/FormView.js", - "public/assets/javascripts/ui/lib/UploadView.js", - "public/assets/javascripts/ui/lib/AlertModal.js", - "public/assets/javascripts/ui/lib/ConfirmModal.js", - "public/assets/javascripts/ui/lib/ErrorModal.js", - "public/assets/javascripts/ui/lib/Parser.js", - "public/assets/javascripts/ui/lib/LabColorPicker.js", - - "public/assets/javascripts/ui/site/SignInModal.js", - "public/assets/javascripts/ui/site/SignUpModal.js", - "public/assets/javascripts/ui/site/UsernameTaken.js", - "public/assets/javascripts/ui/site/PasswordForgot.js", - "public/assets/javascripts/ui/site/PasswordReset.js", - "public/assets/javascripts/ui/site/LayoutsModal.js", - "public/assets/javascripts/ui/site/EditProjectModal.js", - "public/assets/javascripts/ui/site/EditProfileModal.js", - "public/assets/javascripts/ui/site/EditSubscriptionModal.js", - "public/assets/javascripts/ui/site/DocumentModal.js", - - "public/assets/javascripts/ui/site/HomeView.js", - "public/assets/javascripts/ui/site/ProfileView.js", - "public/assets/javascripts/ui/site/ProjectList.js", - - "public/assets/javascripts/ui/builder/BuilderView.js", - "public/assets/javascripts/ui/builder/BuilderSettings.js", - "public/assets/javascripts/ui/builder/BuilderToolbar.js", - "public/assets/javascripts/ui/builder/BuilderInfo.js", - - "public/assets/javascripts/ui/editor/EditorView.js", - "public/assets/javascripts/ui/editor/EditorSettings.js", - "public/assets/javascripts/ui/editor/EditorToolbar.js", - "public/assets/javascripts/ui/editor/HelpCursor.js", - "public/assets/javascripts/ui/editor/ColorControl.js", - "public/assets/javascripts/ui/editor/Collaborators.js", - "public/assets/javascripts/ui/editor/MediaEditor.js", - "public/assets/javascripts/ui/editor/MediaTumblr.js", - "public/assets/javascripts/ui/editor/MediaUpload.js", - "public/assets/javascripts/ui/editor/MediaViewer.js", - "public/assets/javascripts/ui/editor/Presets.js", - "public/assets/javascripts/ui/editor/SculptureEditor.js", - "public/assets/javascripts/ui/editor/TextEditor.js", - "public/assets/javascripts/ui/editor/WallpaperPicker.js", - - "public/assets/javascripts/ui/reader/ReaderView.js", - "public/assets/javascripts/ui/reader/ShareView.js", - "public/assets/javascripts/ui/reader/EmbedView.js", - "public/assets/javascripts/ui/reader/MediaPlayer.js", - "public/assets/javascripts/ui/reader/Tracker.js", - - "public/assets/javascripts/ui/_router.js", - - "public/assets/javascripts/app.js", - "public/assets/javascripts/defaults.js", + "/assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js" + "/assets/javascripts/vendor/bower_components/lodash/lodash.min.js", + "/assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js", + "/assets/javascripts/vendor/bower_components/fiber/src/fiber.min.js", + "/assets/javascripts/vendor/bower_components/hidpi-canvas/dist/hidpi-canvas.js", + "/assets/javascripts/vendor/bower_components/marked/lib/marked.js", + "/assets/javascripts/vendor/tube.js", + "/assets/javascripts/vendor/loader.js", + "/assets/javascripts/vendor/polyfill.js", + "/assets/javascripts/vendor/sha1.js", + "/assets/javascripts/vendor/dataUriToBlob.js", + "/assets/javascripts/vendor/froogaloop.js", + "/assets/javascripts/util.js", + + "/assets/javascripts/mx/mx.js", + + "/assets/javascripts/mx/extensions/mx.scene.js", + "/assets/javascripts/mx/extensions/mx.movements.js", + "/assets/javascripts/mx/extensions/mx.movementsMobile.js", + "/assets/javascripts/mx/extensions/mx.orbitCamera.js", + + "/assets/javascripts/mx/primitives/mx.image.js", + "/assets/javascripts/mx/primitives/mx.text.js", + "/assets/javascripts/mx/primitives/mx.video.js", + "/assets/javascripts/mx/primitives/mx.youtube.js", + "/assets/javascripts/mx/primitives/mx.vimeo.js", + "/assets/javascripts/mx/primitives/mx.soundcloud.js", + "/assets/javascripts/mx/primitives/mx.grid.js", + "/assets/javascripts/mx/primitives/mx.point.js", + "/assets/javascripts/mx/primitives/mx.polyline.js", + + "/assets/javascripts/rectangles/_env.js", + + "/assets/javascripts/rectangles/util/constants.js", + "/assets/javascripts/rectangles/util/colors.js", + "/assets/javascripts/rectangles/util/coords.js", + "/assets/javascripts/rectangles/util/debug.js", + "/assets/javascripts/rectangles/util/keys.js", + "/assets/javascripts/rectangles/util/measurement.js", + "/assets/javascripts/rectangles/util/minotaur.js", + "/assets/javascripts/rectangles/util/mouse.js", + "/assets/javascripts/rectangles/util/permissions.js", + "/assets/javascripts/rectangles/util/sort.js", + "/assets/javascripts/rectangles/util/uid.js", + "/assets/javascripts/rectangles/util/undostack.js", + "/assets/javascripts/rectangles/util/wheel.js", + + "/assets/javascripts/rectangles/models/vec2.js", + "/assets/javascripts/rectangles/models/vec3.js", + "/assets/javascripts/rectangles/models/rect.js", + "/assets/javascripts/rectangles/models/surface.js", + "/assets/javascripts/rectangles/models/tree.js", + "/assets/javascripts/rectangles/models/room.js", + "/assets/javascripts/rectangles/models/wall.js", + "/assets/javascripts/rectangles/models/floor.js", + + "/assets/javascripts/rectangles/engine/rooms/_rooms.js", + "/assets/javascripts/rectangles/engine/rooms/_walls.js", + "/assets/javascripts/rectangles/engine/rooms/builder.js", + "/assets/javascripts/rectangles/engine/rooms/clipper.js", + "/assets/javascripts/rectangles/engine/rooms/grouper.js", + "/assets/javascripts/rectangles/engine/rooms/mover.js", + + "/assets/javascripts/rectangles/engine/scenery/_scenery.js", + "/assets/javascripts/rectangles/engine/scenery/move.js", + "/assets/javascripts/rectangles/engine/scenery/resize.js", + "/assets/javascripts/rectangles/engine/scenery/randomize.js", + "/assets/javascripts/rectangles/engine/scenery/sound.js", + "/assets/javascripts/rectangles/engine/scenery/undo.js", + "/assets/javascripts/rectangles/engine/scenery/types/_object.js", + "/assets/javascripts/rectangles/engine/scenery/types/audio.js", + "/assets/javascripts/rectangles/engine/scenery/types/image.js", + "/assets/javascripts/rectangles/engine/scenery/types/text.js", + "/assets/javascripts/rectangles/engine/scenery/types/video.js", + + "/assets/javascripts/rectangles/engine/sculpture/_sculpture.js", + "/assets/javascripts/rectangles/engine/sculpture/move.js", + "/assets/javascripts/rectangles/engine/sculpture/resize.js", + "/assets/javascripts/rectangles/engine/sculpture/types/_object.js", + "/assets/javascripts/rectangles/engine/sculpture/types/image.js", + + "/assets/javascripts/rectangles/engine/shapes/polyline.js", + "/assets/javascripts/rectangles/engine/shapes/ortho.js", + "/assets/javascripts/rectangles/engine/shapes/shapelist.js", + "/assets/javascripts/rectangles/engine/shapes/regionlist.js", + + "/assets/javascripts/rectangles/engine/map/_map.js", + "/assets/javascripts/rectangles/engine/map/draw.js", + "/assets/javascripts/rectangles/engine/map/ui/editor.js", + "/assets/javascripts/rectangles/engine/map/ui/minimap.js", + "/assets/javascripts/rectangles/engine/map/ui/ortho.js", + "/assets/javascripts/rectangles/engine/map/tools/_base.js", + "/assets/javascripts/rectangles/engine/map/tools/arrow.js", + "/assets/javascripts/rectangles/engine/map/tools/line.js", + "/assets/javascripts/rectangles/engine/map/tools/eraser.js", + "/assets/javascripts/rectangles/engine/map/tools/ortho.js", + "/assets/javascripts/rectangles/engine/map/tools/polyline.js", + "/assets/javascripts/rectangles/engine/map/tools/position.js", + "/assets/javascripts/rectangles/engine/map/tools/start.js", + + "/assets/javascripts/ui/lib/View.js", + "/assets/javascripts/ui/lib/Router.js", + "/assets/javascripts/ui/lib/ModalView.js", + "/assets/javascripts/ui/lib/FormView.js", + "/assets/javascripts/ui/lib/UploadView.js", + "/assets/javascripts/ui/lib/AnimatedView.js", + "/assets/javascripts/ui/lib/ToggleableView.js", + "/assets/javascripts/ui/lib/AlertModal.js", + "/assets/javascripts/ui/lib/ConfirmModal.js", + "/assets/javascripts/ui/lib/ErrorModal.js", + "/assets/javascripts/ui/lib/Parser.js", + "/assets/javascripts/ui/lib/LabColorPicker.js", + + "/assets/javascripts/ui/site/SignInModal.js", + "/assets/javascripts/ui/site/SignUpModal.js", + "/assets/javascripts/ui/site/UsernameTaken.js", + "/assets/javascripts/ui/site/PasswordForgot.js", + "/assets/javascripts/ui/site/PasswordReset.js", + "/assets/javascripts/ui/site/LayoutsIndex.js", + "/assets/javascripts/ui/site/LayoutsModal.js", + "/assets/javascripts/ui/site/NewProjectModal.js", + "/assets/javascripts/ui/site/EditProjectModal.js", + "/assets/javascripts/ui/site/EditProfileModal.js", + "/assets/javascripts/ui/site/EditSubscriptionModal.js", + "/assets/javascripts/ui/site/DocumentModal.js", + + "/assets/javascripts/ui/site/HomeView.js", + "/assets/javascripts/ui/site/ProfileView.js", + "/assets/javascripts/ui/site/ProjectList.js", + + "/assets/javascripts/ui/builder/BuilderView.js", + "/assets/javascripts/ui/builder/BuilderSettings.js", + "/assets/javascripts/ui/builder/BuilderToolbar.js", + "/assets/javascripts/ui/builder/BuilderInfo.js", + + "/assets/javascripts/ui/blueprint/BlueprintView.js", + "/assets/javascripts/ui/blueprint/BlueprintInfo.js", + "/assets/javascripts/ui/blueprint/BlueprintSettings.js", + "/assets/javascripts/ui/blueprint/BlueprintEditor.js", + "/assets/javascripts/ui/blueprint/BlueprintScaler.js", + "/assets/javascripts/ui/blueprint/BlueprintToolbar.js", + "/assets/javascripts/ui/blueprint/BlueprintUploader.js", + "/assets/javascripts/ui/blueprint/BlueprintNotice.js", + + "/assets/javascripts/ui/editor/EditorView.js", + "/assets/javascripts/ui/editor/EditorSettings.js", + "/assets/javascripts/ui/editor/EditorToolbar.js", + "/assets/javascripts/ui/editor/HelpCursor.js", + "/assets/javascripts/ui/editor/ColorControl.js", + "/assets/javascripts/ui/editor/Collaborators.js", + "/assets/javascripts/ui/editor/MediaEditor.js", + "/assets/javascripts/ui/editor/MediaTumblr.js", + "/assets/javascripts/ui/editor/MediaUpload.js", + "/assets/javascripts/ui/editor/MediaViewer.js", + "/assets/javascripts/ui/editor/Presets.js", + "/assets/javascripts/ui/editor/SculptureEditor.js", + "/assets/javascripts/ui/editor/TextEditor.js", + "/assets/javascripts/ui/editor/WallpaperPicker.js", + + "/assets/javascripts/ui/reader/ReaderView.js", + "/assets/javascripts/ui/reader/ShareView.js", + "/assets/javascripts/ui/reader/EmbedView.js", + "/assets/javascripts/ui/reader/MediaPlayer.js", + "/assets/javascripts/ui/reader/Tracker.js", + + "/assets/javascripts/ui/_router.js", + + "/assets/javascripts/app.js", + "/assets/javascripts/defaults.js", ], dest: 'public/assets/javascripts/app.concat.js', }, @@ -272,7 +304,7 @@ module.exports = function(grunt) { }, uglify: { options: { - banner: '/* vvalls by okfocus 2015 */\n' + banner: '/* vvalls by okfocus 2016 */\n' }, js: { src: 'public/assets/javascripts/app.concat.js', diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs index 05bc128..2d9fb59 100644 --- a/views/partials/footer.ejs +++ b/views/partials/footer.ejs @@ -25,7 +25,7 @@ Privacy Contact

- © 2015 Dot Dash 3, Inc. + © 2016 Dot Dash 3, Inc. Site by OKFocus -- cgit v1.2.3-70-g09d2