[gtk/wip/jimmac/type-experiments] Adwaita: generic type styles
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/jimmac/type-experiments] Adwaita: generic type styles
- Date: Thu, 11 Apr 2019 12:52:56 +0000 (UTC)
commit ca83e3e300ab877febd57dc660d0e23ab79cec64
Author: Jakub Steiner <jimmac gmail com>
Date: Thu Apr 11 14:50:56 2019 +0200
Adwaita: generic type styles
- try to define a basic typographic structure
See https://gitlab.gnome.org/GNOME/gtk/issues/1808
build-aux/flatpak/org.gtk.WidgetFactory4.json | 72 ++++++++++++++++-----------
gtk/theme/Adwaita/_common.scss | 25 ++++++++++
2 files changed, 68 insertions(+), 29 deletions(-)
---
diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
index 8030528a14..34db625669 100644
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -1,29 +1,38 @@
{
- "app-id": "org.gtk.WidgetFactory4",
- "runtime": "org.gnome.Platform",
- "runtime-version": "master",
- "sdk": "org.gnome.Sdk",
- "command": "gtk4-widget-factory",
- "tags": ["devel", "development", "nightly"],
- "desktop-file-name-prefix": "(Development) ",
- "finish-args": [
+ "app-id" : "org.gtk.WidgetFactory4",
+ "runtime" : "org.gnome.Platform",
+ "runtime-version" : "master",
+ "sdk" : "org.gnome.Sdk",
+ "command" : "gtk4-widget-factory",
+ "tags" : [
+ "devel",
+ "development",
+ "nightly"
+ ],
+ "desktop-file-name-prefix" : "(Development) ",
+ "finish-args" : [
"--device=dri",
"--share=ipc",
"--socket=fallback-x11",
"--socket=wayland",
- "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*"
+ "--talk-name=org.gtk.vfs",
+ "--talk-name=org.gtk.vfs.*"
],
- "cleanup": [
+ "cleanup" : [
"/include",
- "/lib/pkgconfig", "/share/pkgconfig",
+ "/lib/pkgconfig",
+ "/share/pkgconfig",
"/share/aclocal",
- "/man", "/share/man", "/share/gtk-doc",
- "*.la", ".a",
+ "/man",
+ "/share/man",
+ "/share/gtk-doc",
+ "*.la",
+ ".a",
"/lib/girepository-1.0",
"/share/gir-1.0",
"/share/doc"
],
- "modules": [
+ "modules" : [
{
"name" : "wayland",
"buildsystem" : "autotools",
@@ -39,34 +48,39 @@
]
},
{
- "name": "graphene",
- "buildsystem": "meson",
- "builddir": true,
- "config-opts": [
+ "name" : "graphene",
+ "buildsystem" : "meson",
+ "builddir" : true,
+ "config-opts" : [
"--libdir=/app/lib",
"-Dtests=false",
"-Dbenchmarks=false"
],
- "sources": [
+ "sources" : [
{
- "type": "git",
- "url": "https://github.com/ebassi/graphene.git"
+ "type" : "git",
+ "url" : "https://github.com/ebassi/graphene.git"
}
]
},
{
- "name": "gtk",
- "buildsystem": "meson",
- "builddir": true,
- "config-opts": [
+ "name" : "gtk",
+ "buildsystem" : "meson",
+ "builddir" : true,
+ "config-opts" : [
"--libdir=/app/lib"
],
- "sources": [
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gtk.git"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/gtk.git"
}
]
}
- ]
+ ],
+ "build-options" : {
+ "env" : {
+ "GTK_DEBUG" : "interactive"
+ }
+ }
}
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 44e6fde534..88c13ae0b7 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -260,6 +260,31 @@ spinner {
}
}
+/**********************
+ * General Typography *
+ **********************/
+
+.type-large-title {
+ font-weight: 300;
+ font-size: 24pt;
+ letter-spacing: 0.2rem;
+}
+.type-title {
+ font-weight: 600;
+ font-size: 16pt;
+}
+.type-heading {
+ font-weight: 500;
+ font-size: 11pt;
+}
+.type-body {
+ font-weight: 400;
+ font-size: 11pt;
+}
+.type-caption {
+ font-weight: 400;
+ font-size: 9pt;
+}
/****************
* Text Entries *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]