card-mod-style 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdf4658d37e16b6af9fc0011e4465ec216363bb3590c7fb19c96d2b9304bf9ee
-  data.tar.gz: f79c9dea3e99694506ff861124616da3d962ac54a3c1628ee6c888af30b766c2
+  metadata.gz: d84026d8cb380633f07a36b003c4de59c6501d51569c28ce4cb399705db51f64
+  data.tar.gz: 1f93318fe756b901ef0d358b56ffd27c3f52078b873032036fdc6bc945abd9d7
 SHA512:
-  metadata.gz: c8c96f33e5fd71591a5ac2769f8f31fcbf0a18f41f1289d4704785970b65870d8646a0f6687ac1faa148ea442883c350421d529034877eeb414849d8b2f6ca95
-  data.tar.gz: 882d53505dea8acabc3e45b7096bd5a6466be67c7cb6001eab3f8f59e756b8416417e4f6c3a3176fe1563ffce6a17dd1c106d38309fbfac2bc774032bfa62768
+  metadata.gz: '0961488d122847da619f68cb1a3ca3587fc752ff200337140d68ef1ad2915fb0ee833bf2d8c953dd004bee9b08ff60a46209705685186aa8f2eaa604282f0d57'
+  data.tar.gz: 792de55241b6965ca832bf283f97639279e52be74d2b091842cb190dcae368bf62596bdc18916e4448c91d374a023a9eb4fac6c848b21c663da37512452121c8

data/assets/style/jquery_ui_decko.scss

@@ -0,0 +1,15 @@
+.ui-menu-icons .ui-menu-item a {
+  padding-left: 0;
+}
+
+.ui-icon {
+  background-image: url([[/mod/style/jquery-ui-smoothness/ui-icons_454545_256x240.png]])
+}
+
+.ui-menu-item {
+  .glyphicon {
+    float: left;
+    font-size: 10px;
+    padding: 3px 0 3px 0px;
+  }
+}

data/data/real.yml

