magic_stylez 0.0.0.83 → 0.0.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2d3cc8ceca544e652ceb831a4bdfe8a6447519e
-  data.tar.gz: 1ac0a6d173572712c14718d60cdb9b09753486c2
+  metadata.gz: 7662f2ccce8cfaa57cd2a841da826e52de08a589
+  data.tar.gz: 7d96bcdd91b00fc41c70cae5de0b04c268dfde50
 SHA512:
-  metadata.gz: 7ceff80bc373a9516f8899add84dd94ae759fcf2fccadbf86b8ec2aee655b01798537ab0ff276d2f5d1af561f6ac49f87238d5c2d7b03a4dbc19a0754559c4bc
-  data.tar.gz: 8fc10da9b8b5b9d8bc8928c6c146c6d0feeed5bf048fc86aa402554a18381b22eb7659bd79c29017d85c83f076ea47559ac1163e3b415568aae4fc0527b77e36
+  metadata.gz: 08cb8644536c326033e09e5e75f1c4e90d7056574065ef8dc00c5885f456e9e46ed2a6ee7e5b550a26acc50fb1e149a7655ec5505b3b7cd66295174af411ad9a
+  data.tar.gz: ed3ae039f4f90fc3500a7c554efe64792bce0dbe255f75452dd24e796c95a0d1b08e32c6cc182e757c09c1f792a7853903495424bed05d74d921228cf272244a

data/lib/magic_stylez/version.rb

@@ -1,3 +1,3 @@
 module MagicStylez
-  VERSION = "0.0.0.83"
+  VERSION = "0.0.0.84"
 end

data/vendor/assets/stylesheets/corporate/_fonts.scss

@@ -55,8 +55,10 @@ $headings-font-family:      $bigFont !default;
 //   F O N T - S I Z E S
 // 
 $font-size-base:            15px !default;
+$font-size-xl:              ceil(($font-size-base * 1.5)) !default; // ~22px
 $font-size-large:           ceil(($font-size-base * 1.25)) !default; // ~18px
 $font-size-small:           ceil(($font-size-base * 0.85)) !default; // ~12px
+$font-size-xs:              ceil(($font-size-base * 0.75)) !default; // ~10px
 
 $font-size-h1:              floor(($font-size-base * 2.6)) !default; // ~36px
 $font-size-h2:              floor(($font-size-base * 2.15)) !default; // ~30px
@@ -78,14 +80,17 @@ $louder-factor:             1.75 !default;
 // 
 //** Unit-less `line-height` for use in components like buttons.
 $line-height-base:          1.428571429 !default; // 20/14
+$line-height-xl:            1.2 !default;
 $line-height-large:         1.33 !default;
 $line-height-small:         1.5 !default;
+$line-height-xs:            1.5 !default;
 
 //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
 $line-height-computed:      floor(($font-size-base * $line-height-base)) !default;   // ~20px
+$line-height-computed-xl:   floor(($font-size-xl * $line-height-xl)) !default; // ~20px
 $line-height-computed-lg:   floor(($font-size-large * $line-height-large)) !default; // ~20px
 $line-height-computed-sm:   floor(($font-size-small * $line-height-small)) !default; // ~20px
-$line-height-computed-xs:   floor(($font-size-small * $line-height-small)) !default; // ~20px
+$line-height-computed-xs:   floor(($font-size-xs * $line-height-xs)) !default; // ~20px
 //== Headings
 $headings-line-height:      1.1 !default;
 

data/vendor/assets/stylesheets/corporate/_variables.scss

@@ -33,6 +33,9 @@ $icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 $padding-base-vertical:     6px !default;
 $padding-base-horizontal:   12px !default;
 
+$padding-xl-vertical:       15px !default;
+$padding-xl-horizontal:     22px !default;
+
 $padding-large-vertical:    10px !default;
 $padding-large-horizontal:  16px !default;
 
@@ -43,8 +46,10 @@ $padding-xs-vertical:       1px !default;
 $padding-xs-horizontal:     5px !default;
 
 $border-radius-base:        4px !default;
+$border-radius-xl:          8px !default;
 $border-radius-large:       6px !default;
 $border-radius-small:       3px !default;
+$border-radius-xs:          3px !default;
 
 
 // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // // 
@@ -134,6 +139,8 @@ $input-height-large:             (ceil($font-size-large * $line-height-large) +
 //** Small `.form-control` height
 $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
 $input-height-xs:                (floor($font-size-small * $line-height-small) + ($padding-xs-vertical * 2) + 2) !default;
+$input-height-xl:                (ceil($font-size-xl * $line-height-xl) + ($padding-large-xl * 2) + 2) !default;
+
 
 
 

data/vendor/assets/stylesheets/magic/content/_buttons.scss

@@ -5,10 +5,10 @@
 }
 
 .btn-xl, .btn-group-xl > .btn {
-    padding: 12px 20px;
-    font-size: 24px;
-    line-height: 1.33;
-    border-radius: round($border-radius-large * 1.2);
+    padding: $padding-xl-vertical $padding-xl-horizontal;
+    font-size: $font-size-xl;
+    line-height: $line-height-xl;
+    border-radius: $border-radius-xl;
 }
 
 
@@ -39,7 +39,14 @@
 			@include btn_icn_width( $line-height-computed, $padding-base-vertical );
 		}
 	}
