card 1.15.pre → 1.15.pre2

data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb

@@ -4,14 +4,68 @@ class ImportBootstrapLayout < Card::CoreMigration
   def up
     layout = Card.fetch "Default Layout"
     if layout
-      layout.name = "Old Layout"
+      layout.name = "Classic Layout"
       layout.update_referencers = true
       layout.save!
     end
+        
+    import_json "bootstrap_layout.json"#, :pristine=>true, :output_file=>nil
+
+    if layout && layout.pristine? &&
+      all = Card[:all]
+      layout_rule_card = all.fetch :trait=>:layout
+      style_rule_card  = all.fetch :trait=>:style
+      if layout_rule_card.pristine? && style_rule_card.pristine?
+        layout_rule_card.update_attributes! :content=> '[[Default Layout]]'
+        if style_rule_card.item_names.first == 'customized classic skin'
+          Card.create! :name=>'customized bootstrap skin', :type=>'Skin', 
+            :content=>"[[classic bootstrap skin]]\n[[*css]]"
+          style_rule_card.update_attributes! :content=> '[[customized bootstrap skin]]'
+        else
+          style_rule_card.update_attributes! :content=> '[[classic bootstrap skin]]'
+        end
+      end
+    end
+    
+    Card.create! :name=>"*header+*self+*read", :content=>'[[Anyone]]'
+    
+    # merge "style: functional" and "style: standard" into "style: cards"
+    old_func = Card[:style_functional]
+    old_func.name = 'style: cards'
+    old_func.codename = 'style_cards'
+    old_func.update_referencers = true
+    old_func.save!
+    
+    old_stand = Card[:style_standard]
+    old_stand.codename = nil
+    old_stand.delete!
+    
+
+    # these are hard-coded
+    Card.create! :name=>'theme: bootstrap_default', :type_code=>:css, :codename=>'theme_bootstrap_default'
+    Card.create! :name=>'style: bootstrap',         :type_code=>:css, :codename=>'bootstrap_css'
+    Card.create! :name=>'style: bootstrap cards',   :type_code=>:css, :codename=>'bootstrap_cards'
     
-    import_json "bootstrap_layout.json"
-    Card.create! :name=>'style: bootstrap theme', :type_code=>:css, :codename=>'bootstrap_theme_css'
-    Card.create! :name=>'style: bootstrap', :type_code=>:css, :codename=>'bootstrap_css'
+    Card.create! :name=>'style: bootstrap compatible', :type_code=>:scss, :codename=>'style_bootstrap_compatible'
     Card.create! :name=>'script: bootstrap', :type_code=>:js, :codename=>'bootstrap_js'
+    
+    # add new setting: *default html view
+    Card.create! :name=>'*default html view', :type_code=>:setting, :codename=>'default_html_view'
+    Card.create! :name=>'*default html view+*right+*default', :type_code=>:phrase
+    
+    # retain old behavior (default view was content, now titled)
+    Card.create! :name=>'*all+*default html view', :content=>'content'
+    
+    # update layouts to have explicit views in inclusions
+    Card.search( :type_id=>Card::LayoutTypeID ) do |lcard|
+      lcontent = Card::Content.new lcard.content, lcard
+      lcontent.find_chunks( Card::Chunk::Include ).each do |nest|
+        nest.explicit_view = (nest.options[:inc_name]=='_main' ? 'open' : 'core')
+      end    
+      lcard.update_attributes! :content=>lcontent.to_s
+    end
+    
+    Card::Cache.reset_global
+    
   end
 end

data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb

@@ -0,0 +1,37 @@
+# -*- encoding : utf-8 -*-
+
+class BootstrapThemes < Card::CoreMigration
+  def up
+    Card.create! :name=>'themeless bootstrap skin', :type_code=>:skin, :content=> "[[style: bootstrap]]\n[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: bootstrap cards]]"
+    %w{cerulean cosmo cyborg darkly flatly journal lumen paper readable sandstone simplex slate spacelab superhero united yeti }.each do |theme|
+      Card.create! :name=>"theme: #{theme}", :type_code=>:css, :codename=>"theme_#{theme}"
+      Card.create! :name=>"#{theme} skin", :type_code=>:skin, :codename=>"#{theme}_skin", :content=>"[[themeless bootstrap skin]]\n[[theme: #{theme}]]"
+    end
+    
+    if credit_card = Card['*credit']
+      credit_card.codename = 'credit'
+      credit_card.save!
+    end
+    
+    style_right = Card[:style].fetch :trait=>:right, :new=>{}
+    
+    style_right_options = style_right.fetch :trait=>:options, :new=>{}
+    style_right_options.content = %[{"type":"Skin","sort":"name"}]
+    style_right_options.save!
+    
+    style_right_input = style_right.fetch :trait=>:input, :new=>{}
+    style_right_input.content = 'radio'
+    style_right_input.save!
+    
+    style_right_option_label = style_right.fetch :trait=>:options_label, :new=>{}
+    style_right_option_label.content = 'Image'
+    style_right_option_label.save!
+    
+    import_json 'skin_images.json'
+    
+    if sidebar_card = Card['*sidebar']
+      new_content = sidebar_card.content.gsub( /(\*(logo|credit))\|content/, '\1|content_panel' )
+      sidebar_card.update_attributes! :content => new_content
+    end
+  end
+end

data/db/migrate_core_cards/data/1.12_stylesheets/traditional.scss

@@ -21,7 +21,7 @@ There are three types of rules here:
   background: #8AB;
   margin-bottom: 20px;
   padding: 2px;