@@ -0,0 +1,60 @@
+---
+- :name: "style: mods"
+  :type: :list
+  :codename: style_mods
+
+- :name: Local style folder group
+  :type: :cardtype
+  :codename: local_style_folder_group
+- :name: Local style manifest group
+  :type: :cardtype
+  :codename: local_style_manifest_group
+
+
+- :name: CSS
+  :type: :cardtype
+  :codename: css
+  :fields:
+    :description: |-
+      <p>Customize styles for [[Skins]]. [[http://decko.org/CSS|more]]</p>
+    :type:
+      :fields:
+        :create: Shark
+        :update: Shark
+        :delete: Shark
+- :name: SCSS
+  :type: :cardtype
+  :codename: scss
+  :fields:
+    :description: |-
+      <p>Customize styles for [[Skins]]. [[http://decko.org/SCSS|more]]</p>
+    :type:
+      :fields:
+        :create: Shark
+        :update: Shark
+        :delete: Shark
+- :name: Skin
+  :type: :cardtype
+  :codename: skin
+  :fields:
+    :description: |-
+      <p>
+        A [[skin]] determines a page's look and feel.
+        [[http://decko.org/Skins|more]]
+      </p>
+    :type:
+      :fields:
+        :create: Shark
+        :update: Shark
+        :delete: Shark
+- :name: "*style"
+  :type: :setting
+  :codename: style
+  :fields:
+    :right:
+      :fields:
+        :input_type: radio
+        :content_options:
+          :type: :search_type
+          :content: '{"type": "bootswatch_skin", "sort": "name"}'
+        :content_option_view: Image

data/locales/de.yml

@@ -0,0 +1,2 @@
+de:
+  style_delete_error_skin_in_use: Skin kann nicht gelöscht werden, weil es verwendet wird.

data/locales/en.yml

@@ -0,0 +1,2 @@
+en:
+  style_delete_error_skin_in_use: Can't delete skin because it's used.

data/set/abstract/01_css.rb

@@ -65,7 +65,7 @@ format :css do
     compress? ? compile(input) : compile(input, :nested)
   end
 
-  # FIXME: method is repeated called with "nested", but there is no handling for it
+  # FIXME: method is repeatedly called with "nested", but there is no handling for it
   def compile input, _style=:compressed
     SassC::Engine.new(input, style: :compressed).render
   rescue StandardError => e

data/set/abstract/skin_box/box_bottom.haml

@@ -1,4 +1 @@
-.d-flex.justify-content-center.align-items-center
-  .btn-group
-    = select_button
-    = render_customize_button
+-#TODO

data/set/abstract/skin_box.rb

@@ -7,24 +7,12 @@ format :html do
 
   view :box_bottom, template: :haml
 
-  view :customize_button, cache: :never do
-    customize_button
-  end
-
-  def customize_button target: parent&.card, text: "Apply and customize"
-    return "" unless card.codename.present?
-
-    theme = card.codename.match(/^(?<theme_name>.+)_skin$/).capture(:theme_name)
-    link_to_card target, text,
-                 path: { action: :update, card: { content: "[[#{card.name}]]" },
-                         customize: true, theme: theme },
-                 class: "btn btn-sm btn-outline-primary mr-2"
+  view :customize_button do
+    ""
   end
 
   view :box_middle do
-    return unless card.field(:image)
-
-    field_nest(:image, view: :full_width, size: :large)
+    field_nest :image, view: :full_width, size: :large if card.fetch :image
   end
 
   def select_button target=parent.card

data/set/type/css.rb

@@ -1,2 +1,16 @@
 include_set Abstract::Css
 include_set Abstract::AssetInputter, input_format: :css, input_view: :compressed
+
+# require 'w3c_validators'
+require "sass"
+
+event :validate_css, :validate, on: :save, changed: %i[type_id content] do
+  # validator = W3CValidators::CSSValidator.new
+  # results = validator.validate_text(content)
+  # results.errors.each do |error|
+  #  errors.add :content, "#{error.message} (line #{error.line})"
+  # en
+  ::Sass::SCSS::Parser.new(content, nil, nil).parse
+rescue ::Sass::SyntaxError => e
+  errors.add :content, e.message
+end

data/set/type/local_style_folder_group.rb

@@ -1,2 +1,4 @@
 include_set Abstract::FolderGroup
 include_set Abstract::StyleGroup
+
+basket[:non_createable_types] << :local_style_folder_group

data/set/type/local_style_manifest_group.rb

@@ -1,2 +1,4 @@
 include_set Abstract::LocalManifestGroup
 include_set Abstract::StyleGroup
+
+basket[:non_createable_types] << :local_style_manifest_group

data/set/type/scss.rb

@@ -1,2 +1,23 @@
 include_set Abstract::Scss
 include_set Abstract::AssetInputter, input_format: :scss
+
+event :validate_scss_syntax, :validate, on: :save, changed: %i[type_id content] do
+  variables = Card[:all, :style]&.joined_items_content
+  return unless variables.present? # happens during card:seed:build
+
+  SassC::Engine.new([variables.strip, content].join("\n")).render
+rescue SassC::SyntaxError => e
+  match = e.message.match(/line (\d+)/)
+  message =
+    if match
+      offset = 6
+      corrected_line = match[1].to_i - variables.lines.count + offset
+      e.message
+       .sub(/line \d+:(\d+) of stdin/, "line #{corrected_line}:\\1")
+       .sub(/>>.*$/, ">> #{content.lines[corrected_line - 1]}")
+      # e.message
+    else
+      e.message
+    end
+  errors.add(:content, "<pre>#{message}</pre>".html_safe)
+end

data/set/type/skin.rb

@@ -9,3 +9,9 @@ format :css do
     end.join("\n")
   end
 end
+
+event :no_deletion_if_used, :validate, on: :delete do
+  if Card[:all, :style].item_keys.include? key
+    errors.add :delete, t(:style_delete_error_skin_used)
+  end
+end

data/set/type_plus_right/mod/style.rb

@@ -22,6 +22,14 @@ format :html do
       nest icard, view: :stylesheet_include_tag
     end.join("\n")
   end
+
+  view :remote_include_tags do
+    map_remote_items do |tag_args|
+      tag "link",
+          href: tag_args.delete("src"),
+          media: "all", rel: "stylesheet", type: "text/css"
+    end
+  end
 end
 
 def asset_input_needs_refresh?

data/set/type_plus_right/set/style/input.haml

@@ -1,6 +1,6 @@
 .album.bg-light
   .container
-    .row
+    .d-flex.flex-wrap.justify-content-around
       - selectable_themes.each do |theme|
-        .col-md-4
+        .m-2.my-4
           = nest theme, view: :box

data/set/type_plus_right/set/style.rb

@@ -1,10 +1,9 @@
-require "sassc"
-
-include_set Abstract::Css
 include_set Abstract::AssetOutputter, output_format: :css, output_view: :compressed
 
-def output_filetype
-  "css"
+assign_type :pointer
+
+def ok_item_types
+  %i[css scss skin bootswatch_skin]
 end
 
 def ok_to_read
@@ -12,7 +11,7 @@ def ok_to_read
 end
 
 def make_asset_output_coded
-  super ENV["STYLE_OUTPUT_MOD"]
+  super Cardio.config.seed_mods.first
 end
 
 format do
@@ -26,11 +25,15 @@ format :html do
   HIDDEN_SKINS = %w[bootstrap_default_skin themeless_bootstrap_skin bootstrap_default_skin
                     classic_bootstrap_skin].freeze
 
+  def input_type
+    :box_select
+  end
+
   def default_item_view
     :bar
   end
 
-  view :input, template: :haml
+  # view :input, template: :haml
 
   def themes
     card.rule_card(:content_options).item_cards
@@ -44,29 +47,6 @@ format :html do
   end
 end
 
-event :customize_theme, :prepare_to_validate, on: :update, when: :customize_theme? do
-  skin_name = free_skin_name
-  subcard skin_name, type_id: CustomizedBootswatchSkinID
-  self.content = "[[#{skin_name}]]"
-end
-
-event :update_theme_input, :finalize,
-      before: :update_asset_output_file, changed: :content do
-  item_cards.each do |theme_card|
-    next unless theme_card.respond_to? :theme_name
-    theme_card.update_asset_input
-  end
-end
-
-def free_skin_name
-  name = "#{@theme} skin customized"
-  if Card.exist?(name)
-    name = "#{name} 1"
-    name.next! while Card.exist?(name)
-  end
-  name
-end
-
-def customize_theme?
-  Env.params[:customize].present? && (@theme = Env.params[:theme]).present?
+def joined_items_content
+  item_cards.map(&:content).compact.join "\n"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-style
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.1
+        version: 1.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.1
+        version: 1.105.0
 - !ruby/object:Gem::Dependency
   name: card-mod-assets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 description: ''
 email:
 - info@decko.org
@@ -61,9 +61,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- assets/style/jquery_ui_decko.scss
 - assets/style/jquery_ui_smoothness.css
-- assets/style/style_cards.scss
-- db/migrate_core_cards/20200805112346_add_mod_style_assets_type.rb
+- data/real.yml
+- locales/de.yml
+- locales/en.yml
 - public/jquery-ui-smoothness/ui-bg_glass_55_fbf9ee_1x400.png
 - public/jquery-ui-smoothness/ui-bg_glass_65_ffffff_1x400.png
 - public/jquery-ui-smoothness/ui-bg_glass_75_dadada_1x400.png
@@ -90,7 +92,6 @@ files:
 - set/type/local_style_manifest_group.rb
 - set/type/scss.rb
 - set/type/skin.rb
-- set/type_plus_right/customized_bootswatch_skin/stylesheets.rb
 - set/type_plus_right/mod/style.rb
 - set/type_plus_right/set/style.rb
 - set/type_plus_right/set/style/input.haml
@@ -104,6 +105,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: style
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Skins, CSS, SCSS, etc