lib/facades/stylesheets/facades/setup/_forms.scss in facades-0.0.6 vs lib/facades/stylesheets/facades/setup/_forms.scss in facades-0.0.7

- old
+ new

@@ -82,21 +82,28 @@ -webkit-appearance: none; background: #dddddd; -moz-background-clip: border-box; -webkit-background-clip: border-box; background-clip: border-box; - -webkit-border-radius: $button-border-radius; - -moz-border-radius: $button-border-radius; - border-radius: $button-border-radius; - border: 1px solid; - border-color: $button-border-color; + + @if $button-border-radius not 0px{ + -webkit-border-radius: $button-border-radius; + -moz-border-radius: $button-border-radius; + border-radius: $button-border-radius; + } + + @if $button-border-color not none{ + border: 1px solid; + border-color: $button-border-color; + } + cursor: pointer; color: $button-color; font: bold 12px / 1.3 "Helvetica Neue", Arial, "Liberation Sans", FreeSans, sans-serif; outline: 0; overflow: visible; - padding:$button-padding; + padding: $button-padding; width: auto; user-select:none; // IE7 *padding-top: 2px; *padding-bottom: 0px; @@ -118,15 +125,22 @@ -ms-box-sizing:content-box; -moz-background-clip: padding; -webkit-background-clip: padding; background-clip: padding-box; background-color: white; - border: 1px solid; - -webkit-border-radius: $input-border-radius; - -moz-border-radius: $input-border-radius; - border-radius: $input-border-radius; - border-color: $input-border-color; + + @if $input-border-color not none{ + border: 1px solid; + border-color: $input-border-color; + } + + @if $input-border-radius not none and $input-border-radius not 0px{ + -webkit-border-radius: $input-border-radius; + -moz-border-radius: $input-border-radius; + border-radius: $input-border-radius; + } + color: $input-color; outline: 0; height:auto; padding: $input-padding; font-size: $input-font-size; @@ -154,25 +168,25 @@ // Separate rule for Firefox. // Separate rule for IE, too. // Cannot stack with WebKit's. ::-webkit-input-placeholder { - color: #888888; + color: $input-placeholder-color; } input:-moz-placeholder, textarea:-moz-placeholder{ - color: #888888; + color: $input-placeholder-color; } input.placeholder-text, textarea.placeholder-text{ - color: #888888; + color: $input-placeholder-color; } :invalid { - // Suppress red glow that Firefox - // adds to form fields by default, - // even when user is still typing. + // Suppress red glow that Firefox + // adds to form fields by default, + // even when user is still typing. -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } @@ -201,12 +215,16 @@ select[size]{ padding:0.35em; } // Tweaks for Safari + Chrome. @media (-webkit-min-device-pixel-ratio: 0) { select { - background-image:url($select-arrow-image); - background-repeat: no-repeat; - background-position: right center; + + @if($select-arrow-image not false and $select-arrow-image not "" ){ + background-image:url($select-arrow-image); + background-repeat: no-repeat; + background-position: 98% 50%; + } + padding-right: 20px; } select[size], select[multiple] { background-image: none; \ No newline at end of file