- a {
+  a {
     color: #000;
     padding: 0px 4px;
   }

data/db/migrate_core_cards/data/bootstrap_layout.json

@@ -9,7 +9,7 @@
       {
         "name": "classic bootstrap skin",
         "type": "Skin",
-        "content": "[[simple bootstrap skin]]\n[[style: classic cards]]"
+        "content": "[[bootstrap default skin]]\n[[style: classic cards]]"
       },
       {
         "name": "classic skin",
@@ -17,14 +17,14 @@
         "content": "[[simple skin]]\n[[style: classic cards]]"
       },
       {
-        "name": "simple skin",
+        "name": "bootstrap default skin",
         "type": "Skin",
-        "content": "[[style: jquery-ui-smoothness]]\n[[style: functional]]\n[[style: standard]]\n[[style: right sidebar]]\n[[style: common]]\n[[style: traditional]]\n[[style: glyphicons]]\n[[style: bootstrap compatible]]"
+        "content": "[[themeless bootstrap skin]]\n[[theme: bootstrap default]]"
       },
       {
-        "name": "simple bootstrap skin",
+        "name": "simple skin",
         "type": "Skin",
-        "content": "[[style: bootstrap]]\n[[style: bootstrap theme]]\n[[style: jquery-ui-smoothness]]\n[[style: functional]]\n[[style: standard]]\n[[style: right sidebar]]\n[[style: bootstrap common]]\n[[style: bootstrap cards]]"
+        "content": "[[style: jquery-ui-smoothness]]\n[[style: cards]]\n[[style: right sidebar]]\n[[style: common]]\n[[style: traditional]]\n[[style: glyphicons]]\n[[style: bootstrap compatible]]"
       },
       {
         "name": "style: classic cards",
@@ -36,35 +36,20 @@
         "type": "SCSS",
         "content": "/*\r\nThis stylesheet outlines a host of commonly-used styles.  Unlike the \"standard\" stylesheet, this\r\nsheet will likely affect prominent pages seen even by casual users, so any major style tweaking will\r\nlikely alter some of the style rules below.\r\n\r\nWe do not expect migrations to alter this card frequently\r\n*/\r\n\r\n$input_color: #f9f9ed;\r\n$input_focus_color: #ffffee;\r\n$label_color: #666666;\r\n$border_color: #999999;\r\n$header_color: #eeeeee;\r\n\r\ntextarea, input {\r\n  font-size: 1em;\r\n  line-height: 1.5em;\r\n}\r\n\r\n/* \r\nthe following gives users more explicit control over spacing within tinyMCE\r\nbut leads to lots of empty paragraph tags\r\n*/\r\n\r\n\r\nh1 {\r\n  font-size: 1.4em;\r\n}\r\nh2 {\r\n  font-size: 1.2em;\r\n}\r\n\r\nh1, h2, p {\r\n  margin: 0;\r\n}\r\n\r\nlabel,\r\n.navbox-item-label {\r\n  color: $label_color;\r\n}\r\ntable {\r\n  border-collapse: collapse;\r\n}\r\nth {\r\n  color: $label_color;\r\n  font-weight: normal;\r\n  font-style: italic;\r\n}\r\ntd, th {\r\n  vertical-align: top;\r\n  padding: 0px;\r\n}\r\na:link,\r\na:visited {\r\n\ttext-decoration: none;\r\n}\r\na:hover,\r\na:focus {\r\n  text-decoration: underline;\r\n}\r\nform {\r\n  margin: 0px;\r\n  padding: 0px;\r\n}\r\n\r\n.card-frame {\r\n  > .instruction {\r\n    background: #ccc;\r\n  }  \r\n}\r\n\r\n.card-header > .instruction {\r\n  font-weight: normal;\r\n  font-size: 0.9em;\r\n}\r\n\r\n\r\n/*-------- Special Pages --------*/\r\n\r\n/*-- sign in page --*/\r\n\r\n#sign-in input#login_field,\r\n#sign-in input#password,\r\n#forgot-password input#email {\r\n  width: 50%;\r\n}\r\n#forgot-password {\r\n  margin-top: 40px;\r\n}\r\n\r\n\r\n\r\n\r\n/*----------- inputs ---------*/\r\n\r\ninput[type=text],\r\ninput[type=password],\r\ninput[type=checkbox],\r\ntextarea,\r\nselect {\r\n  border: 1px solid #aaa;\r\n  border-top: 2px solid #666;\r\n  border-left: 2px solid #666;\r\n  background: $input_color;\r\n  :focus {\r\n    background: $input_focus_color;    \r\n  }\r\n}\r\n\r\n.history-view > .card-content,\r\n.conflict-view,\r\nbody#tinymce {\r\n  background: $input_color;\r\n}\r\nbody.mceContentBody {\r\n  margin: 4px;\r\n}\r\n\r\n\r\n/*----------- Change View ---------*/\r\n\r\n.change-view {\r\n  padding: 5px 0px;\r\n  border-bottom: 1px dotted $border_color;\r\n  .change-card{\r\n    font-weight: bold;\r\n  }\r\n  .last-update {\r\n    color: $label_color;\r\n  }\r\n}\r\n\r\n\r\n\r\n/*---------- ( Richtext )-------------*/\r\n\r\n.table-of-contents {\r\n  background: $header_color;\r\n  -moz-border-radius: 10px;\r\n  border-radius: 10px;\r\n  padding: 4px;\r\n  margin: 5px 20px 20px 20px;\r\n  h5 {\r\n    margin: 0 0 0 40px;\r\n  }\r\n  ol {\r\n    list-style-type: upper-roman;\r\n    ol {\r\n      list-style-type: upper-alpha;\r\n      padding-left: 25px\r\n    }\r\n  }\r\n}\r\n\r\n\r\n/* CARDTYPE_SPECIFIC ------------------------------*/\r\n\r\n\r\n.TYPE-toggle.card-content {\r\n  font-style: italic;\r\n}\r\n\r\n.TYPE-image.card-content img {\r\n  max-width: 100%;\r\n}\r\n\r\n/*---------( Search ) ---------- */\r\n\r\n.search-keyword {\r\n  font-style: italic;\r\n}\r\n\r\n.search-count {\r\n  float: right;\r\n  color: $label_color;\r\n}\r\n\r\n\r\n/*----------- (Account Request)--------------*/\r\n\r\n.invite-links {\r\n  padding: 10px;\r\n  margin-top: 10px;\r\n  background: $header_color;\r\n  text-align: center;\r\n}\r\n.invite-links a {\r\n  font-weight: bold;\r\n  margin: 0 20px;\r\n}\r\n\r\n\r\n/*---------- comments -------------------------------------- */\r\n\r\n.comment-box {\r\n  padding: 8px;\r\n  margin: 0px;\r\n  input {\r\n    padding: 0px;\r\n  }\r\n  textarea {\r\n    margin-bottom:5px;\r\n  }\r\n}\r\n.w-comment-author {\r\n  font-style: italic;\r\n  margin-left: 10px;\r\n}\r\n"
       },
-      {
-        "name": "style: bootstrap common",
-        "type": "SCSS",
-        "content": "/*\r\nThis stylesheet outlines a host of commonly-used styles.  Unlike the \"standard\" stylesheet, this\r\nsheet will likely affect prominent pages seen even by casual users, so any major style tweaking will\r\nlikely alter some of the style rules below.\r\n\r\nWe do not expect migrations to alter this card frequently\r\n*/\r\n\r\n$input_color: #f9f9ed;\r\n$input_focus_color: #ffffee;\r\n$label_color: #666666;\r\n$border_color: #999999;\r\n$header_color: #eeeeee;\r\n\r\ntextarea, input {\r\n  font-size: 1em;\r\n  line-height: 1.5em;\r\n}\r\n\r\n/* \r\nthe following gives users more explicit control over spacing within tinyMCE\r\nbut leads to lots of empty paragraph tags\r\n*/\r\n\r\n\r\nh1 {\r\n  font-size: 1.4em;\r\n}\r\nh2 {\r\n  font-size: 1.2em;\r\n}\r\n\r\nh1, h2, p {\r\n  margin: 0;\r\n}\r\n\r\nlabel,\r\n.navbox-item-label {\r\n  color: $label_color;\r\n}\r\ntable {\r\n  border-collapse: collapse;\r\n}\r\nth {\r\n  color: $label_color;\r\n  font-weight: normal;\r\n  font-style: italic;\r\n}\r\ntd, th {\r\n  vertical-align: top;\r\n  padding: 0px;\r\n}\r\na:link,\r\na:visited {\r\n\ttext-decoration: none;\r\n}\r\na:hover,\r\na:focus {\r\n  text-decoration: underline;\r\n}\r\nform {\r\n  margin: 0px;\r\n  padding: 0px;\r\n}\r\n\r\n.card-frame {\r\n  > .instruction {\r\n    background: #ccc;\r\n  }  \r\n}\r\n\r\n.card-header > .instruction {\r\n  font-weight: normal;\r\n  font-size: 0.9em;\r\n}\r\n\r\n\r\n/*-------- Special Pages --------*/\r\n\r\n/*-- sign in page --*/\r\n\r\n#sign-in input#login_field,\r\n#sign-in input#password,\r\n#forgot-password input#email {\r\n  width: 50%;\r\n}\r\n#forgot-password {\r\n  margin-top: 40px;\r\n}\r\n\r\n\r\n\r\n.history-view > .card-content,\r\n.conflict-view,\r\nbody#tinymce {\r\n  background: $input_color;\r\n}\r\nbody.mceContentBody {\r\n  margin: 4px;\r\n}\r\n\r\n\r\n/*----------- Change View ---------*/\r\n\r\n.change-view {\r\n  padding: 5px 0px;\r\n  border-bottom: 1px dotted $border_color;\r\n  .change-card{\r\n    font-weight: bold;\r\n  }\r\n  .last-update {\r\n    color: $label_color;\r\n  }\r\n}\r\n\r\n\r\n\r\n/*---------- ( Richtext )-------------*/\r\n\r\n.table-of-contents {\r\n  background: $header_color;\r\n  -moz-border-radius: 10px;\r\n  border-radius: 10px;\r\n  padding: 4px;\r\n  margin: 5px 20px 20px 20px;\r\n  h5 {\r\n    margin: 0 0 0 40px;\r\n  }\r\n  ol {\r\n    list-style-type: upper-roman;\r\n    ol {\r\n      list-style-type: upper-alpha;\r\n      padding-left: 25px\r\n    }\r\n  }\r\n}\r\n\r\n\r\n/* CARDTYPE_SPECIFIC ------------------------------*/\r\n\r\n\r\n.TYPE-toggle.card-content {\r\n  font-style: italic;\r\n}\r\n\r\n.TYPE-image.card-content img {\r\n  max-width: 100%;\r\n}\r\n\r\n/*---------( Search ) ---------- */\r\n\r\n.search-keyword {\r\n  font-style: italic;\r\n}\r\n\r\n.search-count {\r\n  float: right;\r\n  color: $label_color;\r\n}\r\n\r\n\r\n/*----------- (Account Request)--------------*/\r\n\r\n.invite-links {\r\n  padding: 10px;\r\n  margin-top: 10px;\r\n  background: $header_color;\r\n  text-align: center;\r\n}\r\n.invite-links a {\r\n  font-weight: bold;\r\n  margin: 0 20px;\r\n}\r\n\r\n\r\n/*---------- comments -------------------------------------- */\r\n\r\n.comment-box {\r\n  padding: 8px;\r\n  margin: 0px;\r\n  input {\r\n    padding: 0px;\r\n  }\r\n  textarea {\r\n    margin-bottom:5px;\r\n  }\r\n}\r\n.w-comment-author {\r\n  font-style: italic;\r\n  margin-left: 10px;\r\n}\r\n"
-      },
       {
         "name": "style: traditional",
         "type": "SCSS",
-        "content": "/*\r\nThis \"traditional\" styling is for backwards compatibility.  \r\nIt is not intended for use in Skins created after version 1.15; all such skins should use Bootstrap.\r\n\r\nThere are three types of rules here:\r\n  1. rules applying to selectors no longer included in standard layouts (#menu, #logo, #credit)\r\n  2. rules enforcing now-deprecated styling patterns\r\n  3. rules enforcing default content expected to change soon\r\n\r\n*/\r\n\r\n\r\n$border_color: #999999;\r\n$header_color: #eeeeee;\r\n\r\n.navbox-form {\r\n  display: inline;\r\n}\r\n\r\n.card-header,\r\n.card-body {\r\n  padding: 5px 0;\r\n}\r\n\r\nh3.panel-title {\r\n  margin: 0;\r\n}\r\n\r\n.card-frame {\r\n  border: 1px solid $border_color;\r\n  > .card-header {\r\n    background: $header_color;\r\n    padding: 5px 12px;\r\n  }\r\n  > .card-body {\r\n    padding: 5px 12px;\r\n  }\r\n}\r\n\r\n.closed-view {\r\n  border: 0;\r\n  border-bottom: 1px solid #eee;\r\n  margin: 0 0 1px 0;\r\n}\r\n\r\n\r\n@mixin no_external_icon {\r\n  list-style-type: none;\r\n  padding-right: 0 !important;\r\n  background: inherit;\r\n}\r\n\r\n\r\n/* #menu is being replaced with #header */\r\n#menu {\r\n  font-size: 14px;\r\n  background: $header_color;\r\n  border-bottom: 1px solid $border_color;\r\n  margin-bottom: 20px;\r\n  padding: 2px;\r\n a {\r\n    color: #000;\r\n    padding: 0px 4px;\r\n  }\r\n  div {\r\n    display: inline;\r\n  }\r\n  #logging {  /* signing in and out */\r\n    float:right;\r\n    right: 0.5%;\r\n    top: 2px;\r\n  }\r\n  #my-card-link {\r\n    font-weight: bold;\r\n  }\r\n  .navbox {\r\n    height: 18px;\r\n    width: 30%;\r\n  }\r\n}\r\n@media print {\r\n  #menu {\r\n    display: none;\r\n  }\r\n}\r\n\r\n\r\n/* -------  Secondary --------- */\r\n\r\n/* #logo is being replaced with *logo card slot wrappers */\r\n#logo {\r\n  text-align: center;\r\n  padding: 10px;\r\n  background: #fff;\r\n  border: 1px solid #777;\r\n  -moz-border-radius: 8px;\r\n  border-radius: 8px;\r\n  a,\r\n  a:link,\r\n  a:visited {\r\n    color: #448;\r\n    text-decoration: none;\r\n    text-align: center;\r\n  }\r\n  img {\r\n    max-width: 100%;\r\n  }\r\n}\r\n\r\n/* #credit is being replaced with *credit card slot wrappers */\r\n#credit {\r\n  margin: 30px 0;\r\n}\r\n\r\n\r\n/* the logo and credit will not be in the sidebar in most new layouts */\r\n\r\n#secondary {\r\n  > div {\r\n    > a > .SELF-Xlogo.content-view,\r\n    > .SELF-Xcredit.content-view {\r\n      display: block;\r\n      text-align: center;\r\n      padding: 10px;\r\n      background: #fff;\r\n      border: 1px solid #bbb;\r\n      -moz-border-radius: 8px;\r\n      border-radius: 8px;\r\n      img {\r\n        max-width: 100%;\r\n      }\r\n      a {\r\n        color: #186886; /* NOTGREY - Wagn blue */\r\n      }\r\n    }\r\n  }  \r\n}\r\n\r\n\r\n/*\r\nThe following are specifically NOT recommended but are included here to avoid disrupting behavior in old sites\r\n*/\r\n\r\n/* best not to overspecify these properties */\r\nbody {\r\n  margin: 0;\r\n}\r\n\r\nbody, p, ol, ul, td, th, textarea {\r\n  font-family: verdana, arial, helvetica, sans-serif;\r\n  font-size:   12px;\r\n  font-weight: normal;\r\n}\r\n\r\nbody, p, ol, ul {\r\n  line-height: 21px;\r\n}\r\n\r\n.closed-content {\r\n  font-size: 11px !important;\r\n}\r\n\r\n/* creates lots of inline divs.  confusing */\r\n.content-view {\r\n  display: inline;\r\n}\r\n\r\n/* english content in css.  ugh */\r\n.search-no-results:after {\r\n  content:'0 results';\r\n}\r\n.closed-content .search-no-results:after {\r\n  content:'';\r\n}\r\n\r\n/* many sites may want this external link behavior; it's here because it's a nuisance to override when not desired */\r\n\r\na.external-link,\r\n.closed-content a.external-link {\r\n  color: #729;\r\n  background: url([[/assets/external_link.png]]) center right no-repeat;\r\n  padding-right: 13px !important;\r\n}\r\n\r\n.SELF-home-original > .card-content p,\r\n.SELF-wagneer_menu > .card-content {\r\n  a.external-link {\r\n    list-style-type: none;\r\n    padding-right: 0 !important;\r\n    background: inherit;\r\n  }\r\n}\r\n"
-      },
-      {
-        "name": "style: bootstrap compatible",
-        "type": "SCSS",
-        "content": "#menu {\r\n  height: 30px;\r\n  div.container-fluid{\r\n    display: block;\r\n  }\r\n  div.navbar-header {\r\n    display: none;\r\n  }\r\n  ul {\r\n    font-size: 14px;\r\n    margin-top: 5px;\r\n  }\r\n  li {\r\n    display: inline;\r\n  }\r\n  .navbar-left {\r\n    float: left;\r\n  }\r\n  .navbar-right {\r\n    float: right;\r\n    margin-right: 15px;\r\n  }\r\n  .navbar-form {\r\n    width: 30%;\r\n    margin-top: 5px;\r\n    margin-left: 10px;\r\n    input {\r\n      width: 100%;\r\n    }\r\n  }\r\n}\r\n\r\n#primary {\r\n  clear: both;\r\n}\r\n\r\n\r\n// removed from standard.scss\r\ninput, select, textarea {\r\n  padding: 0 1%;\r\n}\r\ninput, select {\r\n  max-width: 97.5%;\r\n}"
+        "content": "/*\r\nThis \"traditional\" styling is for backwards compatibility.  \r\nIt is not intended for use in Skins created after version 1.15; all such skins should use Bootstrap.\r\n\r\nThere are three types of rules here:\r\n  1. rules applying to selectors no longer included in standard layouts (#menu, #logo, #credit)\r\n  2. rules enforcing now-deprecated styling patterns\r\n  3. rules enforcing default content expected to change soon\r\n\r\n*/\r\n\r\n\r\n$border_color: #999999;\r\n$header_color: #eeeeee;\r\n\r\n.navbox-form {\r\n  display: inline;\r\n}\r\n\r\n.card-header,\r\n.card-body {\r\n  padding: 5px 0;\r\n}\r\n\r\nh3.panel-title {\r\n  margin: 0;\r\n}\r\n\r\n.card-frame {\r\n  border: 1px solid $border_color;\r\n  > .card-header {\r\n    background: $header_color;\r\n    padding: 5px 12px;\r\n  }\r\n  > .card-body {\r\n    padding: 5px 12px;\r\n  }\r\n}\r\n\r\n.closed-view {\r\n  border: 0;\r\n  border-bottom: 1px solid #eee;\r\n  margin: 0 0 1px 0;\r\n}\r\n\r\n\r\n@mixin no_external_icon {\r\n  list-style-type: none;\r\n  padding-right: 0 !important;\r\n  background: inherit;\r\n}\r\n\r\n\r\n/* #menu is being replaced with #header */\r\n#menu {\r\n  font-size: 14px;\r\n  background: $header_color;\r\n  border-bottom: 1px solid $border_color;\r\n  margin-bottom: 20px;\r\n  padding: 2px;\r\n a {\r\n    color: #000;\r\n    padding: 0px 4px;\r\n  }\r\n  div {\r\n    display: inline;\r\n  }\r\n  #logging {  /* signing in and out */\r\n    float:right;\r\n    right: 0.5%;\r\n    top: 2px;\r\n  }\r\n  #my-card-link {\r\n    font-weight: bold;\r\n  }\r\n  .navbox {\r\n    height: 18px;\r\n    width: 30%;\r\n  }\r\n}\r\n@media print {\r\n  #menu {\r\n    display: none;\r\n  }\r\n}\r\n\r\n\r\n/* -------  Secondary --------- */\r\n\r\n/* #logo is being replaced with *logo card slot wrappers */\r\n#logo {\r\n  text-align: center;\r\n  padding: 10px;\r\n  background: #fff;\r\n  border: 1px solid #777;\r\n  -moz-border-radius: 8px;\r\n  border-radius: 8px;\r\n  a,\r\n  a:link,\r\n  a:visited {\r\n    color: #448;\r\n    text-decoration: none;\r\n    text-align: center;\r\n  }\r\n  img {\r\n    max-width: 100%;\r\n  }\r\n}\r\n\r\n/* #credit is being replaced with *credit card slot wrappers */\r\n#credit {\r\n  margin: 30px 0;\r\n}\r\n\r\n\r\n/* the logo and credit will not be in the sidebar in most new layouts */\r\n\r\n#secondary {\r\n  > div {\r\n    > a > .SELF-Xlogo.content_panel-view,\r\n    > .SELF-Xcredit.content_panel-view {\r\n      display: block;\r\n      text-align: center;\r\n      padding: 10px;\r\n      background: #fff;\r\n      border: 1px solid #bbb;\r\n      -moz-border-radius: 8px;\r\n      border-radius: 8px;\r\n      img {\r\n        max-width: 100%;\r\n      }\r\n      a {\r\n        color: #186886; /* NOTGREY - Wagn blue */\r\n      }\r\n    }\r\n  }  \r\n}\r\n\r\n\r\n/*\r\nThe following are specifically NOT recommended but are included here to avoid disrupting behavior in old sites\r\n*/\r\n\r\n/* best not to overspecify these properties */\r\nbody {\r\n  margin: 0;\r\n}\r\n\r\nbody, p, ol, ul, td, th, textarea {\r\n  font-family: verdana, arial, helvetica, sans-serif;\r\n  font-size:   12px;\r\n  font-weight: normal;\r\n}\r\n\r\nbody, p, ol, ul {\r\n  line-height: 21px;\r\n}\r\n\r\n.closed-content {\r\n  font-size: 11px !important;\r\n}\r\n\r\n/* creates lots of inline divs.  confusing */\r\n.content-view {\r\n  display: inline;\r\n}\r\n\r\n/* english content in css.  ugh */\r\n.search-no-results:after {\r\n  content:'0 results';\r\n}\r\n.closed-content .search-no-results:after {\r\n  content:'';\r\n}\r\n\r\n/* many sites may want this external link behavior; it's here because it's a nuisance to override when not desired */\r\n\r\na.external-link,\r\n.closed-content a.external-link {\r\n  color: #729;\r\n  background: url([[/assets/external_link.png]]) center right no-repeat;\r\n  padding-right: 13px !important;\r\n}\r\n\r\n.SELF-home-original > .card-content p,\r\n.SELF-wagneer_menu > .card-content {\r\n  a.external-link {\r\n    list-style-type: none;\r\n    padding-right: 0 !important;\r\n    background: inherit;\r\n  }\r\n}\r\n"
       },
       {
         "name": "style: glyphicons",
         "type": "CSS",
         "content": "a .glyphicon {\r\n  color: #333;\r\n}\r\n\r\n@font-face {\r\n  font-family: 'Glyphicons Halflings';\r\n  src: url([[/assets/fonts/glyphicons-halflings-regular.eot]]);\r\n  src: url([[/assets/fonts/glyphicons-halflings-regular.eot?#iefix]]) format('embedded-opentype'), url([[/assets/fonts/glyphicons-halflings-regular.woff2]]) format('woff2'), url([[/assets/fonts/glyphicons-halflings-regular.woff]]) format('woff'), url([[/assets/fonts/glyphicons-halflings-regular.ttf]]) format('truetype'), url([[/assets/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular]]) format('svg');\r\n}\r\n.glyphicon {\r\n  position: relative;\r\n  top: 1px;\r\n  display: inline-block;\r\n  font-family: 'Glyphicons Halflings';\r\n  font-style: normal;\r\n  font-weight: normal;\r\n  line-height: 1;\r\n\r\n  -webkit-font-smoothing: antialiased;\r\n  -moz-osx-font-smoothing: grayscale;\r\n}\r\n.glyphicon-asterisk:before {\r\n  content: \"\\2a\";\r\n}\r\n.glyphicon-plus:before {\r\n  content: \"\\2b\";\r\n}\r\n.glyphicon-euro:before,\r\n.glyphicon-eur:before {\r\n  content: \"\\20ac\";\r\n}\r\n.glyphicon-minus:before {\r\n  content: \"\\2212\";\r\n}\r\n.glyphicon-cloud:before {\r\n  content: \"\\2601\";\r\n}\r\n.glyphicon-envelope:before {\r\n  content: \"\\2709\";\r\n}\r\n.glyphicon-pencil:before {\r\n  content: \"\\270f\";\r\n}\r\n.glyphicon-glass:before {\r\n  content: \"\\e001\";\r\n}\r\n.glyphicon-music:before {\r\n  content: \"\\e002\";\r\n}\r\n.glyphicon-search:before {\r\n  content: \"\\e003\";\r\n}\r\n.glyphicon-heart:before {\r\n  content: \"\\e005\";\r\n}\r\n.glyphicon-star:before {\r\n  content: \"\\e006\";\r\n}\r\n.glyphicon-star-empty:before {\r\n  content: \"\\e007\";\r\n}\r\n.glyphicon-user:before {\r\n  content: \"\\e008\";\r\n}\r\n.glyphicon-film:before {\r\n  content: \"\\e009\";\r\n}\r\n.glyphicon-th-large:before {\r\n  content: \"\\e010\";\r\n}\r\n.glyphicon-th:before {\r\n  content: \"\\e011\";\r\n}\r\n.glyphicon-th-list:before {\r\n  content: \"\\e012\";\r\n}\r\n.glyphicon-ok:before {\r\n  content: \"\\e013\";\r\n}\r\n.glyphicon-remove:before {\r\n  content: \"\\e014\";\r\n}\r\n.glyphicon-zoom-in:before {\r\n  content: \"\\e015\";\r\n}\r\n.glyphicon-zoom-out:before {\r\n  content: \"\\e016\";\r\n}\r\n.glyphicon-off:before {\r\n  content: \"\\e017\";\r\n}\r\n.glyphicon-signal:before {\r\n  content: \"\\e018\";\r\n}\r\n.glyphicon-cog:before {\r\n  content: \"\\e019\";\r\n}\r\n.glyphicon-trash:before {\r\n  content: \"\\e020\";\r\n}\r\n.glyphicon-home:before {\r\n  content: \"\\e021\";\r\n}\r\n.glyphicon-file:before {\r\n  content: \"\\e022\";\r\n}\r\n.glyphicon-time:before {\r\n  content: \"\\e023\";\r\n}\r\n.glyphicon-road:before {\r\n  content: \"\\e024\";\r\n}\r\n.glyphicon-download-alt:before {\r\n  content: \"\\e025\";\r\n}\r\n.glyphicon-download:before {\r\n  content: \"\\e026\";\r\n}\r\n.glyphicon-upload:before {\r\n  content: \"\\e027\";\r\n}\r\n.glyphicon-inbox:before {\r\n  content: \"\\e028\";\r\n}\r\n.glyphicon-play-circle:before {\r\n  content: \"\\e029\";\r\n}\r\n.glyphicon-repeat:before {\r\n  content: \"\\e030\";\r\n}\r\n.glyphicon-refresh:before {\r\n  content: \"\\e031\";\r\n}\r\n.glyphicon-list-alt:before {\r\n  content: \"\\e032\";\r\n}\r\n.glyphicon-lock:before {\r\n  content: \"\\e033\";\r\n}\r\n.glyphicon-flag:before {\r\n  content: \"\\e034\";\r\n}\r\n.glyphicon-headphones:before {\r\n  content: \"\\e035\";\r\n}\r\n.glyphicon-volume-off:before {\r\n  content: \"\\e036\";\r\n}\r\n.glyphicon-volume-down:before {\r\n  content: \"\\e037\";\r\n}\r\n.glyphicon-volume-up:before {\r\n  content: \"\\e038\";\r\n}\r\n.glyphicon-qrcode:before {\r\n  content: \"\\e039\";\r\n}\r\n.glyphicon-barcode:before {\r\n  content: \"\\e040\";\r\n}\r\n.glyphicon-tag:before {\r\n  content: \"\\e041\";\r\n}\r\n.glyphicon-tags:before {\r\n  content: \"\\e042\";\r\n}\r\n.glyphicon-book:before {\r\n  content: \"\\e043\";\r\n}\r\n.glyphicon-bookmark:before {\r\n  content: \"\\e044\";\r\n}\r\n.glyphicon-print:before {\r\n  content: \"\\e045\";\r\n}\r\n.glyphicon-camera:before {\r\n  content: \"\\e046\";\r\n}\r\n.glyphicon-font:before {\r\n  content: \"\\e047\";\r\n}\r\n.glyphicon-bold:before {\r\n  content: \"\\e048\";\r\n}\r\n.glyphicon-italic:before {\r\n  content: \"\\e049\";\r\n}\r\n.glyphicon-text-height:before {\r\n  content: \"\\e050\";\r\n}\r\n.glyphicon-text-width:before {\r\n  content: \"\\e051\";\r\n}\r\n.glyphicon-align-left:before {\r\n  content: \"\\e052\";\r\n}\r\n.glyphicon-align-center:before {\r\n  content: \"\\e053\";\r\n}\r\n.glyphicon-align-right:before {\r\n  content: \"\\e054\";\r\n}\r\n.glyphicon-align-justify:before {\r\n  content: \"\\e055\";\r\n}\r\n.glyphicon-list:before {\r\n  content: \"\\e056\";\r\n}\r\n.glyphicon-indent-left:before {\r\n  content: \"\\e057\";\r\n}\r\n.glyphicon-indent-right:before {\r\n  content: \"\\e058\";\r\n}\r\n.glyphicon-facetime-video:before {\r\n  content: \"\\e059\";\r\n}\r\n.glyphicon-picture:before {\r\n  content: \"\\e060\";\r\n}\r\n.glyphicon-map-marker:before {\r\n  content: \"\\e062\";\r\n}\r\n.glyphicon-adjust:before {\r\n  content: \"\\e063\";\r\n}\r\n.glyphicon-tint:before {\r\n  content: \"\\e064\";\r\n}\r\n.glyphicon-edit:before {\r\n  content: \"\\e065\";\r\n}\r\n.glyphicon-share:before {\r\n  content: \"\\e066\";\r\n}\r\n.glyphicon-check:before {\r\n  content: \"\\e067\";\r\n}\r\n.glyphicon-move:before {\r\n  content: \"\\e068\";\r\n}\r\n.glyphicon-step-backward:before {\r\n  content: \"\\e069\";\r\n}\r\n.glyphicon-fast-backward:before {\r\n  content: \"\\e070\";\r\n}\r\n.glyphicon-backward:before {\r\n  content: \"\\e071\";\r\n}\r\n.glyphicon-play:before {\r\n  content: \"\\e072\";\r\n}\r\n.glyphicon-pause:before {\r\n  content: \"\\e073\";\r\n}\r\n.glyphicon-stop:before {\r\n  content: \"\\e074\";\r\n}\r\n.glyphicon-forward:before {\r\n  content: \"\\e075\";\r\n}\r\n.glyphicon-fast-forward:before {\r\n  content: \"\\e076\";\r\n}\r\n.glyphicon-step-forward:before {\r\n  content: \"\\e077\";\r\n}\r\n.glyphicon-eject:before {\r\n  content: \"\\e078\";\r\n}\r\n.glyphicon-chevron-left:before {\r\n  content: \"\\e079\";\r\n}\r\n.glyphicon-chevron-right:before {\r\n  content: \"\\e080\";\r\n}\r\n.glyphicon-plus-sign:before {\r\n  content: \"\\e081\";\r\n}\r\n.glyphicon-minus-sign:before {\r\n  content: \"\\e082\";\r\n}\r\n.glyphicon-remove-sign:before {\r\n  content: \"\\e083\";\r\n}\r\n.glyphicon-ok-sign:before {\r\n  content: \"\\e084\";\r\n}\r\n.glyphicon-question-sign:before {\r\n  content: \"\\e085\";\r\n}\r\n.glyphicon-info-sign:before {\r\n  content: \"\\e086\";\r\n}\r\n.glyphicon-screenshot:before {\r\n  content: \"\\e087\";\r\n}\r\n.glyphicon-remove-circle:before {\r\n  content: \"\\e088\";\r\n}\r\n.glyphicon-ok-circle:before {\r\n  content: \"\\e089\";\r\n}\r\n.glyphicon-ban-circle:before {\r\n  content: \"\\e090\";\r\n}\r\n.glyphicon-arrow-left:before {\r\n  content: \"\\e091\";\r\n}\r\n.glyphicon-arrow-right:before {\r\n  content: \"\\e092\";\r\n}\r\n.glyphicon-arrow-up:before {\r\n  content: \"\\e093\";\r\n}\r\n.glyphicon-arrow-down:before {\r\n  content: \"\\e094\";\r\n}\r\n.glyphicon-share-alt:before {\r\n  content: \"\\e095\";\r\n}\r\n.glyphicon-resize-full:before {\r\n  content: \"\\e096\";\r\n}\r\n.glyphicon-resize-small:before {\r\n  content: \"\\e097\";\r\n}\r\n.glyphicon-exclamation-sign:before {\r\n  content: \"\\e101\";\r\n}\r\n.glyphicon-gift:before {\r\n  content: \"\\e102\";\r\n}\r\n.glyphicon-leaf:before {\r\n  content: \"\\e103\";\r\n}\r\n.glyphicon-fire:before {\r\n  content: \"\\e104\";\r\n}\r\n.glyphicon-eye-open:before {\r\n  content: \"\\e105\";\r\n}\r\n.glyphicon-eye-close:before {\r\n  content: \"\\e106\";\r\n}\r\n.glyphicon-warning-sign:before {\r\n  content: \"\\e107\";\r\n}\r\n.glyphicon-plane:before {\r\n  content: \"\\e108\";\r\n}\r\n.glyphicon-calendar:before {\r\n  content: \"\\e109\";\r\n}\r\n.glyphicon-random:before {\r\n  content: \"\\e110\";\r\n}\r\n.glyphicon-comment:before {\r\n  content: \"\\e111\";\r\n}\r\n.glyphicon-magnet:before {\r\n  content: \"\\e112\";\r\n}\r\n.glyphicon-chevron-up:before {\r\n  content: \"\\e113\";\r\n}\r\n.glyphicon-chevron-down:before {\r\n  content: \"\\e114\";\r\n}\r\n.glyphicon-retweet:before {\r\n  content: \"\\e115\";\r\n}\r\n.glyphicon-shopping-cart:before {\r\n  content: \"\\e116\";\r\n}\r\n.glyphicon-folder-close:before {\r\n  content: \"\\e117\";\r\n}\r\n.glyphicon-folder-open:before {\r\n  content: \"\\e118\";\r\n}\r\n.glyphicon-resize-vertical:before {\r\n  content: \"\\e119\";\r\n}\r\n.glyphicon-resize-horizontal:before {\r\n  content: \"\\e120\";\r\n}\r\n.glyphicon-hdd:before {\r\n  content: \"\\e121\";\r\n}\r\n.glyphicon-bullhorn:before {\r\n  content: \"\\e122\";\r\n}\r\n.glyphicon-bell:before {\r\n  content: \"\\e123\";\r\n}\r\n.glyphicon-certificate:before {\r\n  content: \"\\e124\";\r\n}\r\n.glyphicon-thumbs-up:before {\r\n  content: \"\\e125\";\r\n}\r\n.glyphicon-thumbs-down:before {\r\n  content: \"\\e126\";\r\n}\r\n.glyphicon-hand-right:before {\r\n  content: \"\\e127\";\r\n}\r\n.glyphicon-hand-left:before {\r\n  content: \"\\e128\";\r\n}\r\n.glyphicon-hand-up:before {\r\n  content: \"\\e129\";\r\n}\r\n.glyphicon-hand-down:before {\r\n  content: \"\\e130\";\r\n}\r\n.glyphicon-circle-arrow-right:before {\r\n  content: \"\\e131\";\r\n}\r\n.glyphicon-circle-arrow-left:before {\r\n  content: \"\\e132\";\r\n}\r\n.glyphicon-circle-arrow-up:before {\r\n  content: \"\\e133\";\r\n}\r\n.glyphicon-circle-arrow-down:before {\r\n  content: \"\\e134\";\r\n}\r\n.glyphicon-globe:before {\r\n  content: \"\\e135\";\r\n}\r\n.glyphicon-wrench:before {\r\n  content: \"\\e136\";\r\n}\r\n.glyphicon-tasks:before {\r\n  content: \"\\e137\";\r\n}\r\n.glyphicon-filter:before {\r\n  content: \"\\e138\";\r\n}\r\n.glyphicon-briefcase:before {\r\n  content: \"\\e139\";\r\n}\r\n.glyphicon-fullscreen:before {\r\n  content: \"\\e140\";\r\n}\r\n.glyphicon-dashboard:before {\r\n  content: \"\\e141\";\r\n}\r\n.glyphicon-paperclip:before {\r\n  content: \"\\e142\";\r\n}\r\n.glyphicon-heart-empty:before {\r\n  content: \"\\e143\";\r\n}\r\n.glyphicon-link:before {\r\n  content: \"\\e144\";\r\n}\r\n.glyphicon-phone:before {\r\n  content: \"\\e145\";\r\n}\r\n.glyphicon-pushpin:before {\r\n  content: \"\\e146\";\r\n}\r\n.glyphicon-usd:before {\r\n  content: \"\\e148\";\r\n}\r\n.glyphicon-gbp:before {\r\n  content: \"\\e149\";\r\n}\r\n.glyphicon-sort:before {\r\n  content: \"\\e150\";\r\n}\r\n.glyphicon-sort-by-alphabet:before {\r\n  content: \"\\e151\";\r\n}\r\n.glyphicon-sort-by-alphabet-alt:before {\r\n  content: \"\\e152\";\r\n}\r\n.glyphicon-sort-by-order:before {\r\n  content: \"\\e153\";\r\n}\r\n.glyphicon-sort-by-order-alt:before {\r\n  content: \"\\e154\";\r\n}\r\n.glyphicon-sort-by-attributes:before {\r\n  content: \"\\e155\";\r\n}\r\n.glyphicon-sort-by-attributes-alt:before {\r\n  content: \"\\e156\";\r\n}\r\n.glyphicon-unchecked:before {\r\n  content: \"\\e157\";\r\n}\r\n.glyphicon-expand:before {\r\n  content: \"\\e158\";\r\n}\r\n.glyphicon-collapse-down:before {\r\n  content: \"\\e159\";\r\n}\r\n.glyphicon-collapse-up:before {\r\n  content: \"\\e160\";\r\n}\r\n.glyphicon-log-in:before {\r\n  content: \"\\e161\";\r\n}\r\n.glyphicon-flash:before {\r\n  content: \"\\e162\";\r\n}\r\n.glyphicon-log-out:before {\r\n  content: \"\\e163\";\r\n}\r\n.glyphicon-new-window:before {\r\n  content: \"\\e164\";\r\n}\r\n.glyphicon-record:before {\r\n  content: \"\\e165\";\r\n}\r\n.glyphicon-save:before {\r\n  content: \"\\e166\";\r\n}\r\n.glyphicon-open:before {\r\n  content: \"\\e167\";\r\n}\r\n.glyphicon-saved:before {\r\n  content: \"\\e168\";\r\n}\r\n.glyphicon-import:before {\r\n  content: \"\\e169\";\r\n}\r\n.glyphicon-export:before {\r\n  content: \"\\e170\";\r\n}\r\n.glyphicon-send:before {\r\n  content: \"\\e171\";\r\n}\r\n.glyphicon-floppy-disk:before {\r\n  content: \"\\e172\";\r\n}\r\n.glyphicon-floppy-saved:before {\r\n  content: \"\\e173\";\r\n}\r\n.glyphicon-floppy-remove:before {\r\n  content: \"\\e174\";\r\n}\r\n.glyphicon-floppy-save:before {\r\n  content: \"\\e175\";\r\n}\r\n.glyphicon-floppy-open:before {\r\n  content: \"\\e176\";\r\n}\r\n.glyphicon-credit-card:before {\r\n  content: \"\\e177\";\r\n}\r\n.glyphicon-transfer:before {\r\n  content: \"\\e178\";\r\n}\r\n.glyphicon-cutlery:before {\r\n  content: \"\\e179\";\r\n}\r\n.glyphicon-header:before {\r\n  content: \"\\e180\";\r\n}\r\n.glyphicon-compressed:before {\r\n  content: \"\\e181\";\r\n}\r\n.glyphicon-earphone:before {\r\n  content: \"\\e182\";\r\n}\r\n.glyphicon-phone-alt:before {\r\n  content: \"\\e183\";\r\n}\r\n.glyphicon-tower:before {\r\n  content: \"\\e184\";\r\n}\r\n.glyphicon-stats:before {\r\n  content: \"\\e185\";\r\n}\r\n.glyphicon-sd-video:before {\r\n  content: \"\\e186\";\r\n}\r\n.glyphicon-hd-video:before {\r\n  content: \"\\e187\";\r\n}\r\n.glyphicon-subtitles:before {\r\n  content: \"\\e188\";\r\n}\r\n.glyphicon-sound-stereo:before {\r\n  content: \"\\e189\";\r\n}\r\n.glyphicon-sound-dolby:before {\r\n  content: \"\\e190\";\r\n}\r\n.glyphicon-sound-5-1:before {\r\n  content: \"\\e191\";\r\n}\r\n.glyphicon-sound-6-1:before {\r\n  content: \"\\e192\";\r\n}\r\n.glyphicon-sound-7-1:before {\r\n  content: \"\\e193\";\r\n}\r\n.glyphicon-copyright-mark:before {\r\n  content: \"\\e194\";\r\n}\r\n.glyphicon-registration-mark:before {\r\n  content: \"\\e195\";\r\n}\r\n.glyphicon-cloud-download:before {\r\n  content: \"\\e197\";\r\n}\r\n.glyphicon-cloud-upload:before {\r\n  content: \"\\e198\";\r\n}\r\n.glyphicon-tree-conifer:before {\r\n  content: \"\\e199\";\r\n}\r\n.glyphicon-tree-deciduous:before {\r\n  content: \"\\e200\";\r\n}\r\n.glyphicon-cd:before {\r\n  content: \"\\e201\";\r\n}\r\n.glyphicon-save-file:before {\r\n  content: \"\\e202\";\r\n}\r\n.glyphicon-open-file:before {\r\n  content: \"\\e203\";\r\n}\r\n.glyphicon-level-up:before {\r\n  content: \"\\e204\";\r\n}\r\n.glyphicon-copy:before {\r\n  content: \"\\e205\";\r\n}\r\n.glyphicon-paste:before {\r\n  content: \"\\e206\";\r\n}\r\n.glyphicon-alert:before {\r\n  content: \"\\e209\";\r\n}\r\n.glyphicon-equalizer:before {\r\n  content: \"\\e210\";\r\n}\r\n.glyphicon-king:before {\r\n  content: \"\\e211\";\r\n}\r\n.glyphicon-queen:before {\r\n  content: \"\\e212\";\r\n}\r\n.glyphicon-pawn:before {\r\n  content: \"\\e213\";\r\n}\r\n.glyphicon-bishop:before {\r\n  content: \"\\e214\";\r\n}\r\n.glyphicon-knight:before {\r\n  content: \"\\e215\";\r\n}\r\n.glyphicon-baby-formula:before {\r\n  content: \"\\e216\";\r\n}\r\n.glyphicon-tent:before {\r\n  content: \"\\26fa\";\r\n}\r\n.glyphicon-blackboard:before {\r\n  content: \"\\e218\";\r\n}\r\n.glyphicon-bed:before {\r\n  content: \"\\e219\";\r\n}\r\n.glyphicon-apple:before {\r\n  content: \"\\f8ff\";\r\n}\r\n.glyphicon-erase:before {\r\n  content: \"\\e221\";\r\n}\r\n.glyphicon-hourglass:before {\r\n  content: \"\\231b\";\r\n}\r\n.glyphicon-lamp:before {\r\n  content: \"\\e223\";\r\n}\r\n.glyphicon-duplicate:before {\r\n  content: \"\\e224\";\r\n}\r\n.glyphicon-piggy-bank:before {\r\n  content: \"\\e225\";\r\n}\r\n.glyphicon-scissors:before {\r\n  content: \"\\e226\";\r\n}\r\n.glyphicon-bitcoin:before {\r\n  content: \"\\e227\";\r\n}\r\n.glyphicon-yen:before {\r\n  content: \"\\00a5\";\r\n}\r\n.glyphicon-ruble:before {\r\n  content: \"\\20bd\";\r\n}\r\n.glyphicon-scale:before {\r\n  content: \"\\e230\";\r\n}\r\n.glyphicon-ice-lolly:before {\r\n  content: \"\\e231\";\r\n}\r\n.glyphicon-ice-lolly-tasted:before {\r\n  content: \"\\e232\";\r\n}\r\n.glyphicon-education:before {\r\n  content: \"\\e233\";\r\n}\r\n.glyphicon-option-horizontal:before {\r\n  content: \"\\e234\";\r\n}\r\n.glyphicon-option-vertical:before {\r\n  content: \"\\e235\";\r\n}\r\n.glyphicon-menu-hamburger:before {\r\n  content: \"\\e236\";\r\n}\r\n.glyphicon-modal-window:before {\r\n  content: \"\\e237\";\r\n}\r\n.glyphicon-oil:before {\r\n  content: \"\\e238\";\r\n}\r\n.glyphicon-grain:before {\r\n  content: \"\\e239\";\r\n}\r\n.glyphicon-sunglasses:before {\r\n  content: \"\\e240\";\r\n}\r\n.glyphicon-text-size:before {\r\n  content: \"\\e241\";\r\n}\r\n.glyphicon-text-color:before {\r\n  content: \"\\e242\";\r\n}\r\n.glyphicon-text-background:before {\r\n  content: \"\\e243\";\r\n}\r\n.glyphicon-object-align-top:before {\r\n  content: \"\\e244\";\r\n}\r\n.glyphicon-object-align-bottom:before {\r\n  content: \"\\e245\";\r\n}\r\n.glyphicon-object-align-horizontal:before {\r\n  content: \"\\e246\";\r\n}\r\n.glyphicon-object-align-left:before {\r\n  content: \"\\e247\";\r\n}\r\n.glyphicon-object-align-vertical:before {\r\n  content: \"\\e248\";\r\n}\r\n.glyphicon-object-align-right:before {\r\n  content: \"\\e249\";\r\n}\r\n.glyphicon-triangle-right:before {\r\n  content: \"\\e250\";\r\n}\r\n.glyphicon-triangle-left:before {\r\n  content: \"\\e251\";\r\n}\r\n.glyphicon-triangle-bottom:before {\r\n  content: \"\\e252\";\r\n}\r\n.glyphicon-triangle-top:before {\r\n  content: \"\\e253\";\r\n}\r\n.glyphicon-console:before {\r\n  content: \"\\e254\";\r\n}\r\n.glyphicon-superscript:before {\r\n  content: \"\\e255\";\r\n}\r\n.glyphicon-subscript:before {\r\n  content: \"\\e256\";\r\n}\r\n.glyphicon-menu-left:before {\r\n  content: \"\\e257\";\r\n}\r\n.glyphicon-menu-right:before {\r\n  content: \"\\e258\";\r\n}\r\n.glyphicon-menu-down:before {\r\n  content: \"\\e259\";\r\n}\r\n.glyphicon-menu-up:before {\r\n  content: \"\\e260\";\r\n}"
       },
-      {
-        "name": "style: bootstrap cards",
-        "type": "SCSS",
-        "content": "#menu {\r\n  margin-bottom: 30px;\r\n  \r\n  .navbox-form {\r\n    width: 30%;\r\n  }\r\n  .form-group {\r\n    width: 100%;\r\n    input {\r\n      width: 100%;\r\n    }\r\n  }\r\n  a {\r\n    font-size: 1.3em;\r\n  }\r\n}\r\n\r\n@media print {\r\n  #menu {\r\n    display: none;\r\n  }\r\n}\r\n\r\n\r\n\r\n/* the logo and credit will not be in the sidebar in most new layouts */\r\n\r\n#secondary {\r\n  > div {\r\n    > a > .SELF-Xlogo.content-view,\r\n    > .SELF-Xcredit.content-view {\r\n      display: block;\r\n      text-align: center;\r\n      padding: 10px;\r\n      background: #fff;\r\n      border: 1px solid #bbb;\r\n      -moz-border-radius: 8px;\r\n      border-radius: 8px;\r\n      img {\r\n        max-width: 100%;\r\n      }\r\n      a {\r\n        color: #186886; /* NOTGREY - Wagn blue */\r\n      }\r\n    }\r\n  }  \r\n}\r\n\r\n\r\n\r\n.closed-content {\r\n  font-size: 11px !important;\r\n}\r\n\r\n\r\n/* english content in css.  ugh */\r\n.search-no-results:after {\r\n  content:'0 results';\r\n}\r\n.closed-content .search-no-results:after {\r\n  content:'';\r\n}\r\n\r\nlegend {\r\n  h2 {\r\n    font-size: 0.7em;\r\n  }\r\n  border: 0;\r\n}\r\n\r\n\r\n"
-      },
       {
         "name": "Default Layout",
         "type": "Layout",
-        "content": "<!DOCTYPE HTML>\r\n<html>\r\n  <head>\r\n    {{*head}}\r\n  </head>\r\n  \r\n  <body>\r\n    <div id=\"menu\">\r\n      {{*page header}}\r\n    </div>\r\n    \r\n    <div id=\"primary\">\r\n      {{_main}}\r\n    </div>\r\n    \r\n    <div id=\"secondary\">\r\n      {{*sidebar}}\r\n    </div>\r\n  </body>\r\n</html>"
+        "content": "<!DOCTYPE HTML>\r\n<html>\r\n  <head>{{*head|core}}</head>\r\n  <body>\r\n    <header>{{*header|core}}</header>\r\n    <article>{{_main}}</article>\r\n    <aside>{{*sidebar|core}}</aside>\r\n    <footer>{{*footer|core}}</footer>\r\n  </body>\r\n</html>"
       },
       {
         "name": "*all+*script",
@@ -72,9 +57,39 @@
         "content": "[[script: jquery]]\n[[script: tinymce]]\n[[script: slot]]\n[[script: card menu]]\n[[script: jquery helper]]\n[[script: bootstrap]]\n[[script: ace]]"
       },
       {
-        "name": "*page header",
+        "name": "*header",
+        "type": "HTML",
+        "content": "<div class=\"navbar navbar-default navbar-static-top\">\r\n  <div class=\"container-fluid\">\r\n    <div class=\"navbar-header\">\r\n      <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#navbar-collapse-1\">\r\n        <span class=\"sr-only\">Toggle navigation</span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n        </button>\r\n    </div>\r\n    <div class=\"collapse navbar-collapse\" id=\"navbar-collapse-1\">\r\n      {{*main menu|navbar_left}}  \r\n      {{*navbox|navbar_left}}\r\n      {{*account links|navbar_right}}\r\n    </div>\r\n  </div>\r\n</div>"
+      },
+      {
+        "name": "*footer",
         "type": "HTML",
-        "content": "<div class=\"navbar navbar-default navbar-static-top\">\r\n  <div class=\"container-fluid\">\r\n    <div class=\"navbar-header\">\r\n      <button type=\"button\" class=\"navbar-toggle collapsed\" data-toggle=\"collapse\" data-target=\"#navbar-collapse-1\">\r\n        <span class=\"sr-only\">Toggle navigation</span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n          <span class=\"icon-bar\"></span>\r\n        </button>\r\n    </div>\r\n    <div class=\"collapse navbar-collapse\" id=\"navbar-collapse-1\">\r\n      <ul class=\"nav navbar-nav navbar-left\">\r\n        <li>[[/ | Home]]</li>\r\n        <li>[[/recent | Recent]]</li>\r\n      </ul>   \r\n      {{*navbox|navbar_left}}\r\n    \r\n      {{*account links|navbar_right}}\r\n    </div>\r\n  </div>\r\n</div>"
+        "content": ""
+      },
+      {
+        "name": "style: right sidebar",
+        "type": "SCSS",
+        "content": "/*\r\nThis stylesheet defines a simple layout with the sidebar at right.\r\n*/\r\narticle,\r\n#primary {\r\n  margin: 0 1% 3em 1%;\r\n  float: left;\r\n  width: 67%;\r\n}\r\n\r\naside,\r\n#secondary {\r\n  margin: 0 1% 3em 1%;\r\n  float: right;\r\n  width: 28%;\r\n}\r\n\r\nfooter {\r\n  clear:both;\r\n  text-align: center;\r\n  padding: 1em;\r\n}\r\n\r\n@media print {\r\n  article,\r\n  #primary {\r\n    width: 100%;\r\n    float: none;\r\n    margin: 0;\r\n  }\r\n\r\n  aside,\r\n  #secondary,\r\n  footer {\r\n    display: none;\r\n  }\r\n}\r\n"
+      },
+      {
+        "name": "*credit",
+        "type": "Basic",
+        "content": "<div>{{+image}}</div>\r\n<div><a href=\"http://wagn.org\">Wagn v{{*version|core}}</a></div>"
+      },
+      {
+        "name": "*main menu",
+        "type": "HTML",
+        "content": "[[/|Home]]\r\n[[/:recent|Recent]]"
+      },
+      {
+        "name": "*style+*right+*option label",
+        "type": "Phrase",
+        "content": "Image"
+      },
+      {
+        "name": "*style+*right+*options",
+        "type": "Search",
+        "content": "{\"type\":\"Skin\", \"sort\":\"name\"}"
       }
     ]
   }

