Summary Files Commits Branches @commit @diff @stats
path: root / src
diff options
context:
space:
mode:
Commit57febed350bfba13b84763eb882d93e1817c9d78 (patch)
Author
 Yan Zhu <picturepan2@hotmail.com>
2017-11-26 01:06:09 -0600
Committer
 GitHub <noreply@github.com>
2017-11-26 01:06:09 -0600
Filese308c6326531a1797bf1ed2da394727afba4cc46 /src
Spectre-Dark-Gruvbox-57febed350bfba13b84763eb882d93e1817c9d78.tar
Spectre-Dark-Gruvbox-57febed350bfba13b84763eb882d93e1817c9d78.tar.gz
Spectre-Dark-Gruvbox-57febed350bfba13b84763eb882d93e1817c9d78.zip
Parent605dbf8b00758c976a02d05724e90dd8871f91f5 (diff)
Parentabcb03dce1307bd77ba9754d4d3d91821d9964e9 (diff)
Merge pull request #345 from picturepan2/0.4.7 v0.4.7
0.4.7
7 files changed, 19 insertions, 6 deletions
-rw-r--r--src/_buttons.scss9
-rw-r--r--src/_carousels.scss1
-rw-r--r--src/_comparison-sliders.scss1
-rw-r--r--src/_forms.scss2
-rw-r--r--src/_mixins.scss5
-rw-r--r--src/_parallax.scss5
-rw-r--r--src/_variables.scss2
diff --git a/src/_buttons.scss b/src/_buttons.scss
index fd990a4..7de387a 100644
--- a/src/_buttons.scss
+++ b/src/_buttons.scss
@@ -73,6 +73,15 @@
}
}
+ // Button Colors
+ &.btn-success {
+ @include button-variant($success-color);
+ }
+
+ &.btn-error {
+ @include button-variant($error-color);
+ }
+
// Button Link
&.btn-link {
background: transparent;
diff --git a/src/_carousels.scss b/src/_carousels.scss
index ba87c96..fe873c5 100644
--- a/src/_carousels.scss
+++ b/src/_carousels.scss
@@ -5,6 +5,7 @@
overflow: hidden;
position: relative;
width: 100%;
+ -webkit-overflow-scrolling: touch;
.carousel-container {
height: 100%;
diff --git a/src/_comparison-sliders.scss b/src/_comparison-sliders.scss
index 252e96f..72bb25f 100644
--- a/src/_comparison-sliders.scss
+++ b/src/_comparison-sliders.scss
@@ -5,6 +5,7 @@
overflow: hidden;
position: relative;
width: 100%;
+ -webkit-overflow-scrolling: touch;
.comparison-before,
.comparison-after {
diff --git a/src/_forms.scss b/src/_forms.scss
index 63dbd4f..0c7e228 100644
--- a/src/_forms.scss
+++ b/src/_forms.scss
@@ -500,7 +500,7 @@ input {
// Form Horizontal
.form-horizontal {
- padding: $layout-spacing;
+ padding: $layout-spacing 0;
.form-group {
display: flex;
diff --git a/src/_mixins.scss b/src/_mixins.scss
index a565c3d..18c4d47 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -38,10 +38,7 @@
color: $light-color;
}
&.loading {
- &::after {
- border-bottom-color: $light-color;
- border-left-color: $light-color;
- }
+ @extend .btn-primary.loading;
}
}
diff --git a/src/_parallax.scss b/src/_parallax.scss
index cb5e932..acc05be 100644
--- a/src/_parallax.scss
+++ b/src/_parallax.scss
@@ -9,6 +9,7 @@ $parallax-fade-color: rgba(255, 255, 255, .35) !default;
// Mixin: Parallax direction
@mixin parallax-dir() {
height: 50%;
+ outline: none;
position: absolute;
width: 50%;
z-index: $zindex-1;
@@ -61,6 +62,7 @@ $parallax-fade-color: rgba(255, 255, 255, .35) !default;
left: 0;
top: 0;
+ &:focus ~ .parallax-content,
&:hover ~ .parallax-content {
transform: perspective($parallax-perspective) rotateX($parallax-deg) rotateY(-$parallax-deg);
@@ -79,6 +81,7 @@ $parallax-fade-color: rgba(255, 255, 255, .35) !default;
right: 0;
top: 0;
+ &:focus ~ .parallax-content,
&:hover ~ .parallax-content {
transform: perspective($parallax-perspective) rotateX($parallax-deg) rotateY($parallax-deg);
@@ -97,6 +100,7 @@ $parallax-fade-color: rgba(255, 255, 255, .35) !default;
bottom: 0;
left: 0;
+ &:focus ~ .parallax-content,
&:hover ~ .parallax-content {
transform: perspective($parallax-perspective) rotateX(-$parallax-deg) rotateY(-$parallax-deg);
@@ -115,6 +119,7 @@ $parallax-fade-color: rgba(255, 255, 255, .35) !default;
bottom: 0;
right: 0;
+ &:focus ~ .parallax-content,
&:hover ~ .parallax-content {
transform: perspective($parallax-perspective) rotateX(-$parallax-deg) rotateY($parallax-deg);
diff --git a/src/_variables.scss b/src/_variables.scss
index 0690f19..7859215 100644
--- a/src/_variables.scss
+++ b/src/_variables.scss
@@ -1,5 +1,5 @@
// Core variables
-$version: "0.4.6";
+$version: "0.4.7";
// Core colors
$primary-color: #5755d9 !default;