uniform-ui 2.2.2 → 2.3.2

data/lib/assets/stylesheets/uniform/defaults.scss

@@ -79,11 +79,6 @@ button{
     line-height: inherit;
 }
 
-#{$text-inputs},
-textarea{
-    border:1px solid lighten(color('gray'), 40);
-}
-
 [hidden] {
     display: none !important;
 }
@@ -94,6 +89,6 @@ time{
 
 button{
     font-family: $system-font;
-    color: color('gray');
+    color: color('gray-darkest');
     cursor: pointer;
 }

data/lib/assets/stylesheets/uniform/functions.scss

@@ -14,18 +14,48 @@
     @return $string;
 }
 
+@function uri-encode($svg) {
+    $encoded: '';
+    $slice: 2000;
+    $index: 0;
+    $loops: ceil(str-length($svg) / $slice);
+
+    @for $i from 1 through $loops {
+        $chunk: str-slice($svg, $index, $index + $slice - 1);
+        $chunk: str-replace($chunk, '"', "'");
+        $chunk: str-replace($chunk, '<', '%3C');
+        $chunk: str-replace($chunk, '>', '%3E');
+        $chunk: str-replace($chunk, '&', '%26');
+        $chunk: str-replace($chunk, '#', '%23');
+        $encoded: #{$encoded}#{$chunk};
+        $index: $index + $slice;
+    }
+
+    @return $encoded;
+}
+
+@function svg-encode ($svg) {
+    @return url("data:image/svg+xml;charset=utf8,#{uri-encode($svg)}");
+}
+
+
+
 @function icon-check($color: #000000){
-    @return '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><path d="M28.998 8.531l-2.134-2.134c-0.394-0.393-1.030-0.393-1.423 0l-12.795 12.795-6.086-6.13c-0.393-0.393-1.029-0.393-1.423 0l-2.134 2.134c-0.393 0.394-0.393 1.030 0 1.423l8.924 8.984c0.393 0.393 1.030 0.393 1.423 0l15.648-15.649c0.393-0.392 0.393-1.030 0-1.423z" fill="#{$color}"></path></svg>';
+    @return svg-encode('<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32"><path d="M28.998 8.531l-2.134-2.134c-0.394-0.393-1.030-0.393-1.423 0l-12.795 12.795-6.086-6.13c-0.393-0.393-1.029-0.393-1.423 0l-2.134 2.134c-0.393 0.394-0.393 1.030 0 1.423l8.924 8.984c0.393 0.393 1.030 0.393 1.423 0l15.648-15.649c0.393-0.392 0.393-1.030 0-1.423z" fill="#{$color}"></path></svg>');
 }
 
 @function icon-x($size: 32, $color: #000000){
-    @return url("data:image/svg+xml; utf8,<svg version='1.2' baseProfile='tiny' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='#{$size}px' height='#{$size}px' viewBox='0 0 64 64' xml:space='preserve' fill='#{$color}'><g><rect x='-2.352' y='29.385' transform='matrix(0.7071 0.7071 -0.7071 0.7071 32.3545 -14.3899)' width='71.799' height='4.95'/></g><g><rect x='-2.374' y='29.376' transform='matrix(0.7071 -0.7071 0.7071 0.7071 -12.7023 33.0352)' width='71.799' height='4.95'/></g></svg>");
+    @return svg-encode('<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="#{$size}px" height="#{$size}px" viewBox="0 0 64 64" xml:space="preserve" fill="#{$color}"><g><rect x="-2.352" y="29.385" transform="matrix(0.7071 0.7071 -0.7071 0.7071 32.3545 -14.3899)" width="71.799" height="4.95"/></g><g><rect x="-2.374" y="29.376" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -12.7023 33.0352)" width="71.799" height="4.95"/></g></svg>');
 }
 
 @function icon-circle($width: 2, $height: 2, $radius: 1, $color: #000000){
-    @return '<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="#{$width}px" height="#{$height}px" viewBox="0 0 #{$width} #{$height}" enable-background="new 0 0 #{$width} #{$height}" xml:space="preserve"><circle cx="#{$width / 2}" cy="#{$height / 2}" r="#{$radius}" fill="#{$color}"/></svg>';
+    @return svg-encode('<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="#{$width}px" height="#{$height}px" viewBox="0 0 #{$width} #{$height}" enable-background="new 0 0 #{$width} #{$height}" xml:space="preserve"><circle cx="#{$width / 2}" cy="#{$height / 2}" r="#{$radius}" fill="#{$color}"/></svg>');
 }
 
 @function color($key) {
     @return map-get($colors, $key);
-}
+}
+
+@function icon-x-block($size: 32, $color: #000000){
+    @return svg-encode('<svg width="#{$size}px" height="#{$size}px"  fill="#{$color}" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"	 viewBox="0 0 10.5 10.5" style="enable-background:new 0 0 10.5 10.5;" xml:space="preserve"><path d="M8.1,1.3C8.4,1,8.9,1,9.2,1.3c0,0,0,0,0,0c0.3,0.3,0.3,0.8,0,1.1L2.4,9.3c-0.3,0.3-0.8,0.3-1.1,0S1,8.4,1.3,8.1L8.1,1.3z"/><path d="M9.2,8.1c0.3,0.3,0.4,0.8,0.1,1.1c0,0,0,0,0,0l0,0c-0.3,0.3-0.8,0.3-1.1,0L1.3,2.4C1,2.1,0.9,1.6,1.3,1.3c0,0,0,0,0,0l0,0	C1.6,1,2.1,1,2.4,1.3L9.2,8.1z"/></svg>');
+}

