less updates:
rename .small-btn back to .btn-small to retain naming convention of other class names & to match what is on the demo site & sass files. (further renaming of this may be in order)

general.less - combine font declarations into 1 shorthand rule.

place text area, input, addon-front{} selector group at top of file.  update textarea, input selector group focus state to take up less characters.

navbar.less
combine .navbar declarations into one file, putting comments around the max-height: 1.5em w/in the combined ruleset

sass updates:

remove messages.scss from import list, remove.scss extensions on import as they aren't required

update css comment to sass comment in table.scss, headings, icons.scss and buttons.scss

update outline: none; to outline: 0; and change border: 1px solid #5ab to border-color: #5ab for focus state of text, input selector.

button.scss - bring over new styling from less file

navbar.scss - bring over some of the styling from navbar.less -- need to discuss further before additional updates
This commit is contained in:
Scott O'Hara 2014-02-16 20:26:54 -05:00
parent 4b2e3fd71a
commit bac5b7e514
11 changed files with 47 additions and 38 deletions

View file

@ -24,7 +24,7 @@
color: #000;
border: 2px solid;
padding: 13px 38px 14px; /* This way we don't change the button size, as there's no border on other buttons */
&.small-btn {
&.btn-small {
padding: 8px 14px 9px; /* This padding is 2px smaller than the normal small-btn padding to account for the border */
}
}
@ -60,7 +60,7 @@
}
}
.small-btn {
.btn-small {
padding: 10px 15px 11px;
font-size: .9em;
border-radius: 4px; /* rounded corners */

View file

@ -1,7 +1,6 @@
body, textarea {
font-family: Arial, sans-serif;
font: 16px Arial, sans-serif;
margin: 0;
font-size: 16px;
}
.smooth {

View file

@ -1,8 +1,13 @@
textarea, input, .addon-front {
border: 1px solid #ccc;
font-size: .8em;
}
textarea, input {
outline: 0;
padding: 6px;
&:focus {
border: 1px solid #5ab;
border-color: #5ab;
}
}
@ -15,8 +20,3 @@ textarea, input[type='text'] {
margin-right: -2px;
border-right: 0;
}
textarea, input, .addon-front {
border: 1px solid #ccc;
font-size: .8em;
}

View file

@ -7,6 +7,9 @@ nav {
height: 1.5em;
padding: .7em 0 .95em;
outline: 0;
/* Necessary for animations
max-height: 1.5em;
*/
}
.navbar a {
@ -51,12 +54,6 @@ button.btn.close.small-btn {
/* This ensures that any buttons and inputs in the navbar will not mess up its vertical alignment */
}
/* Necessary for animations
.navbar {
max-height: 1.5em;
}
*/
@media (max-width:500px) {
button.btn.close.small-btn {
visibility: visible;

View file

@ -26,24 +26,32 @@
// use .btn on any element to give it the styling of a button
.btn {
@include btn-style(#fff, #eee, #ddd);
border-radius: 10px; /* rounded corners */
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 */
display: inline-block; // Enables non-inline-block elements like <div>s to be buttons
font-size: 2.5em;
margin: .3em .7em;
outline: 0; /* when the button is focused, don't show an outline */
outline: 0; // when the button is focused, don't show an outline
padding: 15px 40px 16px;
text-decoration: none;
// to make sure buttons are visible when not paired with a coloring
// class, we give the <button> and .btn a dark border and text color
&:not([class*='btn-']) {
border: 2px solid;
box-shadow: 0 0 0 2px inset;
color: #000;
// We use box shadow here because then we can
// apply a border without changing the element height
color: #000;
padding: 13px 38px 14px;
// keeps relative sizing to buttons w/out borders
&.btn-small {
padding: 8px 14px 9px;
// 2px smaller than the normal padding to account for the border
}
}
}

View file

@ -3,8 +3,7 @@
// Headings
//-------------------------------------------------------------------
/* Make the default heading style larger */
// Set style for <h1>
// Set style for <h1> -- larger than 'normal'
h1 {
font-size: 4em;
}

View file

@ -5,7 +5,9 @@
ico {
font-size: 2.04em;
font-family: Arial Unicode MS, Lucida Sans Unicode, sans-serif; /* This combo of Unicode fonts means Min's icons support OSX 10.5+, Windows 98+, and Ubuntu. */
font-family: Arial Unicode MS, Lucida Sans Unicode, sans-serif;
// This combo of Unicode fonts means Min's icons support
// OSX 10.5+, Windows 98+, and Ubuntu.
}

View file

@ -13,11 +13,11 @@
textarea, input {
@extend %global-inputs;
font-family: sans-serif;
outline: none;
outline: 0;
padding: 6px;
&:focus {
border: 1px solid #5ab;
border-color: #5ab;
}
}

View file

@ -7,6 +7,7 @@
background: #000;
color: #fff;
height: 1.5em;
// max-height: 1.5em; // needed for animations, uncomment to use
padding: 1em 0 .6em;
text-align: left;
width: 100%;
@ -35,14 +36,18 @@
.pagename {
color: #fff;
padding: 0 1em 0 2em;
font-weight: bold;
font-size: 22px;
top: 1px;
position: relative;
}
.navbar-link {
color: #aaa;
padding: .5em;
font-size: 14px;
padding-right: 1em;
position: relative;
top: -1px;
&:hover {
color: #fff;

View file

@ -9,7 +9,7 @@ table {
}
tbody tr:nth-child(2n-1) {
background: #ccc; /* Shade every other table row */
background: #ccc; // Shade every other table row
}
.table {

View file

@ -35,12 +35,11 @@ $import-ie-hacks: true!default;
// Import Components based on above customization
// ------------------------------------------------------------------
@import 'button.scss';
@import 'grid.scss';
@import 'headings.scss';
@import 'icons.scss';
@import 'inputs.scss';
@import 'messages.scss';
@import 'navbar.scss';
@import 'table.scss';
@import 'iehacks.scss';
@import 'button';
@import 'grid';
@import 'headings';
@import 'icons';
@import 'inputs';
@import 'navbar';
@import 'table';
@import 'iehacks';