diff --git a/Gemfile b/Gemfile index 45a78d9dc9..af4108c9eb 100644 --- a/Gemfile +++ b/Gemfile @@ -69,7 +69,6 @@ group :test, :development do gem 'shoulda-matchers' gem 'factory_girl_rails', :require => false gem 'capybara' - gem 'capybara-screenshot' gem 'database_cleaner', '0.7.1', :require => false gem 'simplecov', :require => false gem 'awesome_print' diff --git a/Gemfile.lock b/Gemfile.lock index 1b031569f7..95400280db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,9 +167,6 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara-screenshot (0.3.19) - capybara (>= 1.0, < 3) - launchy celluloid (0.15.2) timers (~> 1.1.0) chunky_png (1.3.0) @@ -492,7 +489,6 @@ DEPENDENCIES aws-sdk bugsnag capybara - capybara-screenshot coffee-rails (~> 3.2.1) comfortable_mexican_sofa compass-rails diff --git a/app/assets/images/producers/producers-pg-bg.jpg b/app/assets/images/producers/producers-pg-bg.jpg index 916f474084..1ba62737de 100644 Binary files a/app/assets/images/producers/producers-pg-bg.jpg and b/app/assets/images/producers/producers-pg-bg.jpg differ diff --git a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee index ea2503efbe..b944607886 100644 --- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee @@ -14,7 +14,3 @@ Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, $location, $anchorS $scope.changeHub = -> if confirm "Are you sure? This will change your selected Hub and remove any items in you shopping cart." Navigation.go $scope.hub.path - - if $scope.open() - $anchorScroll() - diff --git a/app/assets/javascripts/darkswarm/controllers/sidebar/account_sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/sidebar/account_sidebar_controller.js.coffee deleted file mode 100644 index 4a31ce5697..0000000000 --- a/app/assets/javascripts/darkswarm/controllers/sidebar/account_sidebar_controller.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -Darkswarm.controller "AccountSidebarCtrl", ($scope, $http, $location, SpreeUser, Navigation) -> - $scope.path = "/account" - Navigation.paths.push $scope.path - - $scope.active = -> - $location.path() == $scope.path - - $scope.select = -> - Navigation.navigate($scope.path) - - $scope.emptyCart = (href, ev)-> - if $(ev.delegateTarget).hasClass "empties-cart" - location.href = href if confirm "Changing your Hub will clear your cart." - else - location.href = href diff --git a/app/assets/javascripts/darkswarm/controllers/sidebar/sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/sidebar/sidebar_controller.js.coffee deleted file mode 100644 index da18067f36..0000000000 --- a/app/assets/javascripts/darkswarm/controllers/sidebar/sidebar_controller.js.coffee +++ /dev/null @@ -1,2 +0,0 @@ -Darkswarm.controller "SidebarCtrl", ($scope, $location, Sidebar) -> - $scope.Sidebar = Sidebar diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee index 9abbfb01a5..34861f2e06 100644 --- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee +++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee @@ -13,3 +13,7 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource", # This allows us to trigger these two events on tooltips $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' ) + +Darkswarm.run ($rootScope, $location, $anchorScroll) -> + $rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) -> + $anchorScroll() diff --git a/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee b/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee new file mode 100644 index 0000000000..3925480228 --- /dev/null +++ b/app/assets/javascripts/darkswarm/directives/scrollto.js.coffee @@ -0,0 +1,6 @@ +Darkswarm.directive "ofnScrollTo", ($location, $anchorScroll)-> + restrict: 'A' + link: (scope, element, attrs)-> + element.bind 'click', -> + $location.hash attrs.ofnScrollTo + $anchorScroll() diff --git a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee index 44a0819b7a..2e792f4642 100644 --- a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee +++ b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee @@ -9,6 +9,7 @@ Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location)-> open: (path = false)=> @modalInstance = $modal.open templateUrl: 'authentication.html' + windowClass: "login-modal small" @modalInstance.result.then @close, @close @selectedPath = path || @selectedPath Navigation.navigate @selectedPath diff --git a/app/assets/javascripts/templates/forgot.html.haml b/app/assets/javascripts/templates/forgot.html.haml index 9dcb1867a9..79cafc2431 100644 --- a/app/assets/javascripts/templates/forgot.html.haml +++ b/app/assets/javascripts/templates/forgot.html.haml @@ -16,7 +16,7 @@ .row .large-12.columns - %label{for: "email"} Email + %label{for: "email"} Your email %input.title.input-text{name: "email", type: "email", tabindex: 1, diff --git a/app/assets/javascripts/templates/login.html.haml b/app/assets/javascripts/templates/login.html.haml index 9c2429d113..680edd86d7 100644 --- a/app/assets/javascripts/templates/login.html.haml +++ b/app/assets/javascripts/templates/login.html.haml @@ -1,5 +1,5 @@ %tab#login-content{"ng-controller" => "LoginCtrl", - heading: "Login", + heading: "Log in", active: "active(path)", select: "select(path)"} %form{"ng-submit" => "submit()"} @@ -24,14 +24,14 @@ "ng-model" => "spree_user.password"} .row .large-12.columns - %label{for: "remember_me"} Remember Me %input{name: "remember_me", type: "checkbox", value: "1", "ng-model" => "spree_user.remember_me"} + %label{for: "remember_me"} Remember Me .row .large-12.columns %input.button.primary{name: "commit", tabindex: "3", type: "submit", - value: "Login"} + value: "Log in"} diff --git a/app/assets/javascripts/templates/signup.html.haml b/app/assets/javascripts/templates/signup.html.haml index e77e43400a..00040579af 100644 --- a/app/assets/javascripts/templates/signup.html.haml +++ b/app/assets/javascripts/templates/signup.html.haml @@ -1,11 +1,11 @@ %tab#sign-up-content{"ng-controller" => "SignupCtrl", - heading: "Signup", + heading: "Sign up", active: "active(path)", select: "select(path)"} %form{"ng-submit" => "submit()"} .row .large-12.columns - %label{for: "email"} Email + %label{for: "email"} Your email %input.title.input-text{name: "email", type: "email", tabindex: 1, @@ -14,7 +14,7 @@ {{ errors.email.join(' ') }} .row .large-12.columns - %label{for: "password"} Password + %label{for: "password"} Choose a password %input.title.input-text{name: "password", type: "password", autocomplete: "off", @@ -24,7 +24,7 @@ {{ errors.password.join(' ') }} .row .large-12.columns - %label{for: "password"} Password Confirmation + %label{for: "password"} Confirm password %input.title.input-text{name: "password_confirmation", type: "password", autocomplete: "off", @@ -35,4 +35,4 @@ %input.button.primary{name: "commit", tabindex: "3", type: "submit", - value: "Signup"} + value: "Sign up now"} diff --git a/app/assets/stylesheets/darkswarm/active_table.css.sass b/app/assets/stylesheets/darkswarm/active_table.css.sass index 2023e24cca..5843c0f547 100644 --- a/app/assets/stylesheets/darkswarm/active_table.css.sass +++ b/app/assets/stylesheets/darkswarm/active_table.css.sass @@ -70,27 +70,6 @@ border: 1px solid $dark-grey color: $dark-grey - &.inactive, &.inactive strong - color: $disabled-dark - &.closed - &:hover, &:active, &:focus - border: 1px solid $disabled-dark - color: $disabled-dark - &.open - .active_table_row:first-child - color: $dark-grey - border-top: 1px solid $disabled-dark - border-left: 1px solid $disabled-dark - border-right: 1px solid $disabled-dark - strong - color: $dark-grey - &:hover, &:active, &:focus - color: $dark-grey - .active_table_row:nth-child(2) - border-left: 1px solid $disabled-dark - border-right: 1px solid $disabled-dark - border-bottom: 1px solid $disabled-dark - &.current &.closed &, & * diff --git a/app/assets/stylesheets/darkswarm/hub_node.css.sass b/app/assets/stylesheets/darkswarm/hub_node.css.sass index 937f12b195..eb30630ad6 100644 --- a/app/assets/stylesheets/darkswarm/hub_node.css.sass +++ b/app/assets/stylesheets/darkswarm/hub_node.css.sass @@ -2,7 +2,38 @@ .hubs .active_table .active_table_node + + //Inactive row + &.inactive, &.inactive strong + color: $disabled-dark + &.closed + &:hover, &:active, &:focus + border: 1px solid $disabled-dark + color: $disabled-dark + &.open + .active_table_row:first-child + color: $dark-grey + border-top: 1px solid $disabled-dark + border-left: 1px solid $disabled-dark + border-right: 1px solid $disabled-dark + strong + color: $dark-grey + &:hover, &:active, &:focus + color: $dark-grey + strong + color: $dark-grey + .active_table_row:nth-child(2) + border-left: 1px solid $disabled-dark + border-right: 1px solid $disabled-dark + border-bottom: 1px solid $disabled-dark + + //Closed row + &.closed + &:hover, &:active, &:focus + border: 1px solid $clr-brick + color: $clr-brick + //Open row &.open .active_table_row:first-child border-top: 1px solid $clr-brick @@ -10,22 +41,18 @@ border-right: 1px solid $clr-brick &:hover, &:active, &:focus color: $clr-brick - + strong + color: $clr-brick .active_table_row:nth-child(2) border-left: 1px solid $clr-brick border-right: 1px solid $clr-brick border-bottom: 1px solid $clr-brick - .active_table_row.link background-color: $clr-brick &:hover background-color: $clr-brick-bright - &.closed - &:hover, &:active, &:focus - border: 1px solid $clr-brick - color: $clr-brick - + //Current selected row &.current &.closed &, & * @@ -34,3 +61,5 @@ .active_table_row:first-child &, & * color: $clr-brick + + diff --git a/app/assets/stylesheets/darkswarm/login-modal.css.sass b/app/assets/stylesheets/darkswarm/login-modal.css.sass new file mode 100644 index 0000000000..ff97fc496d --- /dev/null +++ b/app/assets/stylesheets/darkswarm/login-modal.css.sass @@ -0,0 +1,4 @@ +.login-modal + background: #efefef + .tabs-content + background: #fff \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/menu.css.sass b/app/assets/stylesheets/darkswarm/menu.css.sass index 7020a52e47..9ffb810ac2 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.sass +++ b/app/assets/stylesheets/darkswarm/menu.css.sass @@ -1,9 +1,6 @@ @import branding @import mixins -.inner-wrap - padding-top: 45px - .top-bar @include box-shadow(0 2px 3px 0 rgba(0,0,0,0.25)) @@ -23,4 +20,13 @@ nav font-size: 0.875rem nav.top-bar a.icon i - font-size: 22px \ No newline at end of file + font-size: 22px + +// Responsive +@media screen and (min-width: 1025px) + body.off-canvas + padding-top: 45px +@media screen and (max-width: 1025px) + section.right + .nav-branded + padding: 0 1em \ No newline at end of file diff --git a/app/assets/stylesheets/darkswarm/offcanvas.css b/app/assets/stylesheets/darkswarm/offcanvas.css deleted file mode 100644 index 3b823be7a3..0000000000 --- a/app/assets/stylesheets/darkswarm/offcanvas.css +++ /dev/null @@ -1,50 +0,0 @@ -/* Off canvas layout CSS/JS provided by or adapted from work by Jason Weaver and Luke Wroblewski Requires globals.css grid.css */ -body.off-canvas { padding: 0; margin: 0;} - -.container { width: 100%; } - -.row { overflow: hidden; } - -.row .row { overflow: visible; } - -.paneled .container { overflow: hidden; } - -.paneled .row { width: 100%; } - -[role="main"]:before { content: " "; position: absolute; z-index: -1; top: 0; left: -100%; width: 100%; height: 100%; } - -[role="complementary"], [role="main"] { width: 100%; padding: 0 15px; display: block; position: relative; z-index: 1; -webkit-transition: 0.25s all ease-in; -moz-transition: 0.25s all ease-in; -o-transition: 0.25s all ease-in; transition: 0.25s all ease-in; } - -.paneled [role="main"] { padding: 0; } - -.page-panel { width: 100%; padding: 0 15px; -webkit-transition: 0.3s margin ease-in-out; -moz-transition: 0.3s margin ease-in-out; -o-transition: 0.3s margin ease-in-out; transition: 0.3s margin ease-in-out; background: #fff; } - -#switchPanels { margin: 0 -15px; } - -.hide-extras [role="complementary"] { display: block; } - -[role="navigation"]#topMenu { -webkit-transition: 0.25s all ease-in; -moz-transition: 0.25s all ease-in; -o-transition: 0.25s all ease-in; transition: 0.25s all ease-in; } - -[role="navigation"]#topMenu ul { margin-top: 0; } - -[role="complementary"] { margin-left: -100%; width: 400px; float: left; z-index: 2; } - -[role="main"] { margin-left: 0; float: right; z-index: 1; position: relative; } - -.paneled [role="main"] { background: #fff; width: 500%; overflow: hidden; float: none; position: relative; left: 0; -webkit-transition: 0.15s all ease-in; -moz-transition: 0.15s all ease-in; -o-transition: 0.15s all ease-in; transition: 0.15s all ease-in; } - -.page-panel { min-height: 400px; float: left; margin: 0; width: 20%; } - -[role="complementary"].active { margin-left: 0; } -.active + [role="main"] { margin-right: -420px; } - -.active-menu [role="navigation"]#topMenu { margin-top: 0 !important; } - -@media all and (min-width: 768px) { menu-button, .sidebar-button { display: none; } - /*[role="complementary"] { width: 20%; margin-left: 0; float: left; padding: 0 15px; }*/ - [role="main"] { width: 100%; padding: 0 15px; } - .paneled [role="main"] { width: 100%; padding: 0; background: #f4f4f4; left: 0 !important; } - .page-panel { display: block; min-height: 800px; float: none; margin: 0; width: 100%; background: #f4f4f4; } - .hide-extras [role="main"] { width: 100%; } - .hide-extras [role="complementary"] { display: none; } - [role="navigation"]#topMenu { display: none; } } diff --git a/app/assets/stylesheets/darkswarm/producer_node.css.sass b/app/assets/stylesheets/darkswarm/producer_node.css.sass index 0c5240b104..bd2fa77372 100644 --- a/app/assets/stylesheets/darkswarm/producer_node.css.sass +++ b/app/assets/stylesheets/darkswarm/producer_node.css.sass @@ -2,6 +2,7 @@ .producers .active_table .active_table_node + //Open row &.open .active_table_row:first-child border-top: 1px solid $clr-turquoise @@ -9,26 +10,22 @@ border-right: 1px solid $clr-turquoise &:hover, &:active, &:focus color: $clr-turquoise - + strong + color: $clr-turquoise .active_table_row:nth-child(2) border-left: 1px solid $clr-turquoise border-right: 1px solid $clr-turquoise border-bottom: 1px solid $clr-turquoise - .active_table_row.link background-color: $clr-turquoise &:hover - background-color: $clr-turquoise-bright - + background-color: $clr-turquoise-bright + //Closed row &.closed &, & * - color: $clr-turquoise-bright - &.open - .active_table_row:first-child + color: $dark-grey + &:hover, &:active, &:focus + border: 1px solid $clr-turquoise &, & * - color: $clr-turquoise - &.open - .active_table_row:first-child - &, & * - color: $clr-turquoise + color: $clr-turquoise diff --git a/app/assets/stylesheets/darkswarm/ui.css.sass b/app/assets/stylesheets/darkswarm/ui.css.sass index 2370b856f3..8c9324f5f8 100644 --- a/app/assets/stylesheets/darkswarm/ui.css.sass +++ b/app/assets/stylesheets/darkswarm/ui.css.sass @@ -39,6 +39,16 @@ background-color: rgba(0, 0, 0, 0.1) text-shadow: 0 1px 0 #fff +//rewrite default primary style + +.button.primary + font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif + background: $clr-brick + color: white + +.button.primary:hover, .button.primary:active, .button.primary:focus + background: $clr-brick-bright + text-shadow: 0 1px 0 $clr-brick // Responsive @media screen and (min-width: 768px) diff --git a/app/assets/stylesheets/search/all.css b/app/assets/stylesheets/search/all.css deleted file mode 100644 index 15cb708dde..0000000000 --- a/app/assets/stylesheets/search/all.css +++ /dev/null @@ -1,9 +0,0 @@ -/* - * This is a manifest file that'll automatically include all the stylesheets available in this directory - * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at - * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require ./foundation_and_overrides - *= require ./gmaps4rails - *= require_tree . -*/ \ No newline at end of file diff --git a/app/assets/stylesheets/search/auto_complete.css.scss b/app/assets/stylesheets/search/auto_complete.css.scss deleted file mode 100644 index 52ff03a21b..0000000000 --- a/app/assets/stylesheets/search/auto_complete.css.scss +++ /dev/null @@ -1,34 +0,0 @@ -@import "foundation4/foundation/variables"; -@import "foundation4/foundation/components/global"; - -ul.ui-autocomplete { - position: absolute; - list-style: none; - margin: 0; - padding: 0; - border: solid 1px #999; - cursor: default; - li { - background-color: #FFF; - border-top: solid 1px #DDD; - margin: 0; - padding: 0; - font-size: 0.7em; - a { - color: #000; - display: block; - padding: 3px; - - &:visited { - color: #000; - } - - &:hover { - color: $primary-color - } - } - a.ui-state-hover, a.ui-state-active { - background-color: #FFFCB2; - } - } -} diff --git a/app/assets/stylesheets/search/enteprise_search.css.scss b/app/assets/stylesheets/search/enteprise_search.css.scss deleted file mode 100644 index 5edf4bff6c..0000000000 --- a/app/assets/stylesheets/search/enteprise_search.css.scss +++ /dev/null @@ -1,16 +0,0 @@ -@import "foundation4/foundation/variables"; -@import "foundation4/foundation/components/global"; - -.search-result { - min-height: 3em; - padding: 15px 0; - - .secondary-info { - font-size: 0.8em; - color: #b7b7b7; - } -} - -.with-separator { - border-bottom: 1px solid #E0E0E0; -} diff --git a/app/assets/stylesheets/search/foundation_and_overrides.scss b/app/assets/stylesheets/search/foundation_and_overrides.scss deleted file mode 100644 index 101aec7299..0000000000 --- a/app/assets/stylesheets/search/foundation_and_overrides.scss +++ /dev/null @@ -1,1324 +0,0 @@ -// -// Foundation Variables -// - -// The default font-size is set to 100% of the browser style sheet (usually 16px) -// for compatibility with browser-based text zoom or user-set defaults. -$base-font-size: 100% !default; - -// $base-line-height is 24px while $base-font-size is 16px -// $base-line-height: 150%; - -// This is the default html and body font-size for the base em value. - -// Since the typical default browser font-size is 16px, that makes the calculation for grid size. -// If you want your base font-size to be a different size and not have it effect grid size too, -// set the value of $em-base to $base-font-size ($em-base: $base-font-size;) -$em-base: 16 !default; - -// It strips the unit of measure and returns it -@function strip-unit($num) { - @return $num / ($num * 0 + 1); -} - -// Converts "px" to "em" using the ($)em-base -@function convert-to-em($value) { - $value: strip-unit($value) / strip-unit($em-base) * 1em; - @if ($value == 0em) { $value: 0; } // Turn 0em into 0 - @return $value; -} - -// Working in ems is annoying. Think in pixels by using this handy function, emCalc(#) -// Just enter the number, no need to mention "px" -@function emCalc($values...) { - $max: length($values); // Get the total number of parameters passed - - // If there is only 1 parameter, then return it as an integer. - // This is done because a list can't be multiplied or divided even if it contains a single value - @if $max == 1 { @return convert-to-em(nth($values, 1)); } - - $emValues: (); // This will eventually store the converted $values in a list - @for $i from 1 through $max { - $emValues: append($emValues, convert-to-em(nth($values, $i))); - } - @return $emValues; -} - -// Change whether or not you include browser prefixes -// $experimental: true; - -// Various global styles - -$default-float: left; - -// $body-bg: #fff; -// $body-font-color: #222; -// $body-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; -// $body-font-weight: normal; -// $body-font-style: normal; - -// Font-smoothing - -// $font-smoothing: antialiased; - -// Text direction settings - -// $text-direction: ltr; - -// Colors - -// $primary-color: #2ba6cb; -// $secondary-color: #e9e9e9; -// $alert-color: #c60f13; -// $success-color: #5da423; - -// Make sure border radius matches unless we want it different. - -// $global-radius: 3px; -// $global-rounded: 1000px; - -// Inset shadow shiny edges and depressions. - -// $shiny-edge-size: 0 1px 0; -// $shiny-edge-color: rgba(#fff, .5); -// $shiny-edge-active-color: rgba(#000, .2); - -// Control whether or not CSS classes come through in the CSS files. - -// $include-html-classes: true; -// $include-print-styles: true; -// $include-html-global-classes: $include-html-classes; -// $include-html-inline-list-classes: $include-html-classes; -// $include-html-type-classes: $include-html-classes; -// $include-html-grid-classes: $include-html-classes; -// $include-html-visibility-classes: $include-html-classes; -// $include-html-button-classes: $include-html-classes; -// $include-html-form-classes: $include-html-classes; -// $include-html-custom-form-classes: $include-html-classes; -// $include-html-media-classes: $include-html-classes; -// $include-html-section-classes: $include-html-classes; -// $include-html-orbit-classes: $include-html-classes; -// $include-html-reveal-classes: $include-html-classes; -// $include-html-joyride-classes: $include-html-classes; -// $include-html-clearing-classes: $include-html-classes; -// $include-html-alert-classes: $include-html-classes; -// $include-html-nav-classes: $include-html-classes; -// $include-html-top-bar-classes: $include-html-classes; -// $include-html-label-classes: $include-html-classes; -// $include-html-panel-classes: $include-html-classes; -// $include-html-pricing-classes: $include-html-classes; -// $include-html-progress-classes: $include-html-classes; -// $include-html-magellan-classes: $include-html-classes; -// $include-html-tooltip-classes: $include-html-classes; - -// Media Queries - -// $small-screen: 768px; -// $medium-screen: 1280px; -// $large-screen: 1440px; - -// $screen: "only screen"; -// $small: "only screen and (min-width: #{$small-screen})"; -// $medium: "only screen and (min-width: #{$medium-screen})"; -// $large: "only screen and (min-width: #{$large-screen})"; -// $landscape: "only screen and (orientation: landscape)"; -// $portrait: "only screen and (orientation: portrait)"; - -//// Cursors - -//Custom use example -> $cursor-default-value: url(http://cursors-site.net/path/to/custom/cursor/default.cur),progress; - -// $cursor-crosshair-value: "crosshair"; -// $cursor-default-value: "default"; -// $cursor-pointer-value: "pointer"; -// $cursor-help-value: "help"; - -// -// Grid Variables -// - -// $row-width: emCalc(1000); -// $column-gutter: emCalc(30); -// $total-columns: 12; - -// -// Block Grid Variables -// - -// We use this to control the maximum number of block grid elements per row - -// $block-grid-elements: 12; -// $block-grid-default-spacing: emCalc(20); - -// Enables media queries for block-grid classes. Set to false if writing semantic HTML. - -// $block-grid-media-queries: true; - -// -// Typography Variables -// - -// Control header font styles - -// $header-font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; -// $header-font-weight: bold; -// $header-font-style: normal; -// $header-font-color: #222; -// $header-line-height: 1.4; -// $header-top-margin: .2em; -// $header-bottom-margin: .5em; -// $header-text-rendering: optimizeLegibility; - -// Control header font sizes - -// $h1-font-size: emCalc(44); -// $h2-font-size: emCalc(37); -// $h3-font-size: emCalc(27); -// $h4-font-size: emCalc(23); -// $h5-font-size: emCalc(18); -// $h6-font-size: 1em; - -// Control how subheaders are styled. - -// $subheader-line-height: 1.4; -// $subheader-font-color: lighten($header-font-color, 30%); -// $subheader-font-weight: 300; -// $subheader-top-margin: .2em; -// $subheader-bottom-margin: .5em; - -// A general styling - -// $small-font-size: 60%; -// $small-font-color: lighten($header-font-color, 30%); - -// Style paragraphs - -// $paragraph-font-family: inherit; -// $paragraph-font-weight: normal; -// $paragraph-font-size: 1em; -// $paragraph-line-height: 1.6; -// $paragraph-margin-bottom: emCalc(20); -// $paragraph-aside-font-size: emCalc(14); -// $paragraph-aside-line-height: 1.35; -// $paragraph-aside-font-style: italic; -// $paragraph-text-rendering: optimizeLegibility; - -// Style tags - -// $code-color: darken($alert-color, 15%); -// $code-font-family: Consolas, 'Liberation Mono', Courier, monospace; -// $code-font-weight: bold; - -// Style anchors - -// $anchor-text-decoration: none; -// $anchor-font-color: $primary-color; -// $anchor-font-color-hover: darken($primary-color, 5%); - -// Style the
element - -// $hr-border-width: 1px; -// $hr-border-style: solid; -// $hr-border-color: #ddd; -// $hr-margin: emCalc(20); - -// Style lists - -// $list-style-position: outside; -// $list-side-margin: 0; -// $list-nested-margin: emCalc(20); -// $definition-list-header-weight: bold; -// $definition-list-header-margin-bottom: .3em; -// $definition-list-margin-bottom: emCalc(12); - -// Style blockquotes - -// $blockquote-font-color: lighten($header-font-color, 30%); -// $blockquote-padding: emCalc(9, 20, 0, 19); -// $blockquote-border: 1px solid #ddd; -// $blockquote-cite-font-size: emCalc(13); -// $blockquote-cite-font-color: lighten($header-font-color, 20%); -// $blockquote-cite-link-color: $blockquote-cite-font-color; - -// Acronym styles - -// $acronym-underline: 1px dotted #ddd; - -// Control padding and margin - -// $microformat-padding: emCalc(10, 12); -// $microformat-margin: emCalc(0, 0, 20, 0); - -// Control the border styles - -// $microformat-border-width: 1px; -// $microformat-border-style: solid; -// $microformat-border-color: #ddd; - -// Control full name font styles - -// $microformat-fullname-font-weight: bold; -// $microformat-fullname-font-size: emCalc(15); - -// Control the summary font styles - -// $microformat-summary-font-weight: bold; - -// Control abbr padding -// $microformat-abbr-padding: emCalc(0, 1); - -// Control abbr font styles - -// $microformat-abbr-font-weight: bold; -// $microformat-abbr-font-decoration: none; - -// -// Form Variables -// - -// We use this to set the base for lots of form spacing and positioning styles - -// $form-spacing: emCalc(16); - -// We use these to style the labels in different ways - -// $form-label-pointer: pointer; -// $form-label-font-size: emCalc(14); -// $form-label-font-weight: 500; -// $form-label-font-color: lighten(#000, 30%); -// $form-label-bottom-margin: emCalc(3); -// $input-font-family: inherit; -// $input-font-color: rgba(0,0,0,0.75); -// $input-font-size: emCalc(14); -// $input-bg-color: #fff; -// $input-focus-bg-color: darken(#fff, 2%); -// $input-border-color: darken(#fff, 20%); -// $input-focus-border-color: darken(#fff, 40%); -// $input-border-style: solid; -// $input-border-width: 1px; -// $input-disabled-bg: #ddd; -// $input-box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); -// $input-include-glowing-effect: true; - -// We use these to style the fieldset border and spacing. - -// $fieldset-border-style: solid; -// $fieldset-border-width: 1px; -// $fieldset-border-color: #ddd; -// $fieldset-padding: emCalc(20); -// $fieldset-margin: emCalc(18, 0); - -// We use these to style the legends when you use them - -// $legend-bg: #fff; -// $legend-font-weight: bold; -// $legend-padding: emCalc(0, 3); - -// We use these to style the prefix and postfix input elements - -// $input-prefix-bg: darken(#fff, 5%); -// $input-prefix-border-color: darken(#fff, 20%); -// $input-prefix-border-size: 1px; -// $input-prefix-border-type: solid; -// $input-prefix-overflow: hidden; -// $input-prefix-font-color: #333; -// $input-prefix-font-color-alt: #fff; - -// We use these to style the error states for inputs and labels - -// $input-error-message-padding: emCalc(6, 4); -// $input-error-message-top: 0; -// $input-error-message-font-size: emCalc(12); -// $input-error-message-font-weight: bold; -// $input-error-message-font-color: #fff; -// $input-error-message-font-color-alt: #333; - -// We use this to style the glowing effect of inputs when focused - -// $glowing-effect-fade-time: 0.45s; -// $glowing-effect-color: $input-focus-border-color; - -// -// Button Variables -// - -// We use these to build padding for buttons. - -// $button-med: emCalc(12); -// $button-tny: emCalc(7); -// $button-sml: emCalc(9); -// $button-lrg: emCalc(16); - -// We use this to control the display property. - -// $button-display: inline-block; -// $button-margin-bottom: emCalc(20); - -// We use these to control button text styles. - -// $button-font-family: inherit; -// $button-font-color: #fff; -// $button-font-color-alt: #333; -// $button-font-med: emCalc(16); -// $button-font-tny: emCalc(11); -// $button-font-sml: emCalc(13); -// $button-font-lrg: emCalc(20); -// $button-font-weight: bold; -// $button-font-align: center; - -// We use these to control various hover effects. - -// $button-function-factor: 10%; - -// We use these to control button border styles. - -// $button-border-width: 1px; -// $button-border-style: solid; - -// We use this to set the default radius used throughout the core. - -// $button-radius: $global-radius; -// $button-round: $global-rounded; - - -// We use this to set default opacity for disabled buttons. - -// $button-disabled-opacity: 0.6; - -// -// Button Groups -// - -// Sets the margin for the right side by default, and the left margin if right-to-left direction is used - -// $button-bar-margin-opposite: emCalc(10); - -// -// Dropdown Button Variables -// - -// We use these to set the color of the pip in dropdown buttons - -// $dropdown-button-pip-color: #fff; -// $dropdown-button-pip-color-alt: #333; - -// We use these to style tiny dropdown buttons - -// $dropdown-button-padding-tny: $button-tny * 5; -// $dropdown-button-pip-size-tny: $button-tny; -// $dropdown-button-pip-opposite-tny: $button-tny * 2; -// $dropdown-button-pip-top-tny: -$button-tny / 2 + emCalc(1); - -// We use these to style small dropdown buttons - -// $dropdown-button-padding-sml: $button-sml * 5; -// $dropdown-button-pip-size-sml: $button-sml; -// $dropdown-button-pip-opposite-sml: $button-sml * 2; -// $dropdown-button-pip-top-sml: -$button-sml / 2 + emCalc(1); - -// We use these to style medium dropdown buttons - -// $dropdown-button-padding-med: $button-med * 4 + emCalc(3); -// $dropdown-button-pip-size-med: $button-med - emCalc(3); -// $dropdown-button-pip-opposite-med: $button-med * 2; -// $dropdown-button-pip-top-med: -$button-med / 2 + emCalc(2); - -// We use these to style large dropdown buttons - -// $dropdown-button-padding-lrg: $button-lrg * 4; -// $dropdown-button-pip-size-lrg: $button-lrg - emCalc(6); -// $dropdown-button-pip-opposite-lrg: $button-lrg + emCalc(12); -// $dropdown-button-pip-top-lrg: -$button-lrg / 2 + emCalc(3); - -// -// Split Button Variables -// - -// We use these to control different shared styles for Split Buttons - -// $split-button-function-factor: 15%; -// $split-button-pip-color: #fff; -// $split-button-pip-color-alt: #333; -// $split-button-active-bg-tint: rgba(0,0,0,0.1); - -// We use these to control tiny split buttons - -// $split-button-padding-tny: $button-tny * 9; -// $split-button-span-width-tny: $button-tny * 6.5; -// $split-button-pip-size-tny: $button-tny; -// $split-button-pip-top-tny: $button-tny * 2; -// $split-button-pip-default-float-tny: emCalc(-5); - -// We use these to control small split buttons - -// $split-button-padding-sml: $button-sml * 7; -// $split-button-span-width-sml: $button-sml * 5; -// $split-button-pip-size-sml: $button-sml; -// $split-button-pip-top-sml: $button-sml * 1.5; -// $split-button-pip-default-float-sml: emCalc(-9); - -// We use these to control medium split buttons - -// $split-button-padding-med: $button-med * 6.4; -// $split-button-span-width-med: $button-med * 4; -// $split-button-pip-size-med: $button-med - emCalc(3); -// $split-button-pip-top-med: $button-med * 1.5; -// $split-button-pip-default-float-med: emCalc(-9); - -// We use these to control large split buttons - -// $split-button-padding-lrg: $button-lrg * 6; -// $split-button-span-width-lrg: $button-lrg * 3.75; -// $split-button-pip-size-lrg: $button-lrg - emCalc(6); -// $split-button-pip-top-lrg: $button-lrg + emCalc(5); -// $split-button-pip-default-float-lrg: emCalc(-9); - -// -// Alert Box Variables -// - -// We use this to control alert padding. - -// $alert-padding-top: emCalc(11); -// $alert-padding-default-float: $alert-padding-top; -// $alert-padding-opposite-direction: $alert-padding-top + emCalc(10); -// $alert-padding-bottom: $alert-padding-top + emCalc(1); - -// We use these to control text style. - -// $alert-font-weight: bold; -// $alert-font-size: emCalc(14); -// $alert-font-color: #fff; -// $alert-font-color-alt: darken($secondary-color, 60%); - -// We use this for close hover effect. - -// $alert-function-factor: 10%; - -// We use these to control border styles. - -// $alert-border-style: solid; -// $alert-border-width: 1px; -// $alert-border-color: darken($primary-color, $alert-function-factor); -// $alert-bottom-margin: emCalc(20); - -// We use these to style the close buttons - -// $alert-close-color: #333; -// $alert-close-position: emCalc(5); -// $alert-close-font-size: emCalc(22); -// $alert-close-opacity: 0.3; -// $alert-close-opacity-hover: 0.5; -// $alert-close-padding: 5px 4px 4px; - -// We use this to control border radius - -// $alert-radius: $global-radius; - - -// -// Breadcrumb Variables -// - -// We use this to set the background color for the breadcrumb container. - -// $crumb-bg: lighten($secondary-color, 5%); - -// We use these to set the padding around the breadcrumbs. - -// $crumb-padding: emCalc(9, 14, 9); -// $crumb-side-padding: emCalc(12); - -// We use these to control border styles. - -// $crumb-function-factor: 10%; -// $crumb-border-size: 1px; -// $crumb-border-style: solid; -// $crumb-border-color: darken($crumb-bg, $crumb-function-factor); -// $crumb-radius: $global-radius; - -// We use these to set various text styles for breadcrumbs. - -// $crumb-font-size: emCalc(11); -// $crumb-font-color: $primary-color; -// $crumb-font-color-current: #333; -// $crumb-font-color-unavailable: #999; -// $crumb-font-transform: uppercase; -// $crumb-link-decor: underline; - -// We use these to control the slash between breadcrumbs - -// $crumb-slash-color: #aaa; -// $crumb-slash: "/"; - -// -// Clearing Variables -// - -// We use these to set the background colors for parts of Clearing. - -// $clearing-bg: #111; -// $clearing-caption-bg: $clearing-bg; -// $clearing-carousel-bg: #111; -// $clearing-img-bg: $clearing-bg; - -// We use these to style the close button - -// $clearing-close-color: #fff; -// $clearing-close-size: 40px; - -// We use these to style the arrows - -// $clearing-arrow-size: 16px; -// $clearing-arrow-color: $clearing-close-color; - -// We use these to style captions - -// $clearing-caption-font-color: #fff; -// $clearing-caption-padding: 10px 30px; - -// We use these to make the image and carousel height and style - -// $clearing-active-img-height: 75%; -// $clearing-carousel-height: 150px; -// $clearing-carousel-thumb-width: 175px; -// $clearing-carousel-thumb-active-border: 4px solid rgb(255,255,255); - -// -// Custom Form Variables -// - -// We use these to control the basic form styles input styles - -// $custom-form-border-color: #ccc; -// $custom-form-border-size: 1px; -// $custom-form-bg: #fff; -// $custom-form-bg-disabled: #ddd; -// $custom-form-input-size: 16px; -// $custom-form-check-color: #222; -// $custom-form-check-size: 16px; -// $custom-form-radio-size: 8px; -// $custom-form-checkbox-radius: 0px; - -// We use these to style the custom select form element. - -// $custom-select-bg: #fff; -// $custom-select-fade-to-color: #f3f3f3; -// $custom-select-border-color: #ddd; -// $custom-select-triangle-color: #aaa; -// $custom-select-triangle-color-open: #222; -// $custom-select-height: emCalc(13) + ($form-spacing * 1.5); -// $custom-select-margin-bottom: emCalc(20); -// $custom-select-font-color-selected: #141414; -// $custom-select-disabled-color: #888; - -// We use these to control the style of the custom select dropdown element. - -// $custom-dropdown-height: 200px; -// $custom-dropdown-bg: #fff; -// $custom-dropdown-border-color: darken(#fff, 20%); -// $custom-dropdown-border-width: 1px; -// $custom-dropdown-border-style: solid; -// $custom-dropdown-font-color: #555; -// $custom-dropdown-font-size: emCalc(14); -// $custom-dropdown-color-selected: #eeeeee; -// $custom-dropdown-font-color-selected: #000; -// $custom-dropdown-shadow: 0 2px 2px 0px rgba(0,0,0,0.1); -// $custom-dropdown-offset-top: auto; -// $custom-dropdown-list-padding: emCalc(4); -// $custom-dropdown-default-float-padding: emCalc(6); -// $custom-dropdown-opposite-padding: emCalc(38); -// $custom-dropdown-list-item-min-height: emCalc(24); -// $custom-dropdown-width-small: 134px; -// $custom-dropdown-width-medium: 254px; -// $custom-dropdown-width-large: 434px; - -// -// Dropdown Variables -// - -// We use these to controls height and width styles. - -// $f-dropdown-max-width: 200px; -// $f-dropdown-height: auto; -// $f-dropdown-max-height: none; -// $f-dropdown-margin-top: 2px; - -// We use this to control the background color - -// $f-dropdown-bg: #fff; - -// We use this to set the border styles for dropdowns. - -// $f-dropdown-border-style: solid; -// $f-dropdown-border-width: 1px; -// $f-dropdown-border-color: darken(#fff, 20%); - -// We use these to style the triangle pip. - -// $f-dropdown-triangle-size: 6px; -// $f-dropdown-triangle-color: #fff; -// $f-dropdown-triangle-side-offset: 10px; - -// We use these to control styles for the list elements. - -// $f-dropdown-list-style: none; -// $f-dropdown-font-color: #555; -// $f-dropdown-font-size: emCalc(14); -// $f-dropdown-list-padding: emCalc(5, 10); -// $f-dropdown-line-height: emCalc(18); -// $f-dropdown-list-hover-bg: #eeeeee; -// $dropdown-mobile-default-float: 0; - -// We use this to control the styles for when the dropdown has custom content. - -// $f-dropdown-content-padding: emCalc(20); - -// -// Flex Video Variables -// - -// We use these to control video container padding and margins - -// $flex-video-padding-top: emCalc(25); -// $flex-video-padding-bottom: 67.5%; -// $flex-video-margin-bottom: emCalc(16); - -// We use this to control widescreen bottom padding - -// $flex-video-widescreen-padding-bottom: 57.25%; - -// -// Inline List Variables -// - -// We use this to control the margins and padding of the inline list. - -// $inline-list-top-margin: 0; -// $inline-list-opposite-margin: 0; -// $inline-list-bottom-margin: emCalc(17); -// $inline-list-default-float-margin: emCalc(-22); - -// $inline-list-padding: 0; - -// We use this to control the overflow of the inline list. - -// $inline-list-overflow: hidden; - -// We use this to control the list items - -// $inline-list-display: block; - -// We use this to control any elments within list items - -// $inline-list-children-display: block; - -// -// Joyride Variables -// - -// Controlling default Joyride styles - -// $joyride-tip-bg: rgb(0,0,0); -// $joyride-tip-default-width: 300px; -// $joyride-tip-padding: emCalc(18, 20, 24); -// $joyride-tip-border: solid 1px #555; -// $joyride-tip-radius: 4px; -// $joyride-tip-position-offset: 22px; - -// Here, we're setting the tip dont styles - -// $joyride-tip-font-color: #fff; -// $joyride-tip-font-size: emCalc(14); -// $joyride-tip-header-weight: bold; - -// This changes the nub size - -// $joyride-tip-nub-size: 14px; - -// This adjusts the styles for the timer when its enabled - -// $joyride-tip-timer-width: 50px; -// $joyride-tip-timer-height: 3px; -// $joyride-tip-timer-color: #666; - -// This changes up the styles for the close button - -// $joyride-tip-close-color: #777; -// $joyride-tip-close-size: 30px; -// $joyride-tip-close-weight: normal; - -// When Joyride is filling the screen, we use this style for the bg - -// $joyride-screenfill: rgba(0,0,0,0.5); - -// -// Keystroke Variables -// - -// We use these to control text styles. - -// $keystroke-font: "Consolas", "Menlo", "Courier", monospace; -// $keystroke-font-size: emCalc(14); -// $keystroke-font-color: #222; -// $keystroke-font-color-alt: #fff; -// $keystroke-function-factor: 7%; - -// We use this to control keystroke padding. - -// $keystroke-padding: emCalc(2, 4, 0); - -// We use these to control background and border styles. - -// $keystroke-bg: darken(#fff, $keystroke-function-factor); -// $keystroke-border-style: solid; -// $keystroke-border-width: 1px; -// $keystroke-border-color: darken($keystroke-bg, $keystroke-function-factor); -// $keystroke-radius: $global-radius; - -// -// Label Variables -// - -// We use these to style the labels - -// $label-padding: emCalc(3, 10, 4); -// $label-radius: $global-radius; - -// We use these to style the label text - -// $label-font-sizing: emCalc(14); -// $label-font-weight: bold; -// $label-font-color: #333; -// $label-font-color-alt: #fff; - -// -// Magellan Variables -// - -// $magellan-bg: #fff; -// $magellan-padding: 10px; - -// -// Orbit Settings -// - -// We use these to control the caption styles - -// $orbit-container-bg: #f5f5f5; -// $orbit-caption-bg-old: rgb(0,0,0); -// $orbit-caption-bg: rgba(0,0,0,0.6); -// $orbit-caption-font-color: #fff; - -// We use these to control the left/right nav styles - -// $orbit-nav-bg-old: rgb(0,0,0); -// $orbit-nav-bg: rgba(0,0,0,0.6); - -// We use these to control the timer styles - -// $orbit-timer-bg-old: rgb(0,0,0); -// $orbit-timer-bg: rgba(0,0,0,0.6); - -// We use these to control the bullet nav styles - -// $orbit-bullet-nav-color: #999; -// $orbit-bullet-nav-color-active: #555; - -// We use thes to controls the style of slide numbers - -// $orbit-slide-number-bg: rgba(0,0,0,0); -// $orbit-slide-number-font-color: #fff; -// $orbit-slide-number-padding: emCalc(5px); - -// Graceful Loading Wrapper and preloader - -// $wrapper-class: "slideshow-wrapper"; -// $preloader-class: "preloader"; - -// -// Pagination Variables -// - -// We use these to control the pagination container - -// $pagination-height: emCalc(24); -// $pagination-margin: emCalc(-5); - -// We use these to set the list-item properties - -// $pagination-li-float: $default-float; -// $pagination-li-height: emCalc(24); -// $pagination-li-font-color: #222; -// $pagination-li-font-size: emCalc(14); -// $pagination-li-margin: emCalc(5); - -// We use these for the pagination anchor links - -// $pagination-link-pad: emCalc(1, 7, 1); -// $pagination-link-font-color: #999; -// $pagination-link-active-bg: darken(#fff, 10%); - -// We use these for disabled anchor links - -// $pagination-link-unavailable-cursor: default; -// $pagination-link-unavailable-font-color: #999; -// $pagination-link-unavailable-bg-active: transparent; - -// We use these for currently selected anchor links - -// $pagination-link-current-background: $primary-color; -// $pagination-link-current-font-color: #fff; -// $pagination-link-current-font-weight: bold; -// $pagination-link-current-cursor: default; -// $pagination-link-current-active-bg: $primary-color; - -// -// Panel Variables -// - -// We use these to control the background and border styles - -// $panel-bg: darken(#fff, 5%); -// $panel-border-style: solid; -// $panel-border-size: 1px; - -// We use this % to control how much we darken things on hover - -// $panel-function-factor: 10%; -// $panel-border-color: darken($panel-bg, $panel-function-factor); - -// We use these to set default inner padding and bottom margin - -// $panel-margin-bottom: emCalc(20); -// $panel-padding: emCalc(20); - -// We use these to set default font colors - -// $panel-font-color: #333; -// $panel-font-color-alt: #fff; - -// $panel-header-adjust: true; - -// -// Pricing Table Variables -// - -// We use this to control the border color - -// $price-table-border: solid 1px #ddd; - -// We use this to control the bottom margin of the pricing table - -// $price-table-margin-bottom: emCalc(20); - -// We use these to control the title styles - -// $price-title-bg: #ddd; -// $price-title-padding: emCalc(15, 20); -// $price-title-align: center; -// $price-title-color: #333; -// $price-title-weight: bold; -// $price-title-size: emCalc(16); - -// We use these to control the price styles - -// $price-money-bg: #eee; -// $price-money-padding: emCalc(15, 20); -// $price-money-align: center; -// $price-money-color: #333; -// $price-money-weight: normal; -// $price-money-size: emCalc(20); - -// We use these to control the description styles - -// $price-bg: #fff; -// $price-desc-color: #777; -// $price-desc-padding: emCalc(15); -// $price-desc-align: center; -// $price-desc-font-size: emCalc(12); -// $price-desc-weight: normal; -// $price-desc-line-height: 1.4; -// $price-desc-bottom-border: dotted 1px #ddd; - -// We use these to control the list item styles - -// $price-item-color: #333; -// $price-item-padding: emCalc(15); -// $price-item-align: center; -// $price-item-font-size: emCalc(14); -// $price-item-weight: normal; -// $price-item-bottom-border: dotted 1px #ddd; - -// We use these to control the CTA area styles - -// $price-cta-bg: #f5f5f5; -// $price-cta-align: center; -// $price-cta-padding: emCalc(20, 20, 0); - -// -// Progress Bar Variables -// - -// We use this to se the prog bar height - -// $progress-bar-height: emCalc(25); -// $progress-bar-color: transparent; - -// We use these to control the border styles - -// $progress-bar-border-color: darken(#fff, 20%); -// $progress-bar-border-size: 1px; -// $progress-bar-border-style: solid; -// $progress-bar-border-radius: $global-radius; - -// We use these to control the margin & padding - -// $progress-bar-pad: emCalc(2); -// $progress-bar-margin-bottom: emCalc(10); - -// We use these to set the meter colors - -// $progress-meter-color: $primary-color; -// $progress-meter-secondary-color: $secondary-color; -// $progress-meter-success-color: $success-color; -// $progress-meter-alert-color: $alert-color; - -// -// Reveal Variables -// - -// We use these to control the style of the reveal overlay. - -// $reveal-overlay-bg: rgba(#000, .45); -// $reveal-overlay-bg-old: #000; - -// We use these to control the style of the modal itself. - -// $reveal-modal-bg: #fff; -// $reveal-position-top: 50px; -// $reveal-default-width: 80%; -// $reveal-modal-padding: emCalc(20); -// $reveal-box-shadow: 0 0 10px rgba(#000,.4); - -// We use these to style the reveal close button - -// $reveal-close-font-size: emCalc(22); -// $reveal-close-top: emCalc(8); -// $reveal-close-side: emCalc(11); -// $reveal-close-color: #aaa; -// $reveal-close-weight: bold; - -// We use these to control the modal border - -// $reveal-border-style: solid; -// $reveal-border-width: 1px; -// $reveal-border-color: #666; - -// $reveal-modal-class: "reveal-modal"; -// $close-reveal-modal-class: "close-reveal-modal"; - -// -// Section Variables -// - -// We use these to set padding and hover factor - -// $section-title-padding: emCalc(15); -// $section-content-padding: emCalc(15); -// $section-function-factor: 10%; - -// These style the titles - -// $section-title-color: #333; -// $section-title-color-active: #333; -// $section-title-bg: #efefef; -// $section-title-bg-active: darken($section-title-bg, $section-function-factor); -// $section-title-bg-active-tabs: #fff; -// $section-title-bg-hover: darken($section-title-bg, $section-function-factor / 2); - -// Want to control border size, here ya go! - -// $section-border-size: 1px; -// $section-border-style: solid; -// $section-border-color: #ccc; - -// Font controls - -// $section-font-size: emCalc(14); - -// Control the color of the background and some size options - -// $section-content-bg: #fff; -// $section-vertical-nav-min-width: emCalc(200); -// $section-vertical-tabs-title-width: emCalc(200); -// $section-bottom-margin: emCalc(20); - -// $title-selector: ".title"; -// $content-selector: ".content"; -// $active-region-selector: ".active"; - -// -// Side Nav Variables -// - -// We use this to control padding. - -// $side-nav-padding: emCalc(14, 0); - -// We use these to control list styles. - -// $side-nav-list-type: none; -// $side-nav-list-position: inside; -// $side-nav-list-margin: emCalc(0, 0, 7, 0); - -// We use these to control link styles. - -// $side-nav-link-color: $primary-color; -// $side-nav-link-color-active: lighten(#000, 30%); -// $side-nav-font-size: emCalc(14); -// $side-nav-font-weight: bold; - -// We use these to control border styles - -// $side-nav-divider-size: 1px; -// $side-nav-divider-style: solid; -// $side-nav-divider-color: darken(#fff, 10%); - -// -// Sub Nav Variables -// - -// We use these to control margin and padding - -// $sub-nav-list-margin: emCalc(-4, 0, 18); -// $sub-nav-list-padding-top: emCalc(4); - -// We use this to control the definition - -// $sub-nav-font-size: emCalc(14); -// $sub-nav-font-color: #999; -// $sub-nav-font-weight: normal; -// $sub-nav-text-decoration: none; -// $sub-nav-border-radius: 1000px; - -// We use these to control the active item styles - -// $sub-nav-active-font-weight: bold; -// $sub-nav-active-bg: $primary-color; -// $sub-nav-active-color: #fff; -// $sub-nav-active-padding: emCalc(3, 9); -// $sub-nav-active-cursor: default; - -// -// Switch Variables -// - -// Controlling border styles and background colors for the switch container - -// $switch-border-color: darken(#fff, 20%); -// $switch-border-style: solid; -// $switch-border-width: 1px; -// $switch-bg: #fff; - -// We use these to control the switch heights for our default classes - -// $switch-height-tny: 22px; -// $switch-height-sml: 28px; -// $switch-height-med: 36px; -// $switch-height-lrg: 44px; -// $switch-bottom-margin: emCalc(20); - -// We use these to control default font sizes for our classes. - -// $switch-font-size-tny: 11px; -// $switch-font-size-sml: 12px; -// $switch-font-size-med: 14px; -// $switch-font-size-lrg: 17px; -// $switch-label-side-padding: 6px; - -// We use these to style the switch-paddle - -// $switch-paddle-bg: #fff; -// $switch-paddle-fade-to-color: darken($switch-paddle-bg, 10%); -// $switch-paddle-border-color: darken($switch-paddle-bg, 35%); -// $switch-paddle-border-width: 1px; -// $switch-paddle-border-style: solid; -// $switch-paddle-transition-speed: .1s; -// $switch-paddle-transition-ease: ease-out; -// $switch-positive-color: lighten($success-color, 50%); -// $switch-negative-color: #f5f5f5; - -// Outline Style for tabbing through switches - -// $switch-label-outline: 1px dotted #888; - -// -// Table Variables -// - -// These control the background color for the table and even rows - -// $table-bg: #fff; -// $table-even-row-bg: #f9f9f9; - -// These control the table cell border style - -// $table-border-style: solid; -// $table-border-size: 1px; -// $table-border-color: #ddd; - -// These control the table head styles - -// $table-head-bg: #f5f5f5; -// $table-head-font-size: emCalc(14); -// $table-head-font-color: #222; -// $table-head-font-weight: bold; -// $table-head-padding: emCalc(8, 10, 10); - -// These control the row padding and font styles - -// $table-row-padding: emCalc(9, 10); -// $table-row-font-size: emCalc(14); -// $table-row-font-color: #222; -// $table-line-height: emCalc(18); - -// These are for controlling the display and margin of tables - -// $table-display: table-cell; -// $table-margin-bottom: emCalc(20); - -// -// Image Thumbnail Variables -// - -// We use these to control border styles - -// $thumb-border-style: solid; -// $thumb-border-width: 4px; -// $thumb-border-color: #fff; -// $thumb-box-shadow: 0 0 0 1px rgba(#000,.2); -// $thumb-box-shadow-hover: 0 0 6px 1px rgba($primary-color,0.5); - -// Radius and transition speed for thumbs - -// $thumb-radius: $global-radius; -// $thumb-transition-speed: 200ms; - -// -// Tooltip Variables -// - -// $has-tip-border-bottom: dotted 1px #ccc; -// $has-tip-font-weight: bold; -// $has-tip-font-color: #333; -// $has-tip-border-bottom-hover: dotted 1px darken($primary-color, 20%); -// $has-tip-font-color-hover: $primary-color; -// $has-tip-cursor-type: help; - -// $tooltip-padding: emCalc(8); -// $tooltip-bg: #000; -// $tooltip-font-size: emCalc(15); -// $tooltip-font-weight: bold; -// $tooltip-font-color: #fff; -// $tooltip-line-height: 1.3; -// $tooltip-close-font-size: emCalc(10); -// $tooltip-close-font-weight: normal; -// $tooltip-close-font-color: #888; -// $tooltip-font-size-sml: emCalc(14); -// $tooltip-radius: $global-radius; -// $tooltip-pip-size: 5px; - -// -// Top Bar Variables -// - -// Background color for the top bar - -// $topbar-bg: #222; - -// Height and margin - -$topbar-height: 48px; -// $topbar-margin-bottom: emCalc(30); - -// Control Input height for top bar - -// $topbar-input-height: 2.45em; - -// Controlling the styles for the title in the top bar - -// $topbar-title-weight: bold; -// $topbar-title-font-size: emCalc(17); - -// Style the top bar dropdown elements - -// $topbar-dropdown-bg: #222; -// $topbar-dropdown-link-color: #fff; -// $topbar-dropdown-link-bg: lighten($topbar-bg, 5%); -// $topbar-dropdown-toggle-size: 5px; -// $topbar-dropdown-toggle-color: #fff; -// $topbar-dropdown-toggle-alpha: 0.5; - -// Set the link colors and styles for top-level nav - -// $topbar-link-color: #fff; -// $topbar-link-color-hover: #fff; -// $topbar-link-color-active: #fff; -// $topbar-link-weight: bold; -$topbar-link-font-size: emCalc(16); -// $topbar-link-hover-lightness: -30%; // Darken by 30% -// $topbar-link-bg-hover: darken($topbar-bg, 3%); -// $topbar-link-bg-active: darken($topbar-bg, 3%); - -// $topbar-dropdown-label-color: #555; -// $topbar-dropdown-label-text-transform: uppercase; -// $topbar-dropdown-label-font-weight: bold; -// $topbar-dropdown-label-font-size: emCalc(10); - -// Top menu icon styles - -// $topbar-menu-link-transform: uppercase; -// $topbar-menu-link-font-size: emCalc(13); -// $topbar-menu-link-weight: bold; -// $topbar-menu-link-color: #fff; -// $topbar-menu-icon-color: #fff; -// $topbar-menu-link-color-toggled: #888; -// $topbar-menu-icon-color-toggled: #888; - -// Transitions and breakpoint styles - -// $topbar-transition-speed: 300ms; -// $topbar-breakpoint: emCalc(940); // Change to 9999px for always mobile layout -// $topbar-media-query: "only screen and (min-width: #{$topbar-breakpoint})"; - -// Divider Styles - -// $topbar-divider-border-bottom: solid 1px lighten($topbar-bg, 10%); -// $topbar-divider-border-top: solid 1px darken($topbar-bg, 10%); - -// Sticky Class - -// $topbar-sticky-class: ".sticky"; - - -@import 'foundation4/foundation'; - -textarea { - min-height: emCalc(120) !important; -} - -a { - &:link { - color: #000; - } - - &:visited { - color: #000; - } - - &:hover { - color: $primary-color; - } -} - diff --git a/app/assets/stylesheets/search/gmaps4rails.css b/app/assets/stylesheets/search/gmaps4rails.css deleted file mode 100644 index 4fd99ae8f2..0000000000 --- a/app/assets/stylesheets/search/gmaps4rails.css +++ /dev/null @@ -1,19 +0,0 @@ -.map_container { - padding: 6px; - border-width: 1px; - border-style: solid; - border-color: #ccc #ccc #999 #ccc; - -webkit-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px; - -moz-box-shadow: rgba(64, 64, 64, 0.5) 0 2px 5px; - box-shadow: rgba(64, 64, 64, 0.1) 0 2px 5px; - width: 645px; -} - -.gmaps4rails_map { - width: 630px; - height: 530px; -} - -.map_container img { - max-width: none; -} diff --git a/app/assets/stylesheets/search/home.css.scss b/app/assets/stylesheets/search/home.css.scss deleted file mode 100644 index 7580aa69f0..0000000000 --- a/app/assets/stylesheets/search/home.css.scss +++ /dev/null @@ -1,125 +0,0 @@ -// Place all the styles related to the home controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ - -@import "foundation4/foundation/variables"; -@import "foundation4/foundation/components/global"; -@import "foundation4/foundation/components/buttons"; -@import "foundation4/foundation/components/panels"; - -#postcode_select_box { - text-align: center; - padding: 18% 0; - - p { - color: white; - font-size: 1.1em; - } - - input { - font-size: 2em; - } - - .button-huge { - $padding: emCalc(21); - $bg: $primary-color; - $radius: true; - $full-width: false; - $disabled: false; - $is-input: false; - - @include button($padding, $bg, $radius, $full-width, $disabled, $is-input); - } - - a { - &:link { - color: #FFF; - } - &:visited { - color: #FFF; - } - &:hover { - color: $primary-color; - } - } -} - -.backstretch img { - opacity: 0.4; - filter: alpha(opacity=40); -} - -.bgwidth { - width: 100%; -} - -.bgheight { - height: 100%; -} - -#home-page-nav -{ - ul { - margin: 0; - padding: 0; - - li { - list-style-type: none; - display: inline; - font-size: 1.2em; - font-weight: bold; - color: #FFF; - - &:before { - content: " | "; - } - - &:first-child { - &:before { - content: none; - } - } - } - } -} - -#sidebar { - border: none; -} - -.login-panel { - $bg: #222; - $padding: emCalc(20); - $adjust: true; - - @include panel($bg, $padding, $adjust); -} - -.centered { - text-align: center; -} - -#logo-container { - margin-bottom: emCalc(25); -} - -.clearfix:after { - content: "."; - display: block; - clear: both; - visibility: hidden; - line-height: 0; - height: 0; -} - -.clearfix { - display: inline-block; -} - -html[xmlns] .clearfix { - display: block; -} - -* html .clearfix { - height: 1%; -} diff --git a/app/assets/stylesheets/search/offcanvas.css b/app/assets/stylesheets/search/offcanvas.css deleted file mode 100644 index aac3008530..0000000000 --- a/app/assets/stylesheets/search/offcanvas.css +++ /dev/null @@ -1,51 +0,0 @@ -/* Off canvas layout CSS/JS provided by or adapted from work by Jason Weaver and Luke Wroblewski Requires globals.css grid.css */ -body.off-canvas { padding: 0; margin: 0; overflow: hidden} - -.container { width: 100%; } - -.row { overflow: hidden; } - -.row .row { overflow: visible; } - -.paneled .container { overflow: hidden; } - -.paneled .row { width: 100%; } - -[role="main"]:before { content: " "; position: absolute; z-index: -1; top: 0; left: -100%; width: 100%; height: 100%; } - -[role="complementary"], [role="main"] { width: 100%; padding: 0 15px; display: block; position: relative; z-index: 1; -webkit-transition: 0.25s all ease-in; -moz-transition: 0.25s all ease-in; -o-transition: 0.25s all ease-in; transition: 0.25s all ease-in; } - -.paneled [role="main"] { padding: 0; } - -.page-panel { width: 100%; padding: 0 15px; -webkit-transition: 0.3s margin ease-in-out; -moz-transition: 0.3s margin ease-in-out; -o-transition: 0.3s margin ease-in-out; transition: 0.3s margin ease-in-out; background: #fff; } - -#switchPanels { margin: 0 -15px; } - -.hide-extras [role="complementary"] { display: block; } - -[role="navigation"]#topMenu { -webkit-transition: 0.25s all ease-in; -moz-transition: 0.25s all ease-in; -o-transition: 0.25s all ease-in; transition: 0.25s all ease-in; } - -[role="navigation"]#topMenu ul { margin-top: 0; } - -[role="complementary"] { margin-left: -100%; width: 400px; float: left; z-index: 2; } - -[role="main"] { margin-left: 0; float: right; z-index: 1; position: relative; } - -.paneled [role="main"] { background: #fff; width: 500%; overflow: hidden; float: none; position: relative; left: 0; -webkit-transition: 0.15s all ease-in; -moz-transition: 0.15s all ease-in; -o-transition: 0.15s all ease-in; transition: 0.15s all ease-in; } - -.page-panel { min-height: 400px; float: left; margin: 0; width: 20%; } - -.active [role="complementary"] { margin-left: 0; } - -.active [role="main"] { margin-right: -420px; } - -.active-menu [role="navigation"]#topMenu { margin-top: 0 !important; } - -@media all and (min-width: 768px) { menu-button, .sidebar-button { display: none; } - /*[role="complementary"] { width: 20%; margin-left: 0; float: left; padding: 0 15px; }*/ - [role="main"] { width: 100%; padding: 0 15px; } - .paneled [role="main"] { width: 100%; padding: 0; background: #f4f4f4; left: 0 !important; } - .page-panel { display: block; min-height: 800px; float: none; margin: 0; width: 100%; background: #f4f4f4; } - .hide-extras [role="main"] { width: 100%; } - .hide-extras [role="complementary"] { display: none; } - [role="navigation"]#topMenu { display: none; } } \ No newline at end of file diff --git a/app/assets/stylesheets/search/products.css.scss b/app/assets/stylesheets/search/products.css.scss deleted file mode 100644 index 7deb5c73ae..0000000000 --- a/app/assets/stylesheets/search/products.css.scss +++ /dev/null @@ -1,8 +0,0 @@ -@import "foundation4/foundation/variables"; -@import "foundation4/foundation/components/global"; - -.products { - margin: 0, emCalc(20); - border: 1px solid black; - padding: emCalc(10); -} diff --git a/app/assets/stylesheets/search/temp_landing_page.css.scss b/app/assets/stylesheets/search/temp_landing_page.css.scss deleted file mode 100644 index 566b1d5e9f..0000000000 --- a/app/assets/stylesheets/search/temp_landing_page.css.scss +++ /dev/null @@ -1,65 +0,0 @@ -@import "foundation4/foundation/variables"; -@import "foundation4/foundation/components/global"; - -.landing-page-row { - padding-top: emCalc(40); - padding-bottom: emCalc(30); - - #environment { - font-size: 110%; - font-weight: bold; - padding: emCalc(5); - border-radius: emCalc(5); - background-color: #98ca45; - } -} - -.distributor-link-row { - padding: emCalc(5) 0; -} - -.with-bottom-border { - border-bottom: 1px solid #d9d9d9; -} - -.with-pin-bg { - background-image: url('../pin_bg.png'); - background-repeat: no-repeat; - background-position: center; - min-height: 200px; -} - -a.inactive { - color: #6a6a6a; -} - -.secondary { - color: #6a6a6a; -} - -.group-header { - min-height: emCalc(55); - vertical-align: top; -} - -@media only screen and (max-width: 768px) { - .hub_group.landing-page-row { - padding-bottom: 0px; - &.with-bottom-border { - padding-top: 0px; - } - & > .columns { - margin-bottom: 60px; - } - } - .group-header { - min-height: 0px; - } -} -.top-bar-section ul li { - float: left; -} -.top-bar-section .divider, .top-bar-section [role="separator"] { - clear: none; - width: 0px; -} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3a4de9aaf6..0d55b82b05 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -40,7 +40,7 @@ class ApplicationController < ActionController::Base # (vic.openfoodnetwork.org) that has the SSL certificate. Redirect all requests to this # domain to avoid showing customers a scary invalid certificate error. def require_certified_hostname - certified_host = "vic.openfoodnetwork.org" + certified_host = "openfoodnetwork.org.au" if Rails.env.production? && request.host != certified_host redirect_to "http://#{certified_host}#{request.fullpath}" diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 43c5216a8a..592388c243 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -5,14 +5,6 @@ class HomeController < BaseController @active_distributors ||= Enterprise.distributors_with_active_order_cycles end - def new_landing_page - end - def about_us end - - def temp_landing_page - @groups = EnterpriseGroup.on_front_page.by_position - render layout: false - end end diff --git a/app/views/home/_hubs.html.haml b/app/views/home/_hubs.html.haml index 9e0d08c20b..cc893f5997 100644 --- a/app/views/home/_hubs.html.haml +++ b/app/views/home/_hubs.html.haml @@ -26,7 +26,7 @@ %hub.active_table_node.row{"ng-repeat" => "hub in filteredHubs = (hubs | hubs:query)", "ng-class" => "{'closed' : !open(), 'open' : open(), 'inactive' : !hub.active, 'current' : current()}", "ng-controller" => "HubNodeCtrl", - id: "{{hub.path}}"} + id: "{{hub.hash}}"} .small-12.columns = render partial: 'home/skinny' = render partial: 'home/fat' diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 52d0b74601..ab46b1f139 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -22,7 +22,7 @@ = display_flash_messages %ofn-flash - = render "shared/sidebar" + -#= render "shared/sidebar" %section{ role: "main" } = yield diff --git a/app/views/shared/_account_sidebar.html.haml b/app/views/shared/_account_sidebar.html.haml index 884f6c06c6..041ac97765 100644 --- a/app/views/shared/_account_sidebar.html.haml +++ b/app/views/shared/_account_sidebar.html.haml @@ -1,20 +1,20 @@ -#account{"ng-controller" => "AccountSidebarCtrl"} - .row - .panel - %p - %strong= link_to "Manage my account", account_path - - if enterprise_user? - %strong= link_to "Enterprise admin", admin_path - - if order = last_completed_order - %dl - %dt Current Hub: - %dd= link_to current_distributor.name, main_app.shop_path - %br - %dt Last hub: - %dd - - if order.distributor != current_distributor - = link_to "#{order.distributor.name}".html_safe, "", - {class: distributor_link_class(order.distributor), - "ng-click" => "emptyCart('#{main_app.shop_enterprise_path(order.distributor)}', $event)"} - - else - = order.distributor.name +-##account{"ng-controller" => "AccountSidebarCtrl"} + -#.row + -#.panel + -#%p + -#%strong= link_to "Manage my account", account_path + -#- if enterprise_user? + -#%strong= link_to "Enterprise admin", admin_path + -#- if order = last_completed_order + -#%dl + -#%dt Current Hub: + -#%dd= link_to current_distributor.name, main_app.shop_path + -#%br + -#%dt Last hub: + -#%dd + -#- if order.distributor != current_distributor + -#= link_to "#{order.distributor.name}".html_safe, "", + -#{class: distributor_link_class(order.distributor), + -#"ng-click" => "emptyCart('#{main_app.shop_enterprise_path(order.distributor)}', $event)"} + -#- else + -#= order.distributor.name diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 46a02da534..721e9f137c 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -25,7 +25,7 @@ %li %a{href: ""} Map %li - %a{href: producers_path} Producers + %a{href: ""} Producers %li %a{href: ""} Groups .small-4.columns.text-left @@ -46,6 +46,8 @@ | %a{href:'' } Creative Commons | - %a{href:'' } Github - | - %a{href:'' } Developers + %a{href:"https://github.com/openfoodfoundation/openfoodnetwork", target: "_blank" } Github + + // To be added when Guy's pretty landing page is up: + //| + //%a{href:'' } Developers diff --git a/app/views/shared/_signed_out.html.haml b/app/views/shared/_signed_out.html.haml index 660d75405f..aec309de0f 100644 --- a/app/views/shared/_signed_out.html.haml +++ b/app/views/shared/_signed_out.html.haml @@ -1,5 +1,5 @@ %li#login-link %a{"ng-click" => "open()"} %i.fi-lock - LOGIN + LOG IN diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml index 75fb0e7121..f747072b10 100644 --- a/app/views/shared/menu/_large_menu.html.haml +++ b/app/views/shared/menu/_large_menu.html.haml @@ -1,23 +1,33 @@ -%nav.top-bar.hide-for-small{'data' => 'topbar'} +%nav.top-bar.show-for-large-only{'data' => 'topbar'} %section.top-bar-section - %ul.left + %ul.left{} %li= link_to image_tag("ofn_logo_small.png"), root_path %li.divider - %li - %a - %span.nav-primary{href: ""} Shop + - if current_page? root_path + %li + %a{"ofn-scroll-to" => "hubs"} + %span.nav-primary Hubs + - else + %li + %a{href: root_path + "#/#hubs"} + %span.nav-primary Hubs %li.divider %li - %a - %span.nav-primary{href: ""} Map + %a{href: ""} + %span.nav-primary Map %li.divider %li - %a - %span.nav-primary{href: main_app.producers_path} Producers + %a{href: main_app.producers_path} + %span.nav-primary Producers %li.divider %li - %a - %span.nav-primary{href: ""} Groups + %a{href: ""} + %span.nav-primary Groups + %li.divider + - if spree_current_user.andand.has_spree_role? 'admin' + %li + %a{href: spree.admin_path} + %span.nav-primary Admin %li.divider %section.top-bar-section %ul.right{"ng-controller" => "AuthenticationCtrl"} diff --git a/app/views/shared/menu/_menu.html.haml b/app/views/shared/menu/_menu.html.haml index d8f721d71b..d673a962db 100644 --- a/app/views/shared/menu/_menu.html.haml +++ b/app/views/shared/menu/_menu.html.haml @@ -1,3 +1,3 @@ .fixed = render partial: "shared/menu/large_menu" - = render partial: "shared/menu/mobile_menu" += render partial: "shared/menu/mobile_menu" diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml index 8248d19b14..a33cb85c11 100644 --- a/app/views/shared/menu/_mobile_menu.html.haml +++ b/app/views/shared/menu/_mobile_menu.html.haml @@ -1,23 +1,52 @@ -%aside.left-off-canvas-menu.show-for-small +%nav.tab-bar.show-for-medium-down + %section.left + %a.left-off-canvas-toggle.menu-icon + %span + %section.right + %a.nav-branded.icon{href: cart_url} + %i.fi-shopping-cart + %span + = cart_count + items + %a{href: main_app.shop_path} + {{ CurrentHub.name }} + +%aside.left-off-canvas-menu.show-for-medium-down %ul.off-canvas-list %li= link_to image_tag("ofn_logo_small.png"), root_path - %li - %a{href: main_app.producers_path} Producers + + - if spree_current_user.andand.has_spree_role? 'admin' + %li + %a{href: spree.admin_path} + %span.nav-primary Admin %li - if spree_current_user.nil? = render 'shared/signed_out' - else = render 'shared/signed_in' -%nav.tab-bar.show-for-small - %section.left-small - %a.left-off-canvas-toggle.menu-icon - %span - %a{href: main_app.shop_path} - {{ CurrentHub.name }} - %section.right-small - %a.icon{href: cart_url} - %i.fi-shopping-cart - %span - = cart_count - items + %li + %a{href: main_app.producers_path} Producers + + - if current_page? root_path + %li + %a{"ofn-scroll-to" => "hubs"} + %span.nav-primary Hubs + - else + %li + %a{href: root_path + "#/#hubs"} + %span.nav-primary Hubs + + %li + %a{href: ""} + %span.nav-primary Map + + %li + %a{href: main_app.producers_path} + %span.nav-primary Producers + + %li + %a{href: ""} + %span.nav-primary Groups + + diff --git a/app/views/spree/api/variants/units_show.v1.rabl b/app/views/spree/api/variants/units_show.v1.rabl index 326508bd4a..634213e53f 100644 --- a/app/views/spree/api/variants/units_show.v1.rabl +++ b/app/views/spree/api/variants/units_show.v1.rabl @@ -1,4 +1,9 @@ object @variant attributes :id -node( :unit_text ) { |v| v.product.name + (v.options_text.empty? ? "" : ": " + v.options_text) } + +node( :unit_text ) do |v| + options_text = v.options_text + v.product.name + (options_text.empty? ? "" : ": #{options_text}") +end + node( :unit_value ) { |v| v.unit_value } diff --git a/app/views/spree/user_mailer/signup_confirmation.text.erb b/app/views/spree/user_mailer/signup_confirmation.text.erb index c6e57efc8a..295b4c9e8f 100644 --- a/app/views/spree/user_mailer/signup_confirmation.text.erb +++ b/app/views/spree/user_mailer/signup_confirmation.text.erb @@ -2,7 +2,7 @@ Hello, Welcome to Australia's Open Food Network! Your login email is <%= @user.email %> -You can go online and start shopping through food hubs and local producers you like at vic.openfoodnetwork.org.au +You can go online and start shopping through food hubs and local producers you like at http://openfoodnetwork.org.au We welcome all your questions and feedback; you can use the Send Feedback button on the site or email us at hello@openfoodnetwork.org diff --git a/config/application.rb b/config/application.rb index f36691ebb5..45c6e2a540 100644 --- a/config/application.rb +++ b/config/application.rb @@ -63,7 +63,10 @@ module Openfoodnetwork # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.default_locale = 'en' - I18n.config.enforce_available_locales = true + # Setting this to true causes a performance regression in Rails 3.2.17 + # When we're on a version with the fix below, we can set it to true + # https://github.com/svenfuchs/i18n/issues/230 + I18n.config.enforce_available_locales = false # Configure the default encoding used in templates for Ruby 1.9. config.encoding = "utf-8" diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index b839c69ce5..44e8d58a59 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -10,14 +10,6 @@ feature %q{ stub_authorization! - before :all do - @default_wait_time = Capybara.default_wait_time - Capybara.default_wait_time = 10 - end - - after :all do - Capybara.default_wait_time = @default_wait_time - end context "listing orders" do before :each do admin_user = quick_login_as_admin diff --git a/spec/javascripts/unit/darkswarm/controllers/sidebar_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/sidebar_controller_spec.js.coffee deleted file mode 100644 index c1b4095564..0000000000 --- a/spec/javascripts/unit/darkswarm/controllers/sidebar_controller_spec.js.coffee +++ /dev/null @@ -1,14 +0,0 @@ -describe "SidebarCtrl", -> - ctrl = null - scope = null - location = null - - beforeEach -> - module("Darkswarm") - location = - path: -> - "/login" - inject ($controller, $rootScope) -> - scope = $rootScope - ctrl = $controller 'SidebarCtrl', {$scope: scope, $location: location} - scope.$apply() diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1cca8f976b..b8b4f8e03b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -11,7 +11,6 @@ ENV["RAILS_ENV"] ||= 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'capybara' -require 'capybara-screenshot/rspec' require 'database_cleaner' # Allow connections to phantomjs/selenium whilst raising errors @@ -48,7 +47,6 @@ end Capybara.default_wait_time = 30 - require "paperclip/matchers" RSpec.configure do |config|