Browse Source

Refining the type.

pull/214/head
connors 11 years ago
parent
commit
e0721c05cd
  1. 19
      dist/ratchet.css
  2. 2
      lib/sass/bars.scss
  3. 6
      lib/sass/base.scss
  4. 1
      lib/sass/buttons.scss
  5. 8
      lib/sass/forms.scss
  6. 2
      lib/sass/table-views.scss
  7. 6
      lib/sass/variables.scss

19
dist/ratchet.css vendored

@ -230,8 +230,8 @@ body {
bottom: 0; bottom: 0;
left: 0; left: 0;
font-family: "Helvetica Neue", Helvetica, sans-serif; font-family: "Helvetica Neue", Helvetica, sans-serif;
font-size: 14px; font-size: 17px;
line-height: 1.25; line-height: 21px;
color: #000; color: #000;
background-color: #fff; background-color: #fff;
} }
@ -316,7 +316,7 @@ a {
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
font-size: 18px; font-size: 17px;
font-weight: 500; font-weight: 500;
line-height: 44px; line-height: 44px;
color: #000; color: #000;
@ -426,10 +426,10 @@ a {
padding-left: 15px; padding-left: 15px;
margin-left: 0; margin-left: 0;
font-weight: 500; font-weight: 500;
line-height: 18px;
background-color: #f8f8f8; background-color: #f8f8f8;
border-top: 1px solid rgba(0, 0, 0, 0.1); border-top: 1px solid rgba(0, 0, 0, 0.1);
border-bottom: 1px solid rgba(0, 0, 0, 0.1); border-bottom: 1px solid rgba(0, 0, 0, 0.1);
opacity: .4;
} }
.table-view .table-view-divider:first-child { .table-view .table-view-divider:first-child {
top: 0; top: 0;
@ -466,8 +466,8 @@ input,
textarea, textarea,
button, button,
select { select {
font-family: inherit; font-family: "Helvetica Neue", Helvetica, sans-serif;
font-size: inherit; font-size: 17px;
} }
select, select,
@ -501,7 +501,7 @@ input[type="color"],
input[type=search] { input[type=search] {
height: 34px; height: 34px;
padding: 0 10px; padding: 0 10px;
font-size: 14px; font-size: 16px;
text-align: center; text-align: center;
border-radius: 6px; border-radius: 6px;
border-width: 0; border-width: 0;
@ -561,8 +561,8 @@ select {
float: left; float: left;
width: 35%; width: 35%;
padding: 11px 10px 9px 13px; padding: 11px 10px 9px 13px;
font-weight: 500;
font-family: "Helvetica Neue", Helvetica, sans-serif; font-family: "Helvetica Neue", Helvetica, sans-serif;
font-weight: 500;
} }
.input-row label + input { .input-row label + input {
@ -583,6 +583,7 @@ select {
display: inline-block; display: inline-block;
padding: 5px 10px 7px; padding: 5px 10px 7px;
margin: 0; margin: 0;
font-size: 14px;
font-weight: 400; font-weight: 400;
line-height: 1; line-height: 1;
color: #929292; color: #929292;
@ -879,7 +880,7 @@ input[type="button"] {
background-color: rgba(247, 247, 247, 0.98); background-color: rgba(247, 247, 247, 0.98);
border-radius: 6px; border-radius: 6px;
opacity: 0; opacity: 0;
box-shadow: 0 0 15px rgba(0, 0, 0, 0.05); box-shadow: 0 0 15px rgba(0, 0, 0, 0.1);
-webkit-transform: translate3d(0, -15px, 0); -webkit-transform: translate3d(0, -15px, 0);
transform: translate3d(0, -15px, 0); transform: translate3d(0, -15px, 0);
-webkit-transition: -webkit-transform 0.2s ease-in-out, opacity 0.2s ease-in-out; -webkit-transition: -webkit-transform 0.2s ease-in-out, opacity 0.2s ease-in-out;

2
lib/sass/bars.scss

@ -51,7 +51,7 @@
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
font-size: 18px; font-size: $font-size-default;
font-weight: $font-weight; font-weight: $font-weight;
line-height: $bar-base-height; line-height: $bar-base-height;
color: #000; color: #000;

6
lib/sass/base.scss

@ -11,9 +11,9 @@ body {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
font-family: $font-family; font-family: $font-family-default;
font-size: 14px; font-size: $font-size-default;
line-height: 1.25; line-height: $line-height-default;
color: #000; color: #000;
background-color: #fff; background-color: #fff;
} }

1
lib/sass/buttons.scss

@ -7,6 +7,7 @@
display: inline-block; display: inline-block;
padding: 5px 10px 7px; padding: 5px 10px 7px;
margin: 0; margin: 0;
font-size: $button-font-size;
font-weight: $font-weight-light; font-weight: $font-weight-light;
line-height: 1; line-height: 1;
color: $default-color; color: $default-color;

8
lib/sass/forms.scss

@ -7,8 +7,8 @@ input,
textarea, textarea,
button, button,
select { select {
font-family: inherit; font-family: $font-family-default;
font-size: inherit; font-size: $font-size-default;
} }
// Stretch inputs/textareas to full width and add height to maintain a consistent baseline // Stretch inputs/textareas to full width and add height to maintain a consistent baseline
@ -44,7 +44,7 @@ input[type="color"],
input[type=search] { input[type=search] {
height: 34px; height: 34px;
padding: 0 10px; padding: 0 10px;
font-size: 14px; font-size: 16px;
text-align: center; text-align: center;
border-radius: 6px; border-radius: 6px;
border-width: 0; border-width: 0;
@ -119,8 +119,8 @@ select {
float: left; float: left;
width: 35%; width: 35%;
padding: 11px 10px 9px 13px; // Optimizing the baseline for mobile. padding: 11px 10px 9px 13px; // Optimizing the baseline for mobile.
font-family: $font-family-default;
font-weight: $font-weight; font-weight: $font-weight;
font-family: $font-family;
} }
// Actual inputs float to right of labels and also have a set percentage // Actual inputs float to right of labels and also have a set percentage

2
lib/sass/table-views.scss

@ -69,10 +69,10 @@
padding-left: 15px; padding-left: 15px;
margin-left: 0; margin-left: 0;
font-weight: $font-weight; font-weight: $font-weight;
line-height: 18px;
background-color: #f8f8f8; background-color: #f8f8f8;
border-top: 1px solid rgba(0, 0, 0, .1); border-top: 1px solid rgba(0, 0, 0, .1);
border-bottom: 1px solid rgba(0, 0, 0, .1); border-bottom: 1px solid rgba(0, 0, 0, .1);
opacity: .4;
// Rounding first divider on inset lists and remove border on the top // Rounding first divider on inset lists and remove border on the top
&:first-child { &:first-child {

6
lib/sass/variables.scss

@ -5,10 +5,11 @@
// Type // Type
// -------------------------------------------------- // --------------------------------------------------
$font-family: "Helvetica Neue", Helvetica, sans-serif; $font-family-default: "Helvetica Neue", Helvetica, sans-serif;
$font-size-default: 17px;
$font-weight: 500; $font-weight: 500;
$font-weight-bold: 700;
$font-weight-light: 400; $font-weight-light: 400;
$line-height-default: 21px;
// Colors // Colors
@ -35,6 +36,7 @@ $bar-side-spacing: 10px;
// -------------------------------------------------- // --------------------------------------------------
$button-directional-padding: 20px; $button-directional-padding: 20px;
$button-directional-margin: -($bar-side-spacing/2); $button-directional-margin: -($bar-side-spacing/2);
$button-font-size: 14px;
// Transitions // Transitions

Loading…
Cancel
Save