Merge branch 'release/0.4.0'

erdmannfreunde · Oct 20, 2017 · 5f421c8 · 5f421c8
2 parents 2e122b7 + 916c24a
commit 5f421c8
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 9 deletions.
diff --git a/files/nutshell/scss/base/_grid.scss b/files/nutshell/scss/base/_grid.scss
@@ -22,6 +22,13 @@ $grid__columns:       12 !default;
 $grid__gutter:        1.875rem !default; // 30px
 $grid__gutter--half:  ($grid__gutter / 2) !default;
 
+
+$debug-mode: false !default;
+$row-bg:  $color-gray-light;
+$col-bg:  lighten($color-gray-light, 10%);
+$container-bg: rgba($color-page-background,.5);
+$grid__gutters: ($grid__columns - 1);
+
 // general row-class
 .row {
   @include make-row;
@@ -106,3 +113,32 @@ $grid__gutter--half:  ($grid__gutter / 2) !default;
     }
   }
 }
+
+@if ($debug-mode == true) {
+  // Debug Mode
+  .row {
+  	position: relative;
+  	background: $row-bg;
+  	z-index: 0;
+    padding-top: $base-spacing-unit;
+
+    &:before {
+    	content: "";
+    	display: block;
+    	position: absolute;
+    	z-index: -1;
+    	left: $grid__gutter--half;
+    	right: $grid__gutter--half;
+    	top: 0;
+    	height: 100%;
+    	background: repeating-linear-gradient(to right,
+    		$col-bg 0%, $col-bg calc((100% - (#{$grid__gutter} * #{$grid__gutters})) / #{$grid__columns}), 
+    		$row-bg calc((100% - (1.875rem * 11)) / 12), $row-bg calc(((100% - (#{$grid__gutter} * #{$grid__gutters})) / #{$grid__columns}) + #{$grid__gutter})
+    	); // [1]
+    }
+  }
+
+  [class*="col"] > div {
+    background: $container-bg;
+  }
+}
diff --git a/files/nutshell/scss/base/_type.scss b/files/nutshell/scss/base/_type.scss
@@ -128,6 +128,11 @@ $code__color:            $color-highlight !default;
 $pre__color-background:  $color-gray !default;
 $pre__color:             #fff !default;
 
+$selection-background: $color-brand;
+$selection-color: $color-text--inverted;
+
+$hr-border: $base-border;
+
 // USED FROM _variables.scss
 
 // --------------------------------------------------
@@ -245,8 +250,8 @@ pre {
 hr {
   margin-top: 1rem;
   margin-bottom: 1rem;
-  border-top: 1px solid $color-gray-light;
-  border-bottom: 0;
+  border: 0;
+  border-top: $hr-border;
 }
 
 // list-item with more than one line of text should have additional space to the following list-item
@@ -257,3 +262,9 @@ hr {
 .ce_text {
   margin-bottom: $base-spacing-unit;
 }
+
+::selection {
+  background: $selection-background;
+  color: $selection-color;
+  opacity: 1;
+}
diff --git a/files/nutshell/scss/components/_faq.scss b/files/nutshell/scss/components/_faq.scss
@@ -50,7 +50,7 @@ $faq-border: $base-border !default;
       margin-bottom: 0;
 
       &:after {
-        border-top: $event-border;
+        border-top: $faq-border;
         content: "";
         display: block; 
       }
@@ -62,7 +62,7 @@ $faq-border: $base-border !default;
       margin-bottom: 0;
 
       &:after {
-        border-top: $event-border;
+        border-top: $faq-border;
         content: "";
         display: block; 
       }
@@ -76,7 +76,7 @@ $faq-border: $base-border !default;
       margin-bottom: 0;
 
       &:after {
-        border-top: $event-border;
+        border-top: $faq-border;
         content: "";
         display: block; 
       }
@@ -88,7 +88,7 @@ $faq-border: $base-border !default;
       margin-bottom: 0;
 
       &:after {
-        border-top: $event-border;
+        border-top: $faq-border;
         content: "";
         display: block; 
       }

diff --git a/files/nutshell/scss/components/_forms.scss b/files/nutshell/scss/components/_forms.scss
@@ -12,7 +12,9 @@
 
 
 // VARIABLES
-$input-border-radius:  $base-border-radius !default;
+$input-border-width:    $base-border-width !default;
+$input-border-radius:   $base-border-radius !default;
+$input-border-color:    rgba(0,0,0,0.25) !default;
 
 // USED FROM _variables.scss
 
@@ -54,7 +56,7 @@ textarea {
   width: 100%;
   padding: ($base-spacing-unit / 2) $base-spacing-unit;
   border-radius: $input-border-radius;
-  border: $base-border-width solid rgba(0,0,0,0.25);
+  border: $input-border-width solid $input-border-color;
   background-clip: padding-box; // [4]
 
   background-image: none; // [7]

diff --git a/files/nutshell/scss/components/_tables.scss b/files/nutshell/scss/components/_tables.scss
@@ -56,4 +56,5 @@ tfoot {
 
 .table--overflow {
   overflow-x: scroll;
-}
+  -ms-overflow-x: auto;
+}