From 9f4e408242fd7fd99e23105d9532d7810ab7db60 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 2 Feb 2015 17:30:27 +0100 Subject: [PATCH] foundationerize pt1 --- assets/scripts/app/routes/dashboard.coffee | 12 +- assets/scripts/app/templates/layouts/home.hbs | 8 +- assets/scripts/app/templates/top.hbs | 4 +- assets/styles/app/_mixins/all.sass | 3 + assets/styles/app/_mixins/vars.sass | 13 + .../app/foundation/scss/foundation.scss | 46 + .../scss/foundation/_functions.scss | 146 ++ .../foundation/scss/foundation/_settings.scss | 1445 ++++++++++++++++ .../foundation/components/_accordion.scss | 157 ++ .../foundation/components/_alert-boxes.scss | 128 ++ .../foundation/components/_block-grid.scss | 132 ++ .../foundation/components/_breadcrumbs.scss | 132 ++ .../foundation/components/_button-groups.scss | 197 +++ .../scss/foundation/components/_buttons.scss | 259 +++ .../scss/foundation/components/_clearing.scss | 247 +++ .../components/_dropdown-buttons.scss | 130 ++ .../scss/foundation/components/_dropdown.scss | 262 +++ .../foundation/components/_flex-video.scss | 51 + .../scss/foundation/components/_forms.scss | 570 ++++++ .../scss/foundation/components/_global.scss | 480 +++++ .../scss/foundation/components/_grid.scss | 289 ++++ .../scss/foundation/components/_icon-bar.scss | 329 ++++ .../foundation/components/_inline-lists.scss | 57 + .../scss/foundation/components/_joyride.scss | 222 +++ .../foundation/components/_keystrokes.scss | 61 + .../scss/foundation/components/_labels.scss | 106 ++ .../scss/foundation/components/_magellan.scss | 34 + .../foundation/components/_offcanvas.scss | 515 ++++++ .../scss/foundation/components/_orbit.scss | 368 ++++ .../foundation/components/_pagination.scss | 162 ++ .../scss/foundation/components/_panels.scss | 101 ++ .../components/_pricing-tables.scss | 150 ++ .../foundation/components/_progress-bars.scss | 79 + .../foundation/components/_range-slider.scss | 168 ++ .../scss/foundation/components/_reveal.scss | 223 +++ .../scss/foundation/components/_side-nav.scss | 116 ++ .../foundation/components/_split-buttons.scss | 191 ++ .../scss/foundation/components/_sub-nav.scss | 123 ++ .../scss/foundation/components/_switches.scss | 238 +++ .../scss/foundation/components/_tables.scss | 135 ++ .../scss/foundation/components/_tabs.scss | 123 ++ .../scss/foundation/components/_thumbs.scss | 66 + .../scss/foundation/components/_toolbar.scss | 71 + .../scss/foundation/components/_tooltips.scss | 142 ++ .../scss/foundation/components/_top-bar.scss | 689 ++++++++ .../scss/foundation/components/_type.scss | 525 ++++++ .../foundation/components/_visibility.scss | 408 +++++ assets/styles/app/layout.sass | 95 +- assets/styles/app/layouts/dashboard.sass | 523 ++++++ assets/styles/app/left.sass | 6 +- assets/styles/app/left/list.sass | 7 + assets/styles/app/main.sass | 6 +- assets/styles/app/main/repository.sass | 8 +- assets/styles/app/main/summary.sass | 21 +- assets/styles/app/main/tools.sass | 28 +- assets/styles/app/status.sass | 6 + assets/styles/app/tabs.sass | 10 +- assets/styles/app/top.sass | 196 ++- assets/styles/dashboard/dashboard.scss | 744 -------- assets/styles/dashboard/foundation.scss | 1537 ----------------- 60 files changed, 10891 insertions(+), 2409 deletions(-) create mode 100644 assets/styles/app/_mixins/vars.sass create mode 100644 assets/styles/app/foundation/scss/foundation.scss create mode 100644 assets/styles/app/foundation/scss/foundation/_functions.scss create mode 100644 assets/styles/app/foundation/scss/foundation/_settings.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_accordion.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_alert-boxes.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_block-grid.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_breadcrumbs.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_button-groups.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_buttons.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_clearing.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_dropdown-buttons.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_dropdown.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_flex-video.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_forms.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_global.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_grid.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_icon-bar.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_inline-lists.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_joyride.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_keystrokes.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_labels.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_magellan.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_offcanvas.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_orbit.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_pagination.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_panels.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_pricing-tables.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_progress-bars.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_range-slider.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_reveal.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_side-nav.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_split-buttons.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_sub-nav.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_switches.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_tables.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_tabs.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_thumbs.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_toolbar.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_tooltips.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_top-bar.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_type.scss create mode 100644 assets/styles/app/foundation/scss/foundation/components/_visibility.scss create mode 100644 assets/styles/app/layouts/dashboard.sass delete mode 100644 assets/styles/dashboard/dashboard.scss delete mode 100644 assets/styles/dashboard/foundation.scss diff --git a/assets/scripts/app/routes/dashboard.coffee b/assets/scripts/app/routes/dashboard.coffee index 8190e2c9..0c12faa5 100644 --- a/assets/scripts/app/routes/dashboard.coffee +++ b/assets/scripts/app/routes/dashboard.coffee @@ -4,12 +4,12 @@ TravisRoute = Travis.Route Route = TravisRoute.extend needsAuth: true - activate: -> - @get('stylesheetsManager').disable('main') - @get('stylesheetsManager').enable('dashboard') + # activate: -> + # @get('stylesheetsManager').disable('main') + # @get('stylesheetsManager').enable('dashboard') - deactivate: -> - @get('stylesheetsManager').enable('main') - @get('stylesheetsManager').disable('dashboard') + # deactivate: -> + # @get('stylesheetsManager').enable('main') + # @get('stylesheetsManager').disable('dashboard') Travis.DashboardRoute = Route diff --git a/assets/scripts/app/templates/layouts/home.hbs b/assets/scripts/app/templates/layouts/home.hbs index c13f9413..d4e31df8 100644 --- a/assets/scripts/app/templates/layouts/home.hbs +++ b/assets/scripts/app/templates/layouts/home.hbs @@ -2,15 +2,15 @@ {{render "top"}} -
- {{outlet "left"}} -
-
{{render "flash"}} {{yield}}
+
+ {{outlet "left"}} +
+ {{#if config.pro}}