trusty-cms 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee558134a0a7a3611b01ff677735a3e3001d71c
-  data.tar.gz: e41d01911b6dbbd737611ad1563a19da0098f857
+  metadata.gz: 61a84f2bd93709b64869694e7067273bc1270bdd
+  data.tar.gz: f711721cc535cba983db9c901b61bbdd92bc43af
 SHA512:
-  metadata.gz: 3795b0d9fda51ceff1ed66f3d5970bdfdfcbd50bf9b6dfb367925a45f416ceac28232ddc2526b36492c7bc288ececf1149f285af96f12d4810ece69d23db2000
-  data.tar.gz: de99a2990429570059050e8f34ab325ff32d67ac3ca8b95ec7def1b248fab3764e096d390819298a79fc3d935def5a04ab6e2c9f071bf42246611fcf52bfc459
+  metadata.gz: b5b58ab4bab431abe55d905d449aaf6ba8ba1bfbe3520811db825f204a3c3049ac6503718741d788a0e6d2839d8051b141a5ca72e819b13b6c83631ffd7a2ab7
+  data.tar.gz: 42b3963bf35438c0b88620a6c416a1a2758aa9dc7c79be5821da062582afb8f8e6135d55ef44d0872692f8bf9e2970a80d70c90cf58a68deee4a0baf8fe456c7

data/Gemfile

@@ -22,4 +22,5 @@ group :development, :test do
   gem 'pry-byebug'
   gem 'rails-observers'
   gem 'rspec-rails'
+  gem 'sass-rails'
 end

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.5.0)
+    trusty-cms (3.5.1)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)
       bundler (~> 1.7)
-      ckeditor (~> 4.2.2)
-      compass-rails (>= 3.0.2, < 3.2.0)
+      ckeditor (>= 4.2.2, < 4.4.0)
       delocalize (>= 0.2, < 2.0)
       execjs (~> 2.7)
       haml (~> 5.0)
@@ -34,48 +33,48 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts_as_list (0.9.16)
+    acts_as_list (0.9.17)
       activerecord (>= 3.0)
     acts_as_tree (2.8.0)
       activerecord (>= 3.0.0)
@@ -91,34 +90,15 @@ GEM
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       xpath (~> 3.1)
-    chunky_png (1.3.10)
-    ckeditor (4.2.4)
-      cocaine
+    ckeditor (4.3.0)
       orm_adapter (~> 0.5.0)
+      terrapin
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.6.0)
-      terrapin (= 0.6.0)
-    codeclimate-test-reporter (1.0.8)
+    codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
     coderay (1.1.2)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    compass-rails (3.1.0)
-      compass (~> 1.0.0)
-      sass-rails (< 5.1)
-      sprockets (< 4.0)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     crass (1.0.4)
     css_parser (1.6.0)
       addressable
@@ -127,7 +107,7 @@ GEM
       rails (>= 2)
     diff-lcs (1.3)
     docile (1.1.5)
-    erubi (1.7.1)
+    erubi (1.8.0)
     erubis (2.7.0)
     execjs (2.7.0)
     factory_bot (4.11.1)
@@ -135,8 +115,8 @@ GEM
     factory_bot_rails (4.11.1)
       factory_bot (~> 4.11.1)
       railties (>= 3.0.0)
-    ffi (1.9.25)
-    globalid (0.4.1)
+    ffi (1.10.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     haml (5.0.4)
       temple (>= 0.8.0)
@@ -147,15 +127,16 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (2.0.0)
+    highline (2.0.1)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.16.2)
+    httparty (0.16.3)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.1.0)
+    i18n (1.4.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     kraken-io (0.1.3)
@@ -166,28 +147,27 @@ GEM
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mysql2 (0.5.2)
     nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     paperclip (6.1.0)
       activemodel (>= 4.2.0)
@@ -206,24 +186,24 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     public_suffix (3.0.2)
-    rack (2.0.5)
+    rack (2.0.6)
     rack-cache (1.8.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.4)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.1)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -232,17 +212,17 @@ GEM
       loofah (~> 2.2, >= 2.2.2)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rdoc (6.0.4)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rdoc (6.1.1)
     ref (2.0.0)
     roadie (3.4.0)
       css_parser (~> 1.4)
@@ -252,13 +232,13 @@ GEM
       roadie (~> 3.1)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.0)
+    rspec-rails (3.8.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -267,9 +247,13 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    ruby_parser (3.11.0)
+    ruby_parser (3.12.0)
       sexp_processor (~> 4.9)
-    sass (3.4.25)
+    sass (3.7.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (5.0.7)
       railties (>= 4.0.0, < 6)
       sass (~> 3.1)
@@ -289,21 +273,21 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stringex (2.8.4)
+    stringex (2.8.5)
     temple (0.8.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     trustygems (0.2.1)
       rake
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.19)
+    uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     uuidtools (2.1.5)
     websocket-driver (0.7.0)
@@ -327,8 +311,9 @@ DEPENDENCIES
   pry-byebug
   rails-observers
   rspec-rails
+  sass-rails
   trusty-cms!
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.16.5
+   1.17.3

data/app/assets/stylesheets/admin/_base.scss

@@ -14,4 +14,3 @@ $primary-tab-current: white;
 // Modules
 @import "modules/links";
 @import "modules/boxes";
-@import "modules/gradients";

data/app/assets/stylesheets/admin/_reset.scss

@@ -0,0 +1,55 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font: inherit;
+  font-size: 100%;
+  vertical-align: baseline;
+}
+
+html {
+  line-height: 1;
+}
+
+ol, ul {
+  list-style: none;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+  vertical-align: middle;
+}
+
+q, blockquote {
+  quotes: none;
+}
+q:before, q:after, blockquote:before, blockquote:after {
+  content: "";
+  content: none;
+}
+
+a img {
+  border: none;
+}
+
+article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
+  display: block;
+}