-	
+	&.btn-xl > * {
+		padding: $padding-xl-vertical $padding-xl-horizontal;
+		font-size: $font-size-xl;
+        line-height: $line-height-xl;
+		&:first-child { @include border-left-radius( $border-radius-xl ); }
+		&:last-child { @include border-right-radius( $border-radius-xl ); }
+		&.icn { font-size: $font-size-xl * 1.1; @include btn_icn_width($line-height-computed-xl, $padding-xl-vertical);}
+	}
 	&.btn-lg > * {
 		padding: $padding-large-vertical $padding-large-horizontal;
 		// font-size: $font-size-large;

data/vendor/assets/stylesheets/magic/content/_inputs.scss

@@ -96,11 +96,13 @@
 	}
 	
 	// Make inputs at least the height of their button counterpart (base line-height + padding + border)
-	@include inpt-sizing('.input-xs', $input-height-xs, $padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+	@include inpt-sizing('.input-xs', $input-height-xs, $padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-xs, $border-radius-xs);
 
 	@include inpt-sizing('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 
 	@include inpt-sizing('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
+	
+	@include inpt-sizing('.input-xl', $input-height-xl, $padding-xl-vertical, $padding-xl-horizontal, $font-size-xl, $line-height-xl, $border-radius-xl);
   
   
 
@@ -128,6 +130,15 @@
 
 
 
+.btn-xl, .btn-group-xl > .btn {
+    padding: 12px 20px;
+    font-size: 24px;
+    line-height: 1.33;
+    border-radius: round($border-radius-large * 1.2);
+}
+
+
+
 // Reset height for `textarea`s
 textarea.form-control {
   height: auto;
@@ -147,7 +158,8 @@ textarea.form-control {
 // Build on `.form-control` with modifier classes to decrease or increase the
 // height and font-size of form controls.
 
-@include input-size('.input-xs', $input-height-xs, $padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+@include input-size('.input-xs', $input-height-xs, $padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-xs, $border-radius-xs);
+@include input-size('.input-xl', $input-height-xl, $padding-xl-vertical, $padding-xl-horizontal, $font-size-xl, $line-height-xl, $border-radius-xl);
 
 
 

data/vendor/assets/stylesheets/magic/lib/_helper.scss

@@ -264,13 +264,3 @@
 	}
 }
 
-
-@mixin mobile_app_improvements {
-	// make it smooth and app-like on mobile (best in body!)
-    -webkit-font-smoothing: antialiased;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    ::-webkit-scrollbar { display: none; }
-    -webkit-tap-highlight-color: rgba(0,0,0,0);
-}
-

data/vendor/assets/stylesheets/magic/lib/_text.scss

@@ -54,26 +54,7 @@
 @mixin handwritten-font { @include handWrittenFont; }
 
 
-@mixin no_wrap {
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-}
-@mixin no_word_break {
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	overflow: hidden;
-}
-@mixin no-word-break { @include no_word_break; }
-@mixin no-wrap { @include no_wrap; }
-
-@mixin antialiased_text {
-	// make icons and fonts thinner in webkit (white icons on dark background)
-	text-shadow: 0 0 0 rgba(0,0,0,.01);
-	-webkit-font-smoothing: antialiased;
-	text-rendering: optimizelegibility;
-}
-
+// Shadows:
 @mixin inset_font($white: 90, $black: 50) {
 	text-shadow: 	unquote(	"1px 1px 0px rgba(255,255,255,.#{$white}),
 								0px 1px 0px rgba(255,255,255,.#{$white}),
@@ -103,15 +84,69 @@
 						 1px -1px #{$blur} #{$color};
 }
 
-@mixin text_tags {
-	h1, h2, h3, h4, h5, h6,
-	.h1, .h2, .h3, .h4, .h5, .h6,
-	p, span, a {
-		@content;
-	}
+
+// General-Helpers:
+
+
+// no line break in texts, when to long for box show "..."
+@mixin noWrap {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+@mixin no_wrap {        @include noWrap; }
+@mixin no_word_break {  @include noWrap; }
+@mixin no-word-break {  @include noWrap; }
+@mixin no-wrap {        @include noWrap; }
+
+
+// user formated text .. like pre tag
+@mixin preText {
+    white-space: -moz-pre-wrap !important;
+    white-space: -pre-wrap;
+    white-space: -o-pre-wrap;
+    white-space: pre-wrap;
+    word-wrap: break-word;
 }
-@mixin text-tags {
-	@include text_tags {
+
+@mixin pre_text {  @include preText; }
+@mixin pre-text {  @include preText; }
+@mixin user_input {  @include preText; }
+@mixin user-input {  @include preText; }
+
+
+// make icons and fonts thinner in webkit (white icons on dark background)
+@mixin antialiasedText {
+	text-shadow: 0 0 0 rgba(0,0,0,.01);
+	-webkit-font-smoothing: antialiased;
+	text-rendering: optimizelegibility;
+}
+
+@mixin antialiased_text {  @include noWrap; }
+@mixin antialiased-text {  @include noWrap; }
+
+
+// make it smooth and app-like on mobile (best in body!)
+@mixin mobileAppImprovements {
+    -webkit-font-smoothing: antialiased;
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    ::-webkit-scrollbar { display: none; }
+    -webkit-tap-highlight-color: rgba(0,0,0,0);
+}
+
+@mixin mobile_app_improvements {  @include mobileAppImprovements; }
+@mixin mobile-app-improvements {  @include mobileAppImprovements; }
+
+
+// add rules for all text elements
+@mixin textTags {
+	h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, p, span, a {
 		@content;
 	}
 }
+
+@mixin text_tags { @include textTags { @content; } }
+@mixin text-tags { @include textTags { @content; } }
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_stylez
 version: !ruby/object:Gem::Version
-  version: 0.0.0.83
+  version: 0.0.0.84
 platform: ruby
 authors:
 - Torsten Wetzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-23 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A set of sass helper depending on bourbon and bootstrap-sass.