data/lib/assets/stylesheets/uniform/helpers/border.scss

@@ -1,11 +1,20 @@
 .border{
-    border: 1px solid color('gray-light');
+    border: 1px solid color('gray');
+}
+
+.border-dashed{
+    border: 1px dashed color('gray');
 }
 @include colors('.border', 'border-color'){
     border-width: 1px;
     border-style: solid;
 }
 
+@include colors('.border-dashed', 'border-color'){
+    border-width: 1px;
+    border-style: dashed;
+}
+
 @each $direction in 'top' 'right' 'bottom' 'left' {
     @include size-rules('.border-#{$direction}'){
         border-#{$direction}-color: color('gray-light') !important;

data/lib/assets/stylesheets/uniform/helpers/colors.scss

@@ -1,7 +1,8 @@
 @each $key, $value in $colors {
     .text-#{$key} {               color: $value !important;}
     .a-hover-#{$key} a:hover {    color: $value !important;}
-    .hover-#{$key} :hover {       color: $value !important;}
+    .hover-#{$key}:hover {       color: $value !important;}
+    .bg-hover-#{$key}:hover {       background-color: $value !important;}
     .bg-#{$key} {                 background-color: $value !important;}
     .a-#{$key} a {
         color: $value;
@@ -14,7 +15,7 @@
     }
 }
 
-@for $i from 1 through 20 {
+@for $i from 0 through 20 {
     .opacity-#{$i * 5}     { opacity: #{$i * 5 / 100.0}; }
 }
 

data/lib/assets/stylesheets/uniform/helpers/position.scss

@@ -11,4 +11,10 @@
 .position-h-center{ @include position-h-center;}
 @for $i from 1 through 100 {
     .z-#{$i}     { z-index: #{$i}; }
+}
+
+.hide-empty{
+    &:empty{
+        display: none;
+    }
 }

data/lib/assets/stylesheets/uniform/helpers/text.scss

@@ -20,6 +20,9 @@
 .text-caps{
     text-transform: uppercase;
 }
+.text-boldest{
+    font-weight: 900;
+}
 .text-bold{
     font-weight: 700;
 }
@@ -41,6 +44,14 @@
         text-decoration: none;
     }
 }