data/app/assets/stylesheets/admin/_site_chooser.scss

@@ -45,7 +45,6 @@ $black: #000;
 		}
 		&.site-link:hover {
 			color: $color_turquoise_blue_approx;
-			//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
 			transition: all 0.2s;
 		}
 	}
@@ -57,20 +56,18 @@ $black: #000;
 		margin-top: 10px;
 		visibility: hidden;
 		opacity: 0;
-		//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
 		transition: opacity 0.2s;
 		li {
 			float: none;
 		}
 		a {
-			white-space: nowrap; 
+			white-space: nowrap;
 		}
 	}
 	&:hover ul {
 		visibility: visible;
 		opacity: 1;
-		//Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
 		transition: opacity 0.2s;
 		z-index: 99999;
 	}
-}
+}

data/app/assets/stylesheets/admin/assets.scss

@@ -1,9 +1,7 @@
-@import "compass";
-
 p.asset {
   img.preview {
     border: 5px solid white;
-    @include box-shadow;
+    box-shadow: 0 5px #333;
 }
 }
 
@@ -11,7 +9,7 @@ p.asset {
   float: left;
   padding: 2px 0;
   a {
-    @include border-radius(100px);
+    border-radius: 100px;
     color: #555555;
     padding: 3px 8px;
     text-decoration: none;
@@ -21,12 +19,12 @@ p.asset {
   }
     &.pressed {
       background: #888888;
-      @include box-shadow(0, 1px, 1px, #333333, inset);
+      box-shadow: inset 0 1px 1px #333;
       color: white;
       text-shadow: 0 1px 0 #333333;
       &:hover {
         background: #888888;
-        @include box-shadow(0, 1px, 1px, #333333, inset);
+        box-shadow: inset 0 1px 1px #333;
         color: white;
         text-shadow: 0 1px 0 #333333;
     }
@@ -37,14 +35,18 @@ p.asset {
 .popup {
   div.toolbar {
     background: white;
-    @include background-image(linear-gradient(white, #dddddd));
+    background-image: linear-gradient(#ffffff, #dddddd);
     border-bottom: 1px solid #cccccc;
-    @include single-box-shadow(white, 0, 1px, 0);
+    box-shadow: 0 1px 0 white;
     margin: -20px -20px 0;
     padding: 6px 10px 3px 10px;
     font-size: 95%;
     height: 30px;
-    @include clearfix;
+    &:after {
+      clear: both;
+      content: "";
+      display: block;
+    }
     .right {
       float: right;
   }
@@ -52,13 +54,13 @@ p.asset {
       padding: 4px 2px 0;
       input[type=search] {
         font-size: 12px;
-        @include border-radius(100px);
+        border-radius: 100px;
         border: 1px solid #cccccc;
         border-top-color: #999999;
         border-left-color: #b0b0b0;
         border-right-color: #bbbbbb;
         background: white url("/assets/admin/search.png") 4px center no-repeat;
-        @include box-shadow(rgba(black, 0.2), 0, 1px, 0, inset);
+        box-shadow: inset 0 1px 0 rgba(black, 0.2);
         width: 180px;
         padding: 2px 8px 2px 20px;
     }
@@ -85,8 +87,13 @@ p.asset {
   text-align: right;
   margin-bottom: -1em;
   ul {
-    @include inline-list;
-}
+    list-style-type: none;
+    &, & li {
+      margin: 0;
+      padding: 0;
+      display: inline;
+    }
+  }
   li {
     padding-left: 1em;
 }
@@ -119,13 +126,13 @@ p.asset {
         text-align: center;
     }
       .front {
-        @include box-shadow;
+        box-shadow: 0 5px #333;
         text-align: center;
     }
       .back {
         color: #333333;
         overflow: hidden;
-        @include opacity(0);
+        opacity: 0;
     }
       .title {
         color: #333333;
@@ -152,7 +159,7 @@ p.asset {
         a {
           background: #666666;
           background: rgba(black, 0.8);
-          @include border-radius;
+          border-radius: 5px;
           color: #dddddd;
           display: block;
           padding: 2px 10px;
@@ -171,7 +178,7 @@ p.asset {
     }
       &:hover {
         .back {
-          @include opacity(1);
+          opacity: 1;
           background: rgba(white, 0.6);
       }
     }
@@ -192,7 +199,8 @@ p.asset {
 }
 
 #attachment_list.assets {
-  @include border-bottom-radius;
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
   margin: -1em 0.5em 1em 0.5em;
   overflow-y: hidden;
   overflow-x: auto;
@@ -251,7 +259,7 @@ p.asset {
       float: left;
       padding: 0.25em;
       margin: 1em 2px 1em 0;
-      @include border-radius(2px);
+      border-radius: 2px;
       text-decoration: none;
   }
     span.current {