data/db/migrate_core_cards/data/skin_images.json

@@ -0,0 +1,91 @@
+{
+  "url": "http://localhost:3000/skin_images.json",
+  "timestamp": "2015-03-23 22:05:24 -0600",
+  "card": {
+    "name": "skin images",
+    "type": "Search",
+    "content": "{\"type\":\"Skin\",\"append\":\"Image\"}",
+    "value": [
+      {
+        "name": "yeti skin+Image",
+        "type": "Image",
+        "content": "yeti.png\nimage/png\n20422\n06_bootstrap"
+      },
+      {
+        "name": "united skin+Image",
+        "type": "Image",
+        "content": "united.png\nimage/png\n23118\n06_bootstrap"
+      },
+      {
+        "name": "superhero skin+Image",
+        "type": "Image",
+        "content": "superhero.png\nimage/png\n25186\n06_bootstrap"
+      },
+      {
+        "name": "spacelab skin+Image",
+        "type": "Image",
+        "content": "spacelab.png\nimage/png\n37532\n06_bootstrap"
+      },
+      {
+        "name": "slate skin+Image",
+        "type": "Image",
+        "content": "slate.png\nimage/png\n56970\n06_bootstrap"
+      },
+      {
+        "name": "lumen skin+Image",
+        "type": "Image",
+        "content": "lumen.png\nimage/png\n19351\n06_bootstrap"
+      },
+      {
+        "name": "paper skin+Image",
+        "type": "Image",
+        "content": "paper.png\nimage/png\n25645\n06_bootstrap"
+      },
+      {
+        "name": "readable skin+Image",
+        "type": "Image",
+        "content": "readable.png\nimage/png\n28367\n06_bootstrap"
+      },
+      {
+        "name": "sandstone skin+Image",
+        "type": "Image",
+        "content": "sandstone.png\nimage/png\n21569\n06_bootstrap"
+      },
+      {
+        "name": "simplex skin+Image",
+        "type": "Image",
+        "content": "simplex.png\nimage/png\n26736\n06_bootstrap"
+      },
+      {
+        "name": "journal skin+Image",
+        "type": "Image",
+        "content": "journal.png\nimage/png\n27152\n06_bootstrap"
+      },
+      {
+        "name": "flatly skin+Image",
+        "type": "Image",
+        "content": "flatly.png\nimage/png\n26907\n06_bootstrap"
+      },
+      {
+        "name": "darkly skin+Image",
+        "type": "Image",
+        "content": "darkly.png\nimage/png\n25944\n06_bootstrap"
+      },
+      {
+        "name": "cyborg skin+Image",
+        "type": "Image",
+        "content": "cyborg.png\nimage/png\n24791\n06_bootstrap"
+      },
+      {
+        "name": "cerulean skin+Image",
+        "type": "Image",
+        "content": "cerulean.png\nimage/png\n39151\n06_bootstrap"
+      },
+      {
+        "name": "cosmo skin+Image",
+        "type": "Image",
+        "content": "cosmo.png\nimage/png\n22812\n06_bootstrap"
+      }
+    ]
+  }
+}

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150220134731) do
+ActiveRecord::Schema.define(:version => 20141216053032) do
 
   create_table "card_actions", :force => true do |t|
     t.integer "card_id"

