diff --git a/app/assets/stylesheets/semantic-ui/collections/_form.scss b/app/assets/stylesheets/semantic-ui/collections/_form.scss index 7681595..cace064 100644 --- a/app/assets/stylesheets/semantic-ui/collections/_form.scss +++ b/app/assets/stylesheets/semantic-ui/collections/_form.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Form * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/collections/_menu.scss b/app/assets/stylesheets/semantic-ui/collections/_menu.scss index 4b0f8ca..194ed0d 100644 --- a/app/assets/stylesheets/semantic-ui/collections/_menu.scss +++ b/app/assets/stylesheets/semantic-ui/collections/_menu.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Menu * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/elements/_basic.icon.scss b/app/assets/stylesheets/semantic-ui/elements/_basic.icon.scss index 1169bd4..5126c95 100644 --- a/app/assets/stylesheets/semantic-ui/elements/_basic.icon.scss +++ b/app/assets/stylesheets/semantic-ui/elements/_basic.icon.scss @@ -1,7 +1,4 @@ -//= depend_on_asset "semantic-ui/basic.icons.eot" -//= depend_on_asset "semantic-ui/basic.icons.svg" -//= depend_on_asset "semantic-ui/basic.icons.woff" -//= depend_on_asset "semantic-ui/basic.icons.ttf" +@import '../depends/basic.icon'; /* * # Semantic - basic.Icon (Basic) * http://github.com/jlukic/semantic-ui/ diff --git a/app/assets/stylesheets/semantic-ui/elements/_button.scss b/app/assets/stylesheets/semantic-ui/elements/_button.scss index 0b1e41e..381e954 100644 --- a/app/assets/stylesheets/semantic-ui/elements/_button.scss +++ b/app/assets/stylesheets/semantic-ui/elements/_button.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Button * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/elements/_icon.scss b/app/assets/stylesheets/semantic-ui/elements/_icon.scss index 89954f6..450fa39 100644 --- a/app/assets/stylesheets/semantic-ui/elements/_icon.scss +++ b/app/assets/stylesheets/semantic-ui/elements/_icon.scss @@ -1,9 +1,5 @@ - - //= depend_on_asset "semantic-ui/icons.eot" - //= depend_on_asset "semantic-ui/icons.svg" - //= depend_on_asset "semantic-ui/icons.woff" - //= depend_on_asset "semantic-ui/icons.ttf" - /* +@import '../depends/icon'; +/* * # Semantic - Icon * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/elements/_input.scss b/app/assets/stylesheets/semantic-ui/elements/_input.scss index 22ca0cd..cb9e350 100644 --- a/app/assets/stylesheets/semantic-ui/elements/_input.scss +++ b/app/assets/stylesheets/semantic-ui/elements/_input.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Input * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/elements/_loader.scss b/app/assets/stylesheets/semantic-ui/elements/_loader.scss index 38062a6..3b4144e 100644 --- a/app/assets/stylesheets/semantic-ui/elements/_loader.scss +++ b/app/assets/stylesheets/semantic-ui/elements/_loader.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Loader * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/modules/_search.scss b/app/assets/stylesheets/semantic-ui/modules/_search.scss index c976d67..d4bb5a2 100644 --- a/app/assets/stylesheets/semantic-ui/modules/_search.scss +++ b/app/assets/stylesheets/semantic-ui/modules/_search.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Search * http://github.com/jlukic/semantic-ui/ * diff --git a/app/assets/stylesheets/semantic-ui/modules/_tab.scss b/app/assets/stylesheets/semantic-ui/modules/_tab.scss index 4ae526e..fa3cf3f 100644 --- a/app/assets/stylesheets/semantic-ui/modules/_tab.scss +++ b/app/assets/stylesheets/semantic-ui/modules/_tab.scss @@ -1,13 +1,5 @@ - - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - /* +@import '../depends/loader'; +/* * # Semantic - Tab * http://github.com/jlukic/semantic-ui/ * diff --git a/tasks/converter.rb b/tasks/converter.rb index 478d612..f154fe9 100644 --- a/tasks/converter.rb +++ b/tasks/converter.rb @@ -17,30 +17,30 @@ class Converter TOKEN = ENV['TOKEN'] BROWSERS = ['last 2 version', '> 1%', 'opera 12.1', 'safari 6', 'ie 9', 'bb 10', 'android 4'] - DEPENDS = { - icon: %Q{ - //= depend_on_asset "semantic-ui/icons.eot" - //= depend_on_asset "semantic-ui/icons.svg" - //= depend_on_asset "semantic-ui/icons.woff" - //= depend_on_asset "semantic-ui/icons.ttf" - }, - basic_icon: %Q{ - //= depend_on_asset "semantic-ui/basic.icons.eot" - //= depend_on_asset "semantic-ui/basic.icons.svg" - //= depend_on_asset "semantic-ui/basic.icons.woff" - //= depend_on_asset "semantic-ui/basic.icons.ttf" - }, - loader: %Q{ - //= depend_on_asset "semantic-ui/loader-large.gif" - //= depend_on_asset "semantic-ui/loader-mini.gif" - //= depend_on_asset "semantic-ui/loader-small.gif" - //= depend_on_asset "semantic-ui/loader-medium.gif" - //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - } - } + # DEPENDS = { + # icon: %Q{ + # //= depend_on_asset "semantic-ui/icons.eot" + # //= depend_on_asset "semantic-ui/icons.svg" + # //= depend_on_asset "semantic-ui/icons.woff" + # //= depend_on_asset "semantic-ui/icons.ttf" + # }, + # basic_icon: %Q{ + # //= depend_on_asset "semantic-ui/basic.icons.eot" + # //= depend_on_asset "semantic-ui/basic.icons.svg" + # //= depend_on_asset "semantic-ui/basic.icons.woff" + # //= depend_on_asset "semantic-ui/basic.icons.ttf" + # }, + # loader: %Q{ + # //= depend_on_asset "semantic-ui/loader-large.gif" + # //= depend_on_asset "semantic-ui/loader-mini.gif" + # //= depend_on_asset "semantic-ui/loader-small.gif" + # //= depend_on_asset "semantic-ui/loader-medium.gif" + # //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" + # //= depend_on_asset "semantic-ui/loader-small-inverted.gif" + # //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" + # //= depend_on_asset "semantic-ui/loader-large-inverted.gif" + # } + # } def initialize(branch) @repo = 'Semantic-Org/Semantic-UI' @@ -67,31 +67,6 @@ def process store_version end - # def prepare_depend_asset - # icons = %Q{ - # //= depend_on_asset "semantic-ui/icons.eot" - # //= depend_on_asset "semantic-ui/icons.svg" - # //= depend_on_asset "semantic-ui/icons.woff" - # //= depend_on_asset "semantic-ui/icons.ttf" - # } - # base_icons = %Q{ - # //= depend_on_asset "semantic-ui/basic.icons.eot" - # //= depend_on_asset "semantic-ui/basic.icons.svg" - # //= depend_on_asset "semantic-ui/basic.icons.woff" - # //= depend_on_asset "semantic-ui/basic.icons.ttf" - # } - # loader = %Q{ - # //= depend_on_asset "semantic-ui/loader-large.gif" - # //= depend_on_asset "semantic-ui/loader-mini.gif" - # //= depend_on_asset "semantic-ui/loader-small.gif" - # //= depend_on_asset "semantic-ui/loader-medium.gif" - # //= depend_on_asset "semantic-ui/loader-mini-inverted.gif" - # //= depend_on_asset "semantic-ui/loader-small-inverted.gif" - # //= depend_on_asset "semantic-ui/loader-medium-inverted.gif" - # //= depend_on_asset "semantic-ui/loader-large-inverted.gif" - # } - # end - def process_stylesheets_assets main_content = '' semantic_ui_less_paths.each do |path, sha| @@ -218,13 +193,11 @@ def save_file(name, content, path, type='stylesheets') # Check depent asset if name == "icon" - # content = "@import '../depends/icon';\n" + content - content = DEPENDS[:icon] + content + content = "@import '../depends/icon';\n" + content end if name == "basic.icon" - # content = "@import '../depends/base.icon';\n" + content - content = DEPENDS[:base_icon] + content + content = "@import '../depends/basic.icon';\n" + content end content = check_depend_asset(content) @@ -240,8 +213,7 @@ def save_file(name, content, path, type='stylesheets') def check_depend_asset(content) if content.scan(/loader-\w+.gif/).length > 0 - # "@import '../depends/loader';\n" + content - DEPENDS[:loader] + content + "@import '../depends/loader';\n" + content else content end