pimhwang
/
spreed-webrtc
mirror of https://github.com/strukturag/spreed-webrtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed base line height to correctly align 20 pixel to 13 pixel font size.

pull/32/head
Simon Eisenmann 12 years ago
parent
05dbd4459d
commit
7ab0c01aa5
2 changed files with 8 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/styles/global/_base.scss
  2. 36
      src/styles/global/_variables.scss

1
src/styles/global/_base.scss
Unescape View File

@ -24,7 +24,6 @@ body {
background-clip: padding-box; background-clip: padding-box;
background-color: $background; background-color: $background;
height: 100%; height: 100%;
font: normal $base-font-size $font-sans-serif;
} }
body { body {

36
src/styles/global/_variables.scss
Unescape View File

@ -19,9 +19,6 @@
* *
*/ */
// ** Custom Variables **
// --------------------------------------------------
// general // general
$background: #e5e5e5; $background: #e5e5e5;
$componentbg: #f5f5f5; $componentbg: #f5f5f5;
@ -46,7 +43,7 @@ $loading: #ddd;
// font // font
$font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif; $font-sans-serif: "Helvetica Neue",Helvetica,Arial,sans-serif;
$base-font-size: 13px; // compass $base-font-size: 13px; // compass
$base-line-height: 19px; // compass $base-line-height: 1.53846156; // compass
// audio video // audio video
$audiovideolevel: $action-enable; $audiovideolevel: $action-enable;
@ -125,44 +122,27 @@ $breakpoint-useability-large: 1020px;
$breakpoint-small: 480px; $breakpoint-small: 480px;
$breakpoint-medium: 700px; $breakpoint-medium: 700px;
$breakpoint-large: 1280px; $breakpoint-large: 1280px;
$breakpoint-video-small: 590px; $breakpoint-video-small: 590px;
$breakpoint-video-medium: 630px; $breakpoint-video-medium: 630px;
$breakpoint-chat-small: 210px; $breakpoint-chat-small: 210px;
$breakpoint-settings-medium: 630px; $breakpoint-settings-medium: 630px;
// touch specific // touch specific
$tap-highlight: rgba(0, 0, 0, 0); $tap-highlight: rgba(0, 0, 0, 0);
// Fontawsome changed variables
// ** Fontawsome changed variables **
// original at libs/fontawesome/_variables.scss // original at libs/fontawesome/_variables.scss
// -------------------------- $fa-css-prefix: fa;
$fa-css-prefix: fa;
// Bootstrap changed variables
// ** Bootstrap changed variables **
// original at libs/bootstrap/_variables.scss // original at libs/bootstrap/_variables.scss
// -------------------------------------------------- $body-bg: $background;
//== Scaffolding
//
// ## Settings for some of the most global styles.
//** Background color for `<body>`.
$body-bg: $background;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.
// typography
// font, line-height, and color for body text, headings, and more
$font-family-sans-serif: $font-sans-serif; $font-family-sans-serif: $font-sans-serif;
$font-family-serif: Georgia, "Times New Roman", Times, serif; $font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
$font-family-base: $font-family-sans-serif; $font-family-base: $font-family-sans-serif;
$font-size-base: $base-font-size; $font-size-base: $base-font-size;
$line-height-base: $base-line-height;
Write Preview
Loading…
Cancel
Save