data/db/version_core_cards.txt

@@ -1 +1 @@
-20150220134731
+20150317162412

data/lib/card/format.rb

@@ -114,15 +114,15 @@ class Card
       end
     end
   
-    def inclusion_defaults
+    def inclusion_defaults nested_card
       @inclusion_defaults ||= begin
-        defaults = get_inclusion_defaults.clone
+        defaults = get_inclusion_defaults(nested_card).clone
         defaults.merge! @inclusion_opts if @inclusion_opts
         defaults
       end
     end
     
-    def get_inclusion_defaults
+    def get_inclusion_defaults nested_card
       { :view => :name }
     end
     
@@ -405,7 +405,7 @@ class Card
       opts.merge! root.main_opts if root.main_opts
       legacy_main_opts_tweaks! opts
 
-      opts[:view] ||= :open
+      #opts[:view] ||= :open
       with_inclusion_mode :normal do
         @mainline = true
         result = wrap_main nest( root.card, opts )
@@ -431,7 +431,7 @@ class Card
     def nest nested_card, opts={}
       #ActiveSupport::Notifications.instrument('card', message: "nest: #{nested_card.name}, #{opts}") do
       opts.delete_if { |k,v| v.nil? }
-      opts.reverse_merge! inclusion_defaults
+      opts.reverse_merge! inclusion_defaults(nested_card)
     
       sub = nil
       if opts[:inc_name] =~ /^_(self)?$/
