caboose-cms 0.9.115 → 0.9.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c881ecff72b90de1f04649f55304be6eedfe0eae
-  data.tar.gz: a79e20da78208dbcecc615da798fb73bff964760
+  metadata.gz: d420edee4905eb0c5efd46fad49653ef02b8ae80
+  data.tar.gz: 76eb6c0655e6c15e69fad16c5e408cfb21e0080e
 SHA512:
-  metadata.gz: 1be162c82d2f71eec2df372e02de03204520bc920952608c03445f8f2c03f550f0b11a07a876e5c71d5cfe6dac2d476dc7e88fe9ce425d83b99c1ba54d464e16
-  data.tar.gz: 2e5c6970cac98644bdaeddb720fc99231069439bb13c70d8356dd538b8ab4a8d76d2a2a1afe3fe5e057d1ab997de6671e49802dd11fed55152a57b886217244d
+  metadata.gz: 66f57a094bb0866aad1768dc62cfdbb7646b8c827fe701ffc16893d004a6524e4f153eaa111bd59cfda70c6a3d561ad1c055b04a1f88809736d5385e8b5f6962
+  data.tar.gz: 9fcf35c4256ded02237a17fe400b26c59412ec4851fc075003304d42a1d8d0bc40332192217d9f54122ee3c561c11e9e882d4cfcdabf1d050bd829322ccbfcb4

data/app/assets/stylesheets/caboose/admin_block_edit_image.css.scss

@@ -214,12 +214,14 @@
 
 .caboose-btn {
   background: #141516; 
-  color: #f7f7f7;
+  color: #f7f7f7 !important;
   text-align: center; 
   padding: 0 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
+  font-family: "Roboto", Arial;
+  font-weight: 400;
   font-size: 15px;
   line-height: 32px;
   cursor: pointer;
@@ -229,7 +231,7 @@
   border-width: 0;
   -webkit-appearance: none;
   border-radius: 5px; 
-  text-decoration: none;
+  text-decoration: none !important;
   margin-right: 8px;
 }
 .caboose-btn:focus {

data/app/assets/stylesheets/caboose/admin_main.css

@@ -25,6 +25,11 @@ body * {
   background: url('/assets/caboose/modal_overlay.png') !important;
 }
 
+#modal_content div .caboose-btn {
+  color: #fff;
+  text-decoration: none;
+}
+
 #cboxWrapper {
   -webkit-border-radius: 7px !important;
   -moz-border-radius: 7px !important;
@@ -612,7 +617,7 @@ Page Bar Generator
 
 .caboose-btn {
   background: #141516; 
-  color: #f7f7f7;
+  color: #f7f7f7 !important;
   text-align: center; 
   font-family: "Roboto", Arial;
   font-weight: 400;
@@ -629,13 +634,13 @@ Page Bar Generator
   border-width: 0;
   -webkit-appearance: none;
   border-radius: 5px; 
-  text-decoration: none;
+  text-decoration: none !important;
 }
 
 .caboose-btn-white, input[type="submit"], input[type="button"] {
   background: #e3e3e3; 
   border: 1px solid #fff;
-  color: #141516;
+  color: #141516 !important;
   text-align: center; 
   font-family: "Roboto", Arial;
   font-weight: 400;
@@ -651,7 +656,7 @@ Page Bar Generator
   -moz-border-radius: 5px;
   border-radius: 5px;
   line-height: 32px;
-  text-decoration: none;
+  text-decoration: none !important;
 }
 
 .caboose-btn:focus {

data/app/views/caboose/pages/_new_block_header.html.erb

@@ -1,28 +1,32 @@
 <%
 btsm = Caboose::BlockTypeSiteMembership.where(:site_id => @site.id).pluq(:block_type_id)
+grid = Caboose::BlockType.where(:name => 'flex_grid').first
 @block_types = Caboose::BlockType.where(:parent_id => nil, :block_type_category_id => 2).where(:id => btsm).order(:description)
 %>
 
 <div class='icons' id='new_blocks_container2'>
   <h4>Drag a block<br />onto the page.</h4>
+ 
   <ul id='new_blocks'>
-  	<li class='title'><span>Structure</span></li>
-  	<li class='blocktype bt' id='new_block_3159_2' data-btid='3159' data-children='2'>
-  		<span class='icon icon-insert-template'></span>
-  		<span class='bname'>2 Column Row</span>
-  	</li>
-  	<li class='blocktype bt' id='new_block_3159_3' data-btid='3159' data-children='3'>
-  		<span class='icon icon-insert-template'></span>
-  		<span class='bname'>3 Column Row</span>
-  	</li>
-  	<li class='blocktype bt' id='new_block_3159_4' data-btid='3159' data-children='4'>
-  		<span class='icon icon-insert-template'></span>
-  		<span class='bname'>4 Column Row</span>
-  	</li>
-  	<li class='blocktype bt' id='new_block_3159_5' data-btid='3159' data-children='5'>
-  		<span class='icon icon-insert-template'></span>
-  		<span class='bname'>5 Column Row</span>
-  	</li>
+    <% if grid %>
+    	<li class='title'><span>Structure</span></li>
+    	<li class='blocktype bt' id='new_block_<%= grid.id %>_2' data-btid='<%= grid.id %>' data-children='2'>
+    		<span class='icon icon-insert-template'></span>
+    		<span class='bname'>2 Column Row</span>
+    	</li>
+    	<li class='blocktype bt' id='new_block_<%= grid.id %>_3' data-btid='<%= grid.id %>' data-children='3'>
+    		<span class='icon icon-insert-template'></span>
+    		<span class='bname'>3 Column Row</span>
+    	</li>
+    	<li class='blocktype bt' id='new_block_<%= grid.id %>_4' data-btid='<%= grid.id %>' data-children='4'>
+    		<span class='icon icon-insert-template'></span>
+    		<span class='bname'>4 Column Row</span>
+    	</li>
+    	<li class='blocktype bt' id='new_block_<%= grid.id %>_5' data-btid='<%= grid.id %>' data-children='5'>
+    		<span class='icon icon-insert-template'></span>
+    		<span class='bname'>5 Column Row</span>
+    	</li>
+    <% end %>
   	<li class='title'><span>Content</span></li>
     <% @block_types.each do |block_type| %>
     	<li class='blocktype bt' id='new_block_<%= block_type.id %>' data-btid='<%= block_type.id %>'>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.115'
+  VERSION = '0.9.116'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.115
+  version: 0.9.116
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg