sass to less parody sans navbar updates.

alphabetize properties in buttons.less button classes

update inputs.scss to match inputs.less

update base button coloring and reapply border-radius to btns.

create new silent class to set text-underline to none
This commit is contained in:
Scott O'Hara 2014-02-19 21:20:25 -05:00
parent d01c292371
commit 4f2b0562d0
5 changed files with 26 additions and 16 deletions

View file

@ -1,13 +1,13 @@
.btn {
background: #999;
color: #fff;
display: inline-block; /* Enables non-inline-block elements like <div>s to be buttons */
font-size: 2.5em;
padding: 15px 40px 16px;
margin: .3em .2em 0 0;
cursor: pointer;
border: 0;
border-radius: 10px; /* rounded corners */
border: 0;
color: #fff;
cursor: pointer;
display: inline-block; /* Enables non-inline-block elements like <div>s to be buttons */
font-size: 2.5em;
margin: .3em .2em 0 0;
padding: 15px 40px 16px;
}
.btn:hover {
@ -50,7 +50,7 @@
}
.btn-sm {
padding: 10px 15px 11px;
font-size: .9em;
border-radius: 4px; /* rounded corners */
font-size: .9em;
padding: 10px 15px 11px;
}

View file

@ -24,9 +24,10 @@
// Set Generic <button> and .btn styling.
// use .btn on any element to give it the styling of a button
.btn {
@include btn-style(#aaa, #000, #ddd);
@extend %no-underline;
@include btn-style(#999, #888, #777);
border: 0;
//border-radius: 10px; // rounded corners
border-radius: 10px; // rounded corners
color: #fff;
cursor: pointer;
display: inline-block; // Enables non-inline-block elements like <a>s to be buttons
@ -34,7 +35,6 @@
margin: .3em .2em 0 0;
outline: 0; // when the button is focused, don't show an outline
padding: 15px 40px 16px;
text-decoration: none;
}
@ -56,7 +56,7 @@
// Add this class to a <button> or element with a .btn class
// to create a smaller sized button.
.btn-sm {
//border-radius: 4px; /* rounded corners */
border-radius: 4px; /* rounded corners */
font-size: .9em;
padding: 10px 15px 11px;
}

View file

@ -21,3 +21,14 @@ body, textarea {
}
}
// shared styling between btn and links in nav bars
%nav-btn-shared {
outline: 0;
// when button or navbar is focused don't show an outline
}
%no-underline {
text-decoration: none;
}

View file

@ -1,4 +1,4 @@
@if $import-ie-hacks == true{
@if $import-ie-hacks == true {
//-------------------------------------------------------------------
// Internet Explorer Hacks
//-------------------------------------------------------------------

View file

@ -29,8 +29,7 @@ textarea, input[type='text'] {
.addon-front {
@extend %global-inputs;
border-right: 0;
margin-right: -2px;
padding: 6px 11px 6px 10px;
padding: 6px 11px;
}