diff --git a/src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css b/src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css index c6090622..e59ed613 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar-adaptive.css @@ -6,10 +6,6 @@ --space-above-tabbar: 0 !important; } -.tab-background:is([selected]) { - box-shadow: none !important; -} - #TabsToolbar { /* Remove hover effects on tab bar buttons */ --toolbarbutton-active-background: transparent !important; @@ -177,11 +173,6 @@ toolbarbutton[open=true] { margin-left: 0 !important } -.tab-background { - border-radius: 0 !important; - margin-block: 0 !important; -} - /*Align personal bookmarks v89 */ #personal-bookmarks { -moz-box-align: center !important; @@ -193,6 +184,15 @@ toolbarbutton[open=true] { padding: 0 !important; } +/* Tabs */ +.tab-background { + background-color: transparent !important; + transition: background-color 200ms; + border-radius: 0 !important; + margin-block: 0 !important; + outline: none !important; +} + .tabbrowser-tab[selected="true"] > .tab-stack > .tab-background { margin-left: 0px !important; margin-right: 0px !important; @@ -204,11 +204,6 @@ toolbarbutton[open=true] { margin-right: auto !important } -.tab-background { - background-color: transparent !important; - transition: background-color 200ms; -} - /* Tab hover */ .tabbrowser-tab:not([selected=true]):hover .tab-background { background-color: var(--gnome-tabbar-tab-active-hover-background) !important; diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index 7b445528..c4bd4d08 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -6,10 +6,6 @@ --space-above-tabbar: 0 !important; } -.tab-background:is([selected]) { - box-shadow: none !important; -} - #TabsToolbar { /* Remove hover effects on tab bar buttons */ --toolbarbutton-active-background: transparent !important; @@ -177,11 +173,6 @@ toolbarbutton[open=true] { margin-left: 0 !important } -.tab-background { - border-radius: 0 !important; - margin-block: 0 !important; -} - /*Align personal bookmarks v89 */ #personal-bookmarks { -moz-box-align: center !important; @@ -204,6 +195,14 @@ toolbarbutton[open=true] { margin-right: auto !important } +/* Tabs */ +.tab-background { + transition: background-color 200ms; + border-radius: 0 !important; + margin-block: 0 !important; + outline: none !important; +} + /* Tab hover */ .tabbrowser-tab:not([selected=true]):hover .tab-background { background-color: var(--gnome-tabbar-tab-hover-background) !important; @@ -413,10 +412,6 @@ tab[selected]:-moz-window-inactive { display: flex; } -.tab-background { - transition: background 200ms; -} - /* firefox-view-button */ :root:not([privatebrowsingmode], [firefoxviewhidden]) :is(toolbarbutton, toolbarpaletteitem) + #tabbrowser-tabs, :root[privatebrowsingmode]:not([firefoxviewhidden]) :is( diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index 26a7a14b..fd807a6b 100644 --- a/src/sass/cinnamon/_common.scss +++ b/src/sass/cinnamon/_common.scss @@ -9,6 +9,52 @@ $_bubble_bg_color: opacify($osd_bg_color,0.25); $_bubble_fg_color: $osd_fg_color; $_bubble_borders_color: transparentize($osd_fg_color,0.8); +/* General Typography */ +%large_title { + font-weight: 300; + @include fontsize(24pt); +} + +%title_1 { + font-weight: 800; + @include fontsize(20pt); +} + +%title_2 { + font-weight: 800; + @include fontsize(15pt); +} + +%title_3 { + font-weight: 700; + @include fontsize(15pt); +} + +%title_4 { + font-weight: 700; + @include fontsize(13pt); +} + +%heading { + font-weight: 700; + @include fontsize(11pt); +} + +%caption_heading { + font-weight: 700; + @include fontsize(9pt); +} + +%caption { + font-weight: 400; + @include fontsize(9pt); +} + +%smaller { + font-weight: 400; + @include fontsize(8pt); +} + stage { // font-family: $font-family; // @include fontsize($font-size); @@ -1226,6 +1272,32 @@ StScrollBar { } +// Lists in dialogs + +.dialog-list { + spacing: $base_padding * 3; + + .dialog-list-title { + @extend %heading; + text-align: center; + } + + .dialog-list-scrollview { max-height: 200px; } + .dialog-list-box { + spacing: 1em; + + .dialog-list-item { + spacing: 1em; + + .dialog-list-item-title { font-weight: bold; } + .dialog-list-item-description { + @extend %caption; + color: darken($fg_color, 5%); + } + } + } +} + // // Run dialog // diff --git a/src/sass/cinnamon/_drawing.scss b/src/sass/cinnamon/_drawing.scss index c35e6058..8a74ac93 100644 --- a/src/sass/cinnamon/_drawing.scss +++ b/src/sass/cinnamon/_drawing.scss @@ -2,10 +2,13 @@ // generic drawing of more complex things -// provide font size in rem, with px fallback -@mixin fontsize($size: 24, $base: 16) { - font-size: round($size) + pt; - //font-size: ($size / $base) * 1rem; +// Mixin to convert provided font size in pt to em units +@mixin fontsize($size, $base: 16px, $unit: pt) { + // if pt, convert into unitless value with the assumption: 1pt = 1.091px + $adjusted_size: if($unit == pt, $size * 1.091, $size) * 1000; + $rounded_size: round($adjusted_size / $base) / 1000; + font-size: $rounded_size * 1em; + // font-size: round($size) + pt; } // Entries