Browse Source

Use compass vertical rhythm - setup baseline, using relative units.

pull/29/head
Evan Theurer 12 years ago
parent
commit
d244534af9
  1. 10
      src/styles/components/_bar.scss
  2. 3
      src/styles/global/_base.scss
  3. 1
      src/styles/global/_variables.scss
  4. 3
      src/styles/main.scss

10
src/styles/components/_bar.scss

@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#bar {
background-color: $componentbg;
color: $componentfg1;
font: bold 1em/40px $font-sans-serif;
left: 0;
min-height: 44px;
position: absolute;
@ -30,7 +29,9 @@ @@ -30,7 +29,9 @@
top: 0;
text-align: center;
z-index: 5;
@include adjust-leading-to(2);
@include box-shadow(0 2px 10px 0 $componentfg3);
// @include debug-vertical-alignment();
@include touch-callout(none);
@include user-select(none);
@include breakpt($breakpoint-medium) {
@ -53,11 +54,11 @@ @@ -53,11 +54,11 @@
background-size: 100%;
display: inline-block;
color: black;
font: normal 11px/11px $font-sans-serif;
height: 32px;
text-align: left;
width: 90px;
vertical-align: middle;
@include adjust-font-size-to(11px,0.4);
span {
font-style: italic;
left: 38px;
@ -73,11 +74,11 @@ @@ -73,11 +74,11 @@
.bar-middle {
background-color: $componentbg;
display: inline-block;
font-weight: bold;
min-height: 44px;
padding: 0 1em;
position: relative;
margin-left: -70px;
vertical-align: middle;
z-index: 5;
@include breakpt($breakpoint-medium) {
display: block;
@ -151,13 +152,12 @@ @@ -151,13 +152,12 @@
border-color: transparent;
color: $grey3;
display: inline-block;
font: 24px/40px $font-sans-serif;
height: 42px;
margin-left: -4px;
padding: 0;
text-align: center;
width: 42px;
vertical-align: middle;
@include adjust-font-size-to(24px);
&:focus {
border: none;
outline: none;

3
src/styles/global/_base.scss

@ -18,6 +18,9 @@ @@ -18,6 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
@include establish-baseline();
html, body {
background-color: $background;
background-clip: padding-box;

1
src/styles/global/_variables.scss

@ -40,3 +40,4 @@ $breakpoint-large: 1280px; @@ -40,3 +40,4 @@ $breakpoint-large: 1280px;
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
$base-font-size: 13px;
$base-line-height: 19px;

3
src/styles/main.scss

@ -19,11 +19,12 @@ @@ -19,11 +19,12 @@
*
*/
@import "global/variables";
// @import "compass";
@import "compass";
@import "libs/libs";
@import "global/variables";
@import "global/mixins";
@import "global/base";

Loading…
Cancel
Save