Index: lams_central/conf/scss/_mixins.scss =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r32670937f259e2c8a712e1dd2cd6bb5731f466c9 --- lams_central/conf/scss/_mixins.scss (.../_mixins.scss) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_central/conf/scss/_mixins.scss (.../_mixins.scss) (revision 32670937f259e2c8a712e1dd2cd6bb5731f466c9) @@ -2,125 +2,130 @@ // // Easily pump out default styles, as well as :hover, :focus, :active, // and disabled options for all buttons - -@mixin button-variant($color, $background, $border) { - color: $color; - background-color: $background; - border-color: $border; - - &:focus, - &.focus { - color: $color; - background-color: darken($background, 10%); - border-color: darken($border, 25%); - outline:0; - } - &:hover { - color: $color; - background-color: darken($background, 10%); - border-color: darken($border, 12%); - } - &:active, - &.active, - .open > &.dropdown-toggle { - color: $color; - background-color: darken($background, 10%); - border-color: darken($border, 12%); - - &:hover, - &:focus, - &.focus { - color: $color; - background-color: darken($background, 17%); - border-color: darken($border, 25%); - outline:0; - } - } - &:active, - &.active, - .open > &.dropdown-toggle { - background-image: none; - } - &.disabled, - &[disabled], - fieldset[disabled] & { - &:hover, - &:focus, - &.focus { - background-color: $background; - border-color: $border; - } - } - - .badge { - color: $background; - background-color: $color; - } -} - -// Button sizes -@mixin button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) { - padding: $padding-vertical $padding-horizontal; - font-size: $font-size; - line-height: $line-height; - border-radius: $border-radius; -} - -// Drop shadows -@mixin box-shadow($shadow) { - -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1 - box-shadow: $shadow; -} -@mixin form-control-focus($color) { - $color-rgba: rgba(red($color), green($color), blue($color), .6); +// +// @mixin button-variant($color, $background, $border) { +// color: $color; +// background-color: $background; +// border-color: $border; +// +// &:focus, +// &.focus { +// color: $color; +// background-color: darken($background, 10%); +// border-color: darken($border, 25%); +// outline:0; +// } +// &:hover { +// color: $color; +// background-color: darken($background, 10%); +// border-color: darken($border, 12%); +// } +// &:active, +// &.active, +// .open > &.dropdown-toggle { +// color: $color; +// background-color: darken($background, 10%); +// border-color: darken($border, 12%); +// +// &:hover, +// &:focus, +// &.focus { +// color: $color; +// background-color: darken($background, 17%); +// border-color: darken($border, 25%); +// outline:0; +// } +// } +// &:active, +// &.active, +// .open > &.dropdown-toggle { +// background-image: none; +// } +// &.disabled, +// &[disabled], +// fieldset[disabled] & { +// &:hover, +// &:focus, +// &.focus { +// background-color: $background; +// border-color: $border; +// } +// } +// +// .badge { +// color: $background; +// background-color: $color; +// } +// } +// +// // Button sizes +// @mixin button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) { +// padding: $padding-vertical $padding-horizontal; +// font-size: $font-size; +// line-height: $line-height; +// border-radius: $border-radius; +// } +// +// // Drop shadows +// @mixin box-shadow($shadow) { +// -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1 +// box-shadow: $shadow; +// } +@mixin form-control-focus() { &:focus { - border-color: $color; + color: $input-focus-color; + background-color: $input-focus-bg; + border-color: $input-focus-border-color; outline: 0; - $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba; - @include box-shadow($shadow); + // Avoid using mixin so we can pass custom focus shadow properly + @if $enable-shadows { + box-shadow: $input-box-shadow, $input-focus-box-shadow; + } @else { + box-shadow: $input-focus-box-shadow; + } } } +// +// // Alerts +// @mixin alert-variant($background, $border, $text-color) { +// background-color: $background; +// border-color: $border; +// color: $text-color; +// +// hr { +// border-top-color: darken($border, 5%); +// } +// .alert-link { +// color: darken($text-color, 10%); +// } +// } +// +// // Contextual backgrounds +// +// // [converter] $parent hack +// @mixin bg-variant($parent, $color) { +// #{$parent} { +// background-color: $color; +// } +// a#{$parent}:hover, +// a#{$parent}:focus { +// background-color: darken($color, 10%); +// } +// } +// +// // Typography +// +// // [converter] $parent hack +// @mixin text-emphasis-variant($parent, $color) { +// #{$parent} { +// color: $color; +// } +// a#{$parent}:hover, +// a#{$parent}:focus { +// color: darken($color, 10%); +// } +// } -// Alerts -@mixin alert-variant($background, $border, $text-color) { - background-color: $background; - border-color: $border; - color: $text-color; - - hr { - border-top-color: darken($border, 5%); - } - .alert-link { - color: darken($text-color, 10%); - } -} - -// Contextual backgrounds - -// [converter] $parent hack -@mixin bg-variant($parent, $color) { - #{$parent} { - background-color: $color; - } - a#{$parent}:hover, - a#{$parent}:focus { - background-color: darken($color, 10%); - } -} - -// Typography - -// [converter] $parent hack -@mixin text-emphasis-variant($parent, $color) { - #{$parent} { - color: $color; - } - a#{$parent}:hover, - a#{$parent}:focus { - color: darken($color, 10%); - } -} - // Generic avatars used in place of profile pictures @mixin portrait($size) { width: $size;