mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
UX: Bump up base font size 1px, add smaller text size option
This commit is contained in:
parent
d0dc674875
commit
675bf94133
@ -20,7 +20,7 @@ const USER_HOMES = {
|
||||
5: "top"
|
||||
};
|
||||
|
||||
const TEXT_SIZES = ["normal", "larger", "largest"];
|
||||
const TEXT_SIZES = ["smaller", "normal", "larger", "largest"];
|
||||
|
||||
export default Ember.Controller.extend(PreferencesTabController, {
|
||||
@computed("makeThemeDefault")
|
||||
|
@ -14,6 +14,10 @@ html {
|
||||
overflow-y: scroll;
|
||||
direction: ltr;
|
||||
|
||||
&.text-size-smaller {
|
||||
font-size: $base-font-size-smaller;
|
||||
}
|
||||
|
||||
&.text-size-larger {
|
||||
font-size: $base-font-size-larger;
|
||||
}
|
||||
|
@ -32,9 +32,10 @@ $bronze: #cd7f32 !default;
|
||||
// Fonts
|
||||
// --------------------------------------------------
|
||||
|
||||
$base-font-size: 14px !default;
|
||||
$base-font-size-larger: 16px !default;
|
||||
$base-font-size-largest: 18px !default;
|
||||
$base-font-size-smaller: 13px !default;
|
||||
$base-font-size: 15px !default;
|
||||
$base-font-size-larger: 17px !default;
|
||||
$base-font-size-largest: 19px !default;
|
||||
$base-font-family: Helvetica, Arial, sans-serif !default;
|
||||
|
||||
// Font-size defintions, multiplier ^ (step / interval)
|
||||
|
@ -4,15 +4,6 @@
|
||||
// throughout the Discourse application
|
||||
|
||||
// Base Elements
|
||||
html {
|
||||
font-size: $base-font-size + 1; // Increasing overall font-size on mobile by 1px
|
||||
&.text-size-larger {
|
||||
font-size: $base-font-size-larger + 1;
|
||||
}
|
||||
&.text-size-largest {
|
||||
font-size: $base-font-size-largest + 1;
|
||||
}
|
||||
}
|
||||
|
||||
body {
|
||||
background-color: $secondary;
|
||||
|
@ -29,7 +29,7 @@ class UserOption < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def self.text_sizes
|
||||
@text_sizes ||= Enum.new(normal: 0, larger: 1, largest: 2)
|
||||
@text_sizes ||= Enum.new(normal: 0, larger: 1, largest: 2, smaller: 3)
|
||||
end
|
||||
|
||||
validates :text_size_key, inclusion: { in: UserOption.text_sizes.values }
|
||||
|
@ -912,6 +912,7 @@ en:
|
||||
|
||||
text_size:
|
||||
title: "Text Size"
|
||||
smaller: "Smaller"
|
||||
normal: "Normal"
|
||||
larger: "Larger"
|
||||
largest: "Largest"
|
||||
|
@ -1824,6 +1824,7 @@ user_preferences:
|
||||
type: enum
|
||||
default: normal
|
||||
choices:
|
||||
- smaller
|
||||
- normal
|
||||
- larger
|
||||
- largest
|
||||
|
Loading…
Reference in New Issue
Block a user