+.text-underline{
+    text-decoration: underline;
+}
+.hover-underline{
+    &:hover{
+        text-decoration: underline;
+    }
+}
 
 //----------------------------------------------------------------
 //             Styles

data/lib/assets/stylesheets/uniform/helpers.scss

@@ -38,12 +38,14 @@
 //----------------------------------------------------------------
 //             Raw
 //----------------------------------------------------------------
-ul.raw{
+.raw{
     margin: 0;
     padding: 0;
     list-style:none;
+    outline: none;
+    appearance: none;
 }
-button.raw{
+.reset{
     outline: none;
     appearance: none;
     border: none;
@@ -122,6 +124,10 @@ button.raw{
 img.disabled{
     @include grayscale(1, 0.3)
 }
-table.fixed{
+table.layout-fixed{
     table-layout: fixed;
+}
+
+.shadow{
+    box-shadow: 0 1px 3px 2px rgba(black, 0.2);
 }

data/lib/assets/stylesheets/uniform/variables.scss

@@ -10,10 +10,13 @@ $system-font: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubu
 //----------------------------------------------------------------
 $colors: (
     'background':         #f2f2f2,
-    'gray':               #505153,
-    'gray-light':         #cccccc,
-    'gray-dark':          #373839,
-    'gray-background':    rgb(238, 238, 238),
+    'gray-lightest':      #F8FAFC,
+    'gray-lighter':       #F1F5F8,
+    'gray-light':         #DAE1E7,
+    'gray':               #B8C2CC,
+    'gray-dark':          #8795A1,
+    'gray-darker':        #606F7B,
+    'gray-darkest':       #3D4852,
     'green':              #97C848,
     'green-light':        #BBFF00,
     'green-dark':         #709239,
@@ -29,8 +32,7 @@ $colors: (
     'yellow-dark':        #BBC02C,
     'yellow-light':       #E9F75A,
     'black':              #000000,
-    'white':              #FFFFFF,
-    'muted':              #969696
+    'white':              #FFFFFF
 );
 
 

data/lib/uniform/version.rb

@@ -1,3 +1,3 @@
 module Uniform
-  VERSION = "2.2.2"
+  VERSION = "2.3.2"
 end

data/lib/uniform.rb

@@ -1,9 +1,17 @@
 if defined?(::Rails)
   class UniformUi
     class Engine < ::Rails::Engine
-
-      if Sprockets::VERSION.start_with?('4')
-        Engine.config.assets.precompile += %w(uniform/manifest.js)
+      
+      if defined?(::Sprockets)
+        if Sprockets::VERSION.start_with?('4')
+          Engine.config.assets.precompile << 'uniform/manifest.js'
+        end
+      elsif defined?(::Condenser)
+        assets_dir = File.expand_path("../lib/assets", __dir__)
+        Dir.each_child(assets_dir) do |child|
+          child = File.join(assets_dir, child)
+          Engine.config.assets.path << child if File.directory?(child)
+        end
       end
       
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uniform-ui
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.2
 platform: ruby
 authors:
 - Ben Ehmke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -70,6 +70,7 @@ files:
 - lib/assets/javascripts/uniform/floating-label.js
 - lib/assets/javascripts/uniform/icons.js
 - lib/assets/javascripts/uniform/modal.js
+- lib/assets/javascripts/uniform/popover.js
 - lib/assets/javascripts/uniform/resizer.js
 - lib/assets/javascripts/uniform/select.js
 - lib/assets/javascripts/uniform/tooltip.js
@@ -87,6 +88,7 @@ files:
 - lib/assets/stylesheets/uniform/components/form/checkbox.scss
 - lib/assets/stylesheets/uniform/components/form/floating-label.scss
 - lib/assets/stylesheets/uniform/components/form/input-group.scss
+- lib/assets/stylesheets/uniform/components/form/tristate.scss
 - lib/assets/stylesheets/uniform/components/grid.scss
 - lib/assets/stylesheets/uniform/components/label.scss
 - lib/assets/stylesheets/uniform/components/loaders.scss
@@ -131,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sass UI