raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keeping Foundation 4 and 5 parallel

Browse Source
This commit is contained in:
Will Marshall
2014-03-24 16:07:58 +11:00
parent 8f56b829cb
commit e4bb2f1cdf
10 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/darkswarm/all.js.coffee
View File

@@ -12,5 +12,7 @@
#= require_tree .
$ ->
# Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
Foundation.set_namespace = function() {};
$(document).foundation()
$(document).foundation({reveal: {animation: 'fade'}})

6
app/assets/stylesheets/search/auto_complete.css.scss
View File

@@ -1,5 +1,5 @@
@import "foundation/variables";
@import "foundation/components/global";
@import "foundation4/foundation/variables";
@import "foundation4/foundation/components/global";
ul.ui-autocomplete {
position: absolute;
@@ -31,4 +31,4 @@ ul.ui-autocomplete {
background-color: #FFFCB2;
}
}
}
}

6
app/assets/stylesheets/search/enteprise_search.css.scss
View File

@@ -1,5 +1,5 @@
@import "foundation/variables";
@import "foundation/components/global";
@import "foundation4/foundation/variables";
@import "foundation4/foundation/components/global";
.search-result {
min-height: 3em;
@@ -13,4 +13,4 @@
.with-separator {
border-bottom: 1px solid #E0E0E0;
}
}

3
app/assets/stylesheets/search/foundation_and_overrides.scss
View File

@@ -380,6 +380,7 @@ $default-float: left;
// $button-radius: $global-radius;
// $button-round: $global-rounded;
// We use this to set default opacity for disabled buttons.
// $button-disabled-opacity: 0.6;
@@ -1301,7 +1302,7 @@ $topbar-link-font-size: emCalc(16);
// $topbar-sticky-class: ".sticky";
@import 'foundation';
@import 'foundation4/foundation';
textarea {
min-height: emCalc(120) !important;

8
app/assets/stylesheets/search/home.css.scss
View File

@@ -2,10 +2,10 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
@import "foundation/variables";
@import "foundation/components/global";
@import "foundation/components/buttons";
@import "foundation/components/panels";
@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;

6
app/assets/stylesheets/search/products.css.scss
View File

@@ -1,8 +1,8 @@
@import "foundation/variables";
@import "foundation/components/global";
@import "foundation4/foundation/variables";
@import "foundation4/foundation/components/global";
.products {
margin: 0, emCalc(20);
border: 1px solid black;
padding: emCalc(10);
}
}

4
app/assets/stylesheets/search/temp_landing_page.css.scss
View File

@@ -1,5 +1,5 @@
@import "foundation/variables";
@import "foundation/components/global";
@import "foundation4/foundation/variables";
@import "foundation4/foundation/components/global";
.landing-page-row {
padding-top: emCalc(40);