Browse Source

fixing prop order on android theme

pull/534/head
connors 11 years ago
parent
commit
ff3025d63f
  1. 44
      sass/theme-android.scss

44
sass/theme-android.scss

@ -96,8 +96,8 @@ a {
&:active,
&.active {
color: $text-color;
border: 0;
background-color: $default-color;
border: 0;
@include box-shadow(inset 0 -1px 0 rgba(0,0,0,.2), inset 0 1px 0 rgba(255,255,255,.2));
}
}
@ -109,8 +109,8 @@ a {
// Primary button (Default color is blue)
.btn-primary {
color: #fff;
border: 0;
background-color: $primary-color;
border: 0;
&:active,
&.active {
@ -123,69 +123,69 @@ a {
// Positive button (Default color is green)
.btn-positive {
color: #fff;
border: 0;
background-color: $positive-color;
border: 0;
&:active,
&.active {
color: #fff;
border: 0;
background-color: darken($positive-color, 10%);
border: 0;
}
}
// Negative button (Default color is red)
.btn-negative {
color: #fff;
border: 0;
background-color: $negative-color;
border: 0;
&:active,
&.active {
color: #fff;
border: 0;
background-color: darken($negative-color, 10%);
border: 0;
}
}
// Outlined buttons
.btn-outlined {
border: 1px solid $default-color;
background-color: transparent;
border: 1px solid $default-color;
@include box-shadow(none);
&.btn-primary {
border: 1px solid $primary-color;
color: $primary-color;
border: 1px solid $primary-color;
&:active {
border: 1px solid $primary-color;
background-color: $primary-color;
border: 1px solid $primary-color;
}
}
&.btn-positive {
border: 1px solid $positive-color;
color: $positive-color;
border: 1px solid $positive-color;
&:active {
border: 1px solid $positive-color;
background-color: $positive-color;
border: 1px solid $positive-color;
}
}
&.btn-negative {
border: 1px solid $negative-color;
color: $negative-color;
border: 1px solid $negative-color;
&:active {
border: 1px solid $negative-color;
background-color: $negative-color;
border: 1px solid $negative-color;
}
}
// Active states
&:active {
border: 1px solid $default-color;
background-color: $default-color;
border: 1px solid $default-color;
@include box-shadow(none);
}
&.btn-primary:active,
@ -262,8 +262,8 @@ a {
.bar-footer,
.bar-footer-secondary,
.bar-footer-secondary-tab {
border-bottom: 0;
border-top: $border-default;
border-bottom: 0;
@include box-shadow(inset 0 -2px 0 $primary-color);
}
}
@ -313,9 +313,9 @@ a {
.btn-link {
top: 0;
padding: 0;
color: $primary-color;
font-size: $font-size-default;
line-height: 49px;
color: $primary-color;
&:active,
&.active {
@ -415,9 +415,9 @@ a {
// --------------------------------------------------
.card {
background-color: transparent;
border-color: #d9d9d9;
border-radius: $border-radius;
background-color: transparent;
}
@ -450,9 +450,9 @@ a {
font-size: 12px;
font-weight: bold;
text-transform: uppercase;
background-color: transparent;
border-top: 0;
border-bottom: 2px solid #a9a9a9;
background-color: transparent;
}
}
@ -674,9 +674,9 @@ textarea,
.toggle {
width: 104px;
height: 28px;
background-color: #d7d7d7;
border: 2px solid #d7d7d7;
border-radius: 0;
background-color: #d7d7d7;
// Sliding handle
.toggle-handle {
@ -684,9 +684,9 @@ textarea,
left: 0;
width: 50px;
height: 24px;
background-color: #bebebe;
border: 1px solid #b5b5b5;
border-radius: 2px;
background-color: #bebebe;
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.3), inset 0 -1px 0 rgba(0,0,0,.1));
}
&:before {
@ -699,8 +699,8 @@ textarea,
// Active state for toggle
&.active {
border: 2px solid #d7d7d7;
background-color: #d7d7d7;
border: 2px solid #d7d7d7;
.toggle-handle {
margin-right: 2px;
@ -709,8 +709,8 @@ textarea,
@include transform(translate3d(50px,0,0));
}
&:before {
left: auto;
right: 14px;
left: auto;
color: #fff;
}
}

Loading…
Cancel
Save