_s: Merge branch 'pr/616'.

This commit is contained in:
Konstantin Obenland 2014-11-05 17:02:58 -08:00
commit 921992277d
5 changed files with 7 additions and 11 deletions

View File

@ -4,7 +4,7 @@ input[type="reset"],
input[type="submit"] { input[type="submit"] {
border: 1px solid; border: 1px solid;
border-color: $color__border-button; border-color: $color__border-button;
@include border-radius(3px); border-radius: 3px;
background: $color__background-button; background: $color__background-button;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05);
color: rgba(0, 0, 0, .8); color: rgba(0, 0, 0, .8);

View File

@ -26,7 +26,7 @@ input[type="search"],
textarea { textarea {
color: $color__text-input; color: $color__text-input;
border: 1px solid $color__border-input; border: 1px solid $color__border-input;
@include border-radius(3px); border-radius: 3px;
} }
input[type="text"]:focus, input[type="text"]:focus,

View File

@ -4,13 +4,6 @@
font-size: $sizeValue + rem; font-size: $sizeValue + rem;
} }
// Border radius
@mixin border-radius($radius) {
background-clip: padding-box; /* stops bg color from leaking outside the border: */
-webkit-border-radius: $radius;
border-radius: $radius;
}
// Center block // Center block
@mixin center-block { @mixin center-block {
display: block; display: block;

View File

@ -10,7 +10,7 @@
&:active, &:active,
&:focus { &:focus {
background-color: $color__background-screen; background-color: $color__background-screen;
@include border-radius(3px); border-radius: 3px;
box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6); box-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.6);
clip: auto !important; clip: auto !important;
color: $color__text-screen; color: $color__text-screen;

View File

@ -202,7 +202,9 @@ code,
kbd, kbd,
tt, tt,
var { var {
font: 15px Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace; font-family: Monaco, Consolas, "Andale Mono", "DejaVu Sans Mono", monospace;
font-size: 15px;
font-size: 1.5rem;
} }
abbr, abbr,
@ -547,6 +549,7 @@ a:active {
color: #21759b; color: #21759b;
display: block; display: block;
font-size: 14px; font-size: 14px;
font-size: 1.4rem;
font-weight: bold; font-weight: bold;
height: auto; height: auto;
left: 5px; left: 5px;