Skip to content

Commit

Permalink
Fix box-emboss with prefixes issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyle Brumm committed Mar 1, 2015
1 parent 4f8b914 commit a241de6
Show file tree
Hide file tree
Showing 8 changed files with 11,151 additions and 48 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Bower Version](http://img.shields.io/badge/bower-1.0.0-56d7c6.svg?style=flat-square)
![Bower Version](http://img.shields.io/badge/bower-1.0.1-56d7c6.svg?style=flat-square)

# Juice - Mixins for Life

Expand Down
60 changes: 32 additions & 28 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
{
"name": "juice",
"description": "SASS Mixins for Life",
"version": "1.0.0",
"homepage": "http://juicynex.us/juice",
"keywords": [
"CSS",
"SASS",
"SCSS",
"mixins",
"styling",
"helper"
],
"main": [
"dist/_juice.scss"
],
"authors": [
"Kyle Brumm <https://twitter.com/kyle_brumm>"
],
"license": "MIT",
"ignore": [
"*.*",
"bower_components",
"build",
"img",
"js",
"sass"
]
}
"name": "juice",
"description": "SASS Mixins for Life",
"version": "1.0.1",
"homepage": "http://juicynex.us/juice",
"keywords": [
"CSS",
"SASS",
"SCSS",
"mixins",
"styling",
"helper"
],
"main": [
"dist/_juice.scss"
],
"authors": [
"Kyle Brumm <https://twitter.com/kyle_brumm>"
],
"license": "MIT",
"ignore": [
"*.*",
"bower_components",
"build",
"img",
"js",
"sass"
],
"dependencies": {
"fontawesome": "~4.3.0",
"bootstrap-sass-official": "~3.3.3"
}
}
11,015 changes: 11,012 additions & 3 deletions build/css/style.css

Large diffs are not rendered by default.

90 changes: 90 additions & 0 deletions build/css/style.css.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/_juice.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// --------------------------------------------------------------------
// Juice v1.0.0
// --------------------------------------------------------------------

@charset "UTF-8";



Expand Down Expand Up @@ -331,7 +331,7 @@ $breakpoints: (
// -------------
@mixin box-emboss($opacity: 0.5, $opacity2: 0.5){
@if $browser-prefixes {
@include juice-prefixer(box-shadow, "rgba(white,$opacity) 0 1px 0, inset rgba(black,$opacity2) 0 1px 0", webkit spec);
@include juice-prefixer(box-shadow, "rgba(white,#{$opacity}) 0 1px 0, inset rgba(black,#{$opacity2}) 0 1px 0", webkit spec);
}
@else {
box-shadow: rgba(white,$opacity) 0 1px 0, inset rgba(black,$opacity2) 0 1px 0;
Expand Down Expand Up @@ -716,7 +716,7 @@ $breakpoints: (
@function tint($color, $percent: $mix-percent-default){
@return mix(white, $color, $percent);
}

// Mix black with another color
// ----------------------------
@function shade($color, $percent: $mix-percent-default){
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,11 @@ <h4>Example:</h4>
<h4>Example:</h4>
</div>
<pre><code class="language-scss">.element {
@include box-emboss(0.5,0.75);
@include box-emboss(0.4,0.6);
}</code></pre>
<div class="contain"><h4>CSS Output:</h4></div>
<pre><code class="language-scss">.element {
box-shadow: rgba(255, 255, 255, 0.5) 0 1px 0, inset rgba(0, 0, 0, 0.75) 0 1px 0;
box-shadow: rgba(255, 255, 255, 0.4) 0 1px 0, inset rgba(0, 0, 0, 0.8) 0 1px 0;
}</code></pre>
</article>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "juice",
"description": "SASS Mixins for Life",
"version": "1.0.0",
"version": "1.0.1",
"homepage": "http://juicynex.us/juice",
"license": "MIT",
"author": {
Expand Down
20 changes: 10 additions & 10 deletions sass/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Juice
@import "dist/juice";
@import "../dist/juice";

// Partials
@import "colors";
Expand Down Expand Up @@ -315,7 +315,7 @@ article:not(.section-heading) {
@import "code_styles/custom";

pre {
padding: 0 !important;
padding: 0 !important;
background: #282828;
border: none;
border-radius: 0;
Expand All @@ -325,16 +325,16 @@ pre {
code {
display: block;
overflow-x: auto;
color: $white;
font-size: 16px;
max-width: 50em;
margin: 0 auto;
padding: 30px 10px;
color: $white;
font-size: 16px;
max-width: 50em;
margin: 0 auto;
padding: 30px 10px;
background: transparent;
-webkit-text-size-adjust: none;
@include bp(max, 50em) {
font-size: 1.2rem !important;
}
@include bp(max, 50em) {
font-size: 1.2rem !important;
}
}
}

Expand Down

0 comments on commit a241de6

Please sign in to comment.