@@ -514,7 +514,7 @@ class Card
       def page_path title, opts={}
         Rails.logger.warn "Pass only Card::Name to page_path #{title.class}, #{title}" unless Card::Name===title
         format = opts[:format] ? ".#{opts.delete(:format)}"  : ''
-        action = ( (path_opts = opts.delete(:path_opts)) && path_opts[:action] ) ? "#{path_opts[:action]}/" : ''
+        action = opts[:action] ? "#{opts.delete(:action)}/" : ''
         query  = opts.present? ? "?#{opts.to_param}"         : ''
         card_path "#{action}#{title.to_name.url_key}#{format}#{query}"
       end

data/lib/card/migration.rb

@@ -74,11 +74,16 @@ class Card::Migration < ActiveRecord::Migration
     end
   end
 
-  def import_json filename
+  def import_json filename, merge_opts={}
     Card.config.action_mailer.perform_deliveries = false
+    merge_opts.reverse_merge! :output_file=>File.join(data_path,"unmerged_#{ filename }")
+    Card.merge_list read_json(filename), merge_opts
+  end
+  
+  def read_json filename
     raw_json = File.read( data_path filename )
     json = JSON.parse raw_json
-    Card.merge_list json["card"]["value"], :output_file=>File.join(data_path,"unmerged_#{ filename }")
+    json["card"]["value"]
   end
 
   def data_path filename=nil

data/mod/01_core/chunk/include.rb

@@ -80,6 +80,16 @@ module Card::Chunk
       replace_name_reference old_name, new_name
       @text = "{{#{ [ @name.to_s, @opt_lists ].compact * '|' }}}"
     end
+    
+    def explicit_view= view
+      unless @options[:view] #could check to make sure it's not already the default...
+        if @text =~ /\|/
+          @text.sub! '|', "|#{view};"
+        else
+          @text.sub! '}}', "|#{view}}}"
+        end
+      end
+    end
 
   end
 end

data/mod/01_core/format/html_format.rb

@@ -11,11 +11,6 @@ class Card
 
     # builtin layouts allow for rescue / testing
     LAYOUTS = Loader.load_layouts.merge 'none' => '{{_main}}'
-
-    INCLUSION_DEFAULTS = {
-      :layout => { :view => :core },
-      :normal => { :view => :content }
-    }
   
     # helper methods for layout view
     def get_layout_content
@@ -45,9 +40,8 @@ class Card
       end
     end
     
-    
-    def get_inclusion_defaults
-      INCLUSION_DEFAULTS[@mode] || {}
+    def get_inclusion_defaults nested_card
+      {:view => (nested_card.rule( :default_html_view ) || :titled) }
     end
   
     def default_item_view

data/mod/01_core/set/all/collection.rb

@@ -104,6 +104,10 @@ end
 
 format do
   
+  def item_links(args={})
+    raw(render_core).split /[,\n]/
+  end
+  
   def search_params
     @search_params ||= begin
       p = default_search_params.clone