Skip to content
This repository has been archived by the owner on Jan 14, 2018. It is now read-only.

_buttons and _textures scss mixins updated #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

_buttons and _textures scss mixins updated #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scss/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
border: $buttonborderwidth $buttonborderstyle $buttonbordercolor {
bottom-color: $buttonbottombordercolor;
}
@include border-radius(4px);
@include rounded(4px);
cursor: pointer;
*margin-left: .3em;

Expand Down Expand Up @@ -131,7 +131,7 @@ input[type="submit"].btn:hover { border-color: $buttonbordercolor; }
.btn-extlarge {
padding: 11px 22px;
@include font-size(21);
@include border-radius(4px);
@include rounded(4px);
}

.btn.btn-large {
Expand All @@ -145,7 +145,7 @@ input[type="submit"].btn:hover { border-color: $buttonbordercolor; }
padding: 11px 22px;
@include font-size(14);
line-height: normal;
@include border-radius(4px);
@include rounded(4px);
}

.btn-small {
Expand All @@ -170,7 +170,7 @@ input[type="submit"].btn:hover { border-color: $buttonbordercolor; }
position: relative;
float: left;
margin-left: -1px;
@include border-radius(0);
@include rounded(0);

&:first-child {
margin-left: 0;
Expand Down
8 changes: 4 additions & 4 deletions scss/_texture.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
padding: 8px 35px 8px 14px;
background-color: $alertcolor;
border: $alertborderwidth $alertborderstyle $alertbordercolor;
@include border-radius(2px);
@include rounded(2px);
font-family: $basefont;
@include font-size(14);
color: $alerttext;
Expand Down Expand Up @@ -94,7 +94,7 @@
white-space: nowrap;
color: $badgecolor;
background-color: $badgebackground;
@include border-radius(9px);
@include rounded(9px);
@include transition(background-color .25s 0 linear);

&:hover {
Expand Down Expand Up @@ -177,7 +177,7 @@
margin-bottom: $baselineheight;
background-color: $wellbackground;
border: $wellborderwidth $wellborderstyle $wellbordercolor;
@include border-radius(4px);
@include rounded(4px);
@include box-shadow(inset 0 1px $wellshadowblur $wellshadow);

p:last-child { margin-bottom: 0; }
Expand All @@ -187,5 +187,5 @@

.well-small {
padding: 6px;
@include border-radius(2px);
@include rounded(2px);
}