diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index f292c0e..d97de20 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index cce0d03..2b0e746 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index cce0d03..2b0e746 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index f292c0e..d97de20 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index 9ef63b2..d01f839 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index 79d2f2f..407b7e3 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 79d2f2f..407b7e3 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index 5465e47..2d8b104 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -1526,7 +1526,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { #panel #panelActivities.panel-button > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index 113ad33..fedcdbb 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -201,6 +201,51 @@ spinner:checked:disabled, label:disabled selection:checked { opacity: 0.5; } +.large-title { + font-weight: 300; + font-size: 24pt; +} + +.title-1 { + font-weight: 800; + font-size: 20pt; +} + +.title-2 { + font-weight: 800; + font-size: 15pt; +} + +.title-3 { + font-weight: 700; + font-size: 15pt; +} + +.title-4 { + font-weight: 700; + font-size: 13pt; +} + +.heading { + font-weight: 700; + font-size: 11pt; +} + +.body { + font-weight: 400; + font-size: 11pt; +} + +.caption-heading { + font-weight: 700; + font-size: 9pt; +} + +.caption { + font-weight: 400; + font-size: 9pt; +} + entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) { color: #dadada; background-color: rgba(255, 255, 255, 0.05); diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 6f02b82..49fb548 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -201,6 +201,51 @@ spinner:checked:disabled, label:disabled selection:checked { opacity: 0.5; } +.large-title { + font-weight: 300; + font-size: 24pt; +} + +.title-1 { + font-weight: 800; + font-size: 20pt; +} + +.title-2 { + font-weight: 800; + font-size: 15pt; +} + +.title-3 { + font-weight: 700; + font-size: 15pt; +} + +.title-4 { + font-weight: 700; + font-size: 13pt; +} + +.heading { + font-weight: 700; + font-size: 11pt; +} + +.body { + font-weight: 400; + font-size: 11pt; +} + +.caption-heading { + font-weight: 700; + font-size: 9pt; +} + +.caption { + font-weight: 400; + font-size: 9pt; +} + entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) { color: #dadada; background-color: rgba(255, 255, 255, 0.05); diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index 56fd277..69a7e52 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -201,6 +201,51 @@ spinner:checked:disabled, label:disabled selection:checked { opacity: 0.5; } +.large-title { + font-weight: 300; + font-size: 24pt; +} + +.title-1 { + font-weight: 800; + font-size: 20pt; +} + +.title-2 { + font-weight: 800; + font-size: 15pt; +} + +.title-3 { + font-weight: 700; + font-size: 15pt; +} + +.title-4 { + font-weight: 700; + font-size: 13pt; +} + +.heading { + font-weight: 700; + font-size: 11pt; +} + +.body { + font-weight: 400; + font-size: 11pt; +} + +.caption-heading { + font-weight: 700; + font-size: 9pt; +} + +.caption { + font-weight: 400; + font-size: 9pt; +} + entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) { color: #363636; background-color: rgba(0, 0, 0, 0.05); diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index 0e01374..df80e6b 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -201,6 +201,51 @@ spinner:checked:disabled, label:disabled selection:checked { opacity: 0.5; } +.large-title { + font-weight: 300; + font-size: 24pt; +} + +.title-1 { + font-weight: 800; + font-size: 20pt; +} + +.title-2 { + font-weight: 800; + font-size: 15pt; +} + +.title-3 { + font-weight: 700; + font-size: 15pt; +} + +.title-4 { + font-weight: 700; + font-size: 13pt; +} + +.heading { + font-weight: 700; + font-size: 11pt; +} + +.body { + font-weight: 400; + font-size: 11pt; +} + +.caption-heading { + font-weight: 700; + font-size: 9pt; +} + +.caption { + font-weight: 400; + font-size: 9pt; +} + entry.contacts-postal-entry, spinbutton entry, .linked > entry:not(:only-child) { color: #363636; background-color: rgba(0, 0, 0, 0.05); diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index 5447eec..d10300e 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -1330,7 +1330,7 @@ $popop_menuitem_radius: $wm_radius - 4px; > * { background-image: url("assets/activities.svg"); background-position: center top; - background-size: 18px 18px; + // background-size: 18px 18px; width: 24px; height: 24px; background-color: transparent !important; diff --git a/src/sass/gtk/_common.scss b/src/sass/gtk/_common.scss index ea97233..718069d 100644 --- a/src/sass/gtk/_common.scss +++ b/src/sass/gtk/_common.scss @@ -202,10 +202,57 @@ spinner { } } +// +// General Typography +// +.large-title { + font-weight: 300; + font-size: 24pt; +} + +.title-1 { + font-weight: 800; + font-size: 20pt; +} + +.title-2 { + font-weight: 800; + font-size: 15pt; +} + +.title-3 { + font-weight: 700; + font-size: 15pt; +} + +.title-4 { + font-weight: 700; + font-size: 13pt; +} + +.heading { + font-weight: 700; + font-size: 11pt; +} + +.body { + font-weight: 400; + font-size: 11pt; +} + +.caption-heading { + font-weight: 700; + font-size: 9pt; +} + +.caption { + font-weight: 400; + font-size: 9pt; +} + // // Text Entries // - %Linked_entrys { @include entry(normal); border: none;