diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..3e3cca6 Binary files /dev/null and b/.DS_Store differ diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000..c328838 Binary files /dev/null and b/app/.DS_Store differ diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store new file mode 100644 index 0000000..d2c18bf Binary files /dev/null and b/app/assets/.DS_Store differ diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store new file mode 100644 index 0000000..2bd7626 Binary files /dev/null and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/favicon/tree-14a-114-195103.png b/app/assets/images/favicon/tree-14a-114-195103.png new file mode 100644 index 0000000..5538398 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-114-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-120-195103.png b/app/assets/images/favicon/tree-14a-120-195103.png new file mode 100644 index 0000000..d40b821 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-120-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-144-195103.png b/app/assets/images/favicon/tree-14a-144-195103.png new file mode 100644 index 0000000..b30884a Binary files /dev/null and b/app/assets/images/favicon/tree-14a-144-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-152-195103.png b/app/assets/images/favicon/tree-14a-152-195103.png new file mode 100644 index 0000000..3f100dc Binary files /dev/null and b/app/assets/images/favicon/tree-14a-152-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-16-195103.png b/app/assets/images/favicon/tree-14a-16-195103.png new file mode 100644 index 0000000..658e5b3 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-16-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-24-195103.png b/app/assets/images/favicon/tree-14a-24-195103.png new file mode 100644 index 0000000..c424175 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-24-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-32-195103.png b/app/assets/images/favicon/tree-14a-32-195103.png new file mode 100644 index 0000000..bcaa372 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-32-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-48-195103.png b/app/assets/images/favicon/tree-14a-48-195103.png new file mode 100644 index 0000000..b4536c6 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-48-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-57-195103.png b/app/assets/images/favicon/tree-14a-57-195103.png new file mode 100644 index 0000000..845c439 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-57-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-64-195103.png b/app/assets/images/favicon/tree-14a-64-195103.png new file mode 100644 index 0000000..63b1ad3 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-64-195103.png differ diff --git a/app/assets/images/favicon/tree-14a-72-195103.png b/app/assets/images/favicon/tree-14a-72-195103.png new file mode 100644 index 0000000..12f8139 Binary files /dev/null and b/app/assets/images/favicon/tree-14a-72-195103.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3db896f..1104357 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,6 +12,7 @@ * *= require flash_messages *= require chosen + *= require font_references */ @import "bootstrap-sprockets"; diff --git a/app/assets/stylesheets/font_references.scss b/app/assets/stylesheets/font_references.scss new file mode 100644 index 0000000..33edd70 --- /dev/null +++ b/app/assets/stylesheets/font_references.scss @@ -0,0 +1,62 @@ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: local('Open Sans Light'), local('OpenSans-Light'), font_url("open-sans-light.woff2") format('woff2'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: local('Open Sans'), local('OpenSans'), font_url("open-sans.woff2") format('woff2'); +} +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), font_url("open-sans-bold.woff2") format('woff2'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 400; + src: local('Open Sans Italic'), local('OpenSans-Italic'), font_url("open-sans-italic.woff2") format('woff2'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), font_url("open-sans-light-italic.woff2") format('woff2'); +} +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 700; + src: local('Open Sans Bold Italic'), local('OpenSans-BoldItalic'), font_url("open-sans-bold-italic.woff2") format('woff2'); +} + + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), font_url("roboto-light.woff2") format('woff2'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), font_url("roboto.woff2") format('woff2'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), font_url("roboto-medium.woff2") format('woff2'); +} +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), font_url("roboto-bold.woff2") format('woff2'); +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d82e36e..bfdd3be 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,10 @@ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + + + + <%= csrf_meta_tags %> diff --git a/config/application.rb b/config/application.rb index 3c79850..275f52c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -22,5 +22,7 @@ module Parsley # Do not swallow errors in after_commit/after_rollback callbacks. config.active_record.raise_in_transactional_callbacks = true + + config.assets.precompile << Proc.new { |filename, path| puts "#{filename}, #{path}"; yea =%w(.eot .svg .tff .woff .woff2).include?(File.extname(filename)); puts yea; yea } end end diff --git a/public/favicon.ico b/public/favicon.ico index e69de29..56a044b 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/vendor/assets/fonts/open-sans-bold-italic.woff2 b/vendor/assets/fonts/open-sans-bold-italic.woff2 new file mode 100644 index 0000000..646a4f7 Binary files /dev/null and b/vendor/assets/fonts/open-sans-bold-italic.woff2 differ diff --git a/vendor/assets/fonts/open-sans-bold.woff2 b/vendor/assets/fonts/open-sans-bold.woff2 new file mode 100644 index 0000000..51c75ca Binary files /dev/null and b/vendor/assets/fonts/open-sans-bold.woff2 differ diff --git a/vendor/assets/fonts/open-sans-italic.woff2 b/vendor/assets/fonts/open-sans-italic.woff2 new file mode 100644 index 0000000..005b450 Binary files /dev/null and b/vendor/assets/fonts/open-sans-italic.woff2 differ diff --git a/vendor/assets/fonts/open-sans-light-italic.woff2 b/vendor/assets/fonts/open-sans-light-italic.woff2 new file mode 100644 index 0000000..b10b85b Binary files /dev/null and b/vendor/assets/fonts/open-sans-light-italic.woff2 differ diff --git a/vendor/assets/fonts/open-sans-light.woff2 b/vendor/assets/fonts/open-sans-light.woff2 new file mode 100644 index 0000000..cf3ec55 Binary files /dev/null and b/vendor/assets/fonts/open-sans-light.woff2 differ diff --git a/vendor/assets/fonts/open-sans.woff2 b/vendor/assets/fonts/open-sans.woff2 new file mode 100644 index 0000000..402dfd7 Binary files /dev/null and b/vendor/assets/fonts/open-sans.woff2 differ diff --git a/vendor/assets/fonts/roboto-bold.woff2 b/vendor/assets/fonts/roboto-bold.woff2 new file mode 100644 index 0000000..3b2dd4e Binary files /dev/null and b/vendor/assets/fonts/roboto-bold.woff2 differ diff --git a/vendor/assets/fonts/roboto-light.woff2 b/vendor/assets/fonts/roboto-light.woff2 new file mode 100644 index 0000000..4411cbc Binary files /dev/null and b/vendor/assets/fonts/roboto-light.woff2 differ diff --git a/vendor/assets/fonts/roboto-medium.woff2 b/vendor/assets/fonts/roboto-medium.woff2 new file mode 100644 index 0000000..6be92c7 Binary files /dev/null and b/vendor/assets/fonts/roboto-medium.woff2 differ diff --git a/vendor/assets/fonts/roboto.woff2 b/vendor/assets/fonts/roboto.woff2 new file mode 100644 index 0000000..d1035f9 Binary files /dev/null and b/vendor/assets/fonts/roboto.woff2 differ diff --git a/vendor/assets/stylesheets/paper/_bootswatch.scss b/vendor/assets/stylesheets/paper/_bootswatch.scss index e1cc544..af3dc4a 100644 --- a/vendor/assets/stylesheets/paper/_bootswatch.scss +++ b/vendor/assets/stylesheets/paper/_bootswatch.scss @@ -2,8 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default; -@import url($web-font-path); +//$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default; +//@import url($web-font-path); // Navbar ===================================================================== diff --git a/vendor/assets/stylesheets/sandstone/_bootswatch.scss b/vendor/assets/stylesheets/sandstone/_bootswatch.scss index 9bb6c5e..894cca1 100644 --- a/vendor/assets/stylesheets/sandstone/_bootswatch.scss +++ b/vendor/assets/stylesheets/sandstone/_bootswatch.scss @@ -2,8 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500" !default; -@import url($web-font-path); +//$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:400,500" !default; +//@import url($web-font-path); // Navbar ===================================================================== diff --git a/vendor/assets/stylesheets/spacelab/_bootswatch.scss b/vendor/assets/stylesheets/spacelab/_bootswatch.scss index c33ba63..92a4676 100644 --- a/vendor/assets/stylesheets/spacelab/_bootswatch.scss +++ b/vendor/assets/stylesheets/spacelab/_bootswatch.scss @@ -2,8 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" !default; -@import url($web-font-path); +//$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700" !default; +//@import url($web-font-path); @mixin btn-shadow($color){ @include gradient-vertical-three-colors(lighten($color, 15%), $color, 50%, darken($color, 4%)); diff --git a/vendor/assets/stylesheets/yeti/_bootswatch.scss b/vendor/assets/stylesheets/yeti/_bootswatch.scss index fb9f8a5..76c4a49 100644 --- a/vendor/assets/stylesheets/yeti/_bootswatch.scss +++ b/vendor/assets/stylesheets/yeti/_bootswatch.scss @@ -2,8 +2,8 @@ // Bootswatch // ----------------------------------------------------- -$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default; -@import url($web-font-path); +//$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default; +//@import url($web-font-path); // Navbar =====================================================================