updated scaffolds

OnroerendErfgoed · Feb 18, 2015 · 7c4112f · 7c4112f
1 parent 197cad5
commit 7c4112f
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 272 deletions.
diff --git a/pyoes/scaffolds/pyoes_admin_scaffold/+package+/readme.txt b/pyoes/scaffolds/pyoes_admin_scaffold/+package+/readme.txt
@@ -0,0 +1,6 @@
+
+
+// When upgrading scaffold do not forget to update following settings:
+
+./src/config.rb => path to foundation/font-awesome
+./src/resources/scss/_oe-settings.scss => set "$fa-font-path" to font path in font-awesome folder
diff --git a/pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/bower.json b/pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/bower.json
@@ -3,6 +3,7 @@
   "version": "0.0.1",
   "private": "true",
   "dependencies": {
-    "foundation": "~5.5.0"
+    "foundation": "~5.5.0",
+    "font-awesome": "~4.3.0"
   }
 }
diff --git a/pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/config.rb b/pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/config.rb
@@ -1,6 +1,6 @@
 # Require any additional compass plugins here.                                  
 add_import_path "src/foundation/scss"
-add_import_path "src/foundation-icon-fonts"
+add_import_path "src/font-awesome/scss"
 
 # Set this to the root of your project when deployed:
 http_path = "/"

diff --git a/pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/app.scss b/pyoes/scaffolds/pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/app.scss
@@ -1,11 +1,11 @@
 @import "pyoes/settings";
 @import "pyoes/oe-settings";
 @import "foundation";
+@import "font-awesome";
 @import "pyoes/oe-header";
 @import "pyoes/oe-footer";
 @import "pyoes/oe-type";
 @import "pyoes/oe-headings";
-@import "pyoes/oe-icontype";
 @import "pyoes/oe-lists";
 @import "pyoes/oe-statistics";
 @import "pyoes/oe-search";

diff --git a/.../pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-header.scss b/.../pyoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-header.scss
@@ -40,7 +40,7 @@
 
 .bgimage 		{
  				background:url(../img/pyoes/header-img.jpg);
- 				width:960px;
+ 				width:80%;
  				height:135px;
  				position:absolute;
  				right:0;

diff --git a/...yoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss b/...yoes_admin_scaffold/+package+/static/admin/src/app/resources/scss/pyoes/_oe-settings.scss
@@ -117,6 +117,8 @@ $body-font-style: normal;
 // We use this to control font-smoothing
 $font-smoothing: antialiased;
 
+// Overwrite font-awesome font dir
+$fa-font-path: "../src/font-awesome/fonts";
 
 // d. Media Query Ranges
 // - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/bower.json b/pyoes/scaffolds/pyoes_scaffold/+package+/static/bower.json
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/bower.json_tmpl b/pyoes/scaffolds/pyoes_scaffold/+package+/static/bower.json_tmpl
@@ -0,0 +1,9 @@
+{
+  "name": "{{package}}",
+  "version": "0.0.1",
+  "private": "true",
+  "dependencies": {
+    "foundation": "~5.5.0",
+    "font-awesome": "~4.3.0"
+  }
+}
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/config.rb b/pyoes/scaffolds/pyoes_scaffold/+package+/static/config.rb
@@ -1,5 +1,6 @@
 # Require any additional compass plugins here.                                  
-add_import_path "bower_components/foundation/scss" 
+add_import_path "bower_components/foundation/scss"
+add_import_path "bower_components/font-awesome/scss"
 
 # Set this to the root of your project when deployed:
 http_path = "/"

diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/FontAwesome.otf b/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/FontAwesome.otf
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.eot b/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.eot
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.svg b/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.svg
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.ttf b/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.ttf
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.woff b/pyoes/scaffolds/pyoes_scaffold/+package+/static/fonts/fontawesome-webfont.woff
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/app.scss b/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/app.scss
@@ -1,11 +1,11 @@
 @import "pyoes/settings";
 @import "pyoes/oe-settings";
 @import "foundation";
+@import "font-awesome";
 @import "pyoes/oe-header";
 @import "pyoes/oe-footer";
 @import "pyoes/oe-type";
 @import "pyoes/oe-headings";
-@import "pyoes/oe-icontype";
 @import "pyoes/oe-lists";
 @import "pyoes/oe-statistics";
 @import "pyoes/oe-search";

diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-header.scss b/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-header.scss
@@ -40,7 +40,7 @@
 
 .bgimage 		{
  				background:url(../img/pyoes/header-img.jpg);
- 				width:960px;
+ 				width:80%;
  				height:135px;
  				position:absolute;
  				right:0;

diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-icontype.scss b/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-icontype.scss
diff --git a/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-settings.scss b/pyoes/scaffolds/pyoes_scaffold/+package+/static/scss/pyoes/_oe-settings.scss
@@ -117,6 +117,8 @@ $body-font-style: normal;
 // We use this to control font-smoothing
 $font-smoothing: antialiased;
 
+// Overwrite font-awesome font dir
+$fa-font-path: "../bower_components/font-awesome/fonts";
 
 // d. Media Query Ranges
 // - - - - - - - - - - - - - - - - - - - - - - - - -