From 3163eccbabf0589605984e5b678cd912a5790732 Mon Sep 17 00:00:00 2001 From: Corbin Date: Mon, 29 Sep 2014 11:50:56 -0600 Subject: [PATCH 01/15] Add thumbnail for cinnamon theme specs --- gtk-3.0/thumbnail.png | Bin 0 -> 1567 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gtk-3.0/thumbnail.png diff --git a/gtk-3.0/thumbnail.png b/gtk-3.0/thumbnail.png new file mode 100644 index 0000000000000000000000000000000000000000..4f51185ca2d22eebc1b5493feaf89069b26adf41 GIT binary patch literal 1567 zcmZ8fX;4#F6n+Rg)(*7_B7#-XYMrT6Kt>=a1BwC)uEeN`knIt|B9MT9s0q|6A;_*o zMGaw*MFU}#)R8E}5<&n&AcRB&60?x)sjYx@#y;w=_RgI9-E-%B=R0%n$2fK*#D0a# z3IG7?!$N~kz?cEYmgTna9{V9c27?_bC?W^|c!l47#w~?&8|sOWeE@fGy#Y=(5kgNy z0Kmm<06@PA0H5G1x*h=1JOE%83jhcf0IW@};2+-u080vvg-0HkoSYPiL>vyMqN1Xz zs!A*tS65e0OiVx!q);d-D=WLYy4Y-XU0t12Ds69Xuc@i2t*!0o=uoTG3kwS~Gc)(^ z-&d(rZEbCj9zBxF<#Tg$)6>%}EiLA!9h!oxf6Yt{4GlFnH$x`b12Pg`(aDU4A*~e_ zn3a@(r1Bx-N4<6|%txI^<8rxwzMg1mY8oCMen38x(KT(hSWH?)_f0a2bmx^3l85=~ z+2yURt?%Ws$t0{2e=?J=F%Gl9vzG;02-3ZvMNuBBED&TEC+I_uRy>+gH*SKA@Z@@N8Hi5h^sCKgwV0EJ221;OR=5Ke8GWr&Wr85%*h5NG zW*e*pO7{R!EGUvye1KSsav}^ZT!6v<7j0fA+K-jkk44CkCKQ~kJl5^tEI(gX$RnX@&(lyk({&URaK$DlYMWbt z%jtnFJ96xTg+&o-%8SaDtT-g@>(4v+8XvXFQNT=S+O#p8Rfwv%GFxZaU=x=7KHD!@?Lh|yB4@txrP^ZzpUF+zyro4=E z7E_DXl;j207(u(#DW4R~e<-j!x?zAnYYG^M=4GQlRNThqL3~?{)=!99$yu zSd~kVD5%=OyF)zeG{;*aJWO}`HMgNgEC_fR=h@r&eO9r12M&0@W_4PcS-@a!q%}l6 z!@q49jUVHpyK#hxS_#_QSI|3_s7yDh+Wl8v7jDi-H#VK>5i_g4ZrT}+1w>lPJGCdH(t l<0v3NI-isXx>I2>@H{m(Db;G*4VxVR!VVk>=I+Dh`~z?!GWP%g literal 0 HcmV?d00001 From 8359887388f1b9229ae2cf729c14d713551ccda0 Mon Sep 17 00:00:00 2001 From: Corbin Date: Mon, 29 Sep 2014 12:03:55 -0600 Subject: [PATCH 02/15] Add metacity thumb for cinnamon specs --- metacity-1/thumbnail.png | Bin 0 -> 520 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 metacity-1/thumbnail.png diff --git a/metacity-1/thumbnail.png b/metacity-1/thumbnail.png new file mode 100644 index 0000000000000000000000000000000000000000..e656d1671bb2a4da8a6411028226b7542438bcc9 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^DL|~i!3-oXf7O)%QY`6?zK#qG8~eHcB(ehejKx9j zP7LeL$-D%qO!f%!WnidMV_;}#VPN+0&7o144)2c15Bdhg!7`}gmUj*bou4K+44K7Rc8(W6HX9z1yD z$dP^f_5}t89zJ~d(4j;3?%n(U|NqLE$`3%(7?Zr+T|}SW__-L!;VkfoEC$jZVC;4> z+YZR+_jGX#@i_kWk|Q6JB9BAhmIw`z8IJGk!y;!0EP9c&qH|;Y#kbzKq?GTy%yF=( z{>jATCg?gXC3il%V9l2t3x9@#yEQs1{6vawPE)Au3rzCUeD8hD)VV>zkoOpS%C4#A z9vU4!n>eu1vd$#Wmx%j>)dN=#k*GwsKJ+)nm>w{b-&UerIr1@$63E9&( z{c2OC7#SFv=o(n+8d-)I8d(__TA3K>8kkub7%;C2 zmO{~xo1c=IR*9*>*c_rki|eceP=h4MhT#0PlJdl®4t{M=OCVxVQIdBqv|CGVN{ QgF=YG)78&qol`;+09R7D#sB~S literal 0 HcmV?d00001 From d171427fcf31cb0aecaa70d0480ce6bdffc00251 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Mon, 20 Oct 2014 23:54:54 +0530 Subject: [PATCH 03/15] Quick GTK3.14 fixes --- gtk-3.0/gtk-widgets.css | 154 +++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 73 deletions(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 0bcc19a..c42ca8d 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -315,24 +315,78 @@ row:selected:focus { /******************* * check and radio * *******************/ -.check, -.radio, -.check:insensitive, -.radio:insensitive { - border-style: none; - background-color: transparent; -} - -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; -} - -GtkCheckButton { +GtkCheckButton.text-button, +GtkRadioButton.text-button { + padding: 1px; outline-offset: 0; - padding: 3px; +} + +.check { + color: shade(@theme_fg_color, 1.2); + background-image: none; + + -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); +} +.check:hover { + color: shade(@theme_fg_color, 1.1); +} + +.check:checked, +.check:active { + -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); + + color: @theme_fg_color; +} +.check:checked:hover, +.check:active:hover { + color: shade(@theme_fg_color, 1.1); +} + +.check:checked:insensitive, +.check:active:insensitive { + color: shade(@theme_fg_color, 1.1); +} + +.check:insensitive { + color: shade(@theme_fg_color, 1.8); +} + +.check:inconsistent { + -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); +} + +.radio { + color: shade(@theme_fg_color, 1.2); + background-image: none; + + -gtk-icon-source: -gtk-icontheme("radio-symbolic"); +} +.radio:hover { + color: shade(@theme_fg_color, 1.1); +} + +.radio:checked, +.radio:active { + -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); + + color: @theme_fg_color; +} + +.radio:checked:hover, +.radio:active:hover { + color: shade(@theme_fg_color, 1.1); +} +.radio:checked:insensitive, +.radio:active:insensitive { + color: shade(@theme_fg_color, 1.1); +} + +.radio:insensitive { + color: shade(@theme_fg_color, 1.8); +} + +.radio:inconsistent { + -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); } /***************** @@ -1953,71 +2007,25 @@ GtkComboBox .separator { /*********** * spinner * ***********/ -@keyframes spinner { - 00.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } - - 10.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.90)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)); } - - 20.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.90)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)); } - - 30.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); } - - 40.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.50)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)); } - - 50.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(transparent), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.30)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)); } - - 60.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.10)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } - - 70.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.10)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)); } - - 80.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.60)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.30)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(transparent), to(transparent)); } - - 90.0% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.80)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.50)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.20)), to(transparent)); } - - 100% { background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); } +@keyframes spin { + to { -gtk-icon-transform: rotate(1turn); } } .spinner { - background-color: transparent; - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)); + background-image: none; + background-color: blue; + opacity: 0; - background-position: 0% 70%, 33% 70%, 70% 70%; - background-size: 30% 30%; - background-repeat: no-repeat; + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); } .spinner:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.70)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.40)), to(transparent)); - - animation: spinner 1s infinite linear; + opacity: 1; + animation: spin 1s linear infinite; } +.spinner:active:insensitive { opacity: 0.5; } + .menu.spinner, .menu .spinner, .menu .spinner:hover, From 9bf8bababe0ddb3cb634c74d5e27ed3123700987 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 23 Nov 2014 20:43:17 +0530 Subject: [PATCH 04/15] Fix lists --- gtk-3.0/gtk-widgets.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index c42ca8d..4aeec04 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -618,14 +618,19 @@ GtkExpander { } .list-row { + border: none; + border-radius: 0; padding: 3px; + background-image: none; } .list-row:hover { + background-image: none; background-color: shade(@theme_bg_color, 1.02); } .list-row:selected { + background-image: none; background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } From 2f21771c6356e4c2bfbd2b11a25cbb2c943a3648 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 23 Nov 2014 20:47:07 +0530 Subject: [PATCH 05/15] Fix ugly sidebar separators --- gtk-3.0/gtk-widgets.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 4aeec04..5d7a4d1 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -1779,7 +1779,9 @@ OsScrollbar:insensitive { /************* * separator * *************/ +.sidebar.separator, .sidebar.view.separator, +.sidebar .view.separator, .view.separator, .separator { border-width: 1px; From 254a4294e5d8931c0d438508738f697a98e00e06 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 23 Nov 2014 21:42:03 +0530 Subject: [PATCH 06/15] Add button:checked styles --- gtk-3.0/gtk-widgets.css | 359 +++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 64 deletions(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 5d7a4d1..197ba5e 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -170,6 +170,10 @@ GtkGrid:insensitive { .primary-toolbar .button:active, .toolbar .button:active, .header-bar .button:active, +.button:checked, +.primary-toolbar .button:checked, +.toolbar .button:checked, +.header-bar .button:checked, .notebook.header { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -189,6 +193,10 @@ GtkGrid:insensitive { .primary-toolbar .button:active *:insensitive, .toolbar .button:active *:insensitive, .header-bar .button:active *:insensitive, +.button:checked *:insensitive, +.primary-toolbar .button:checked *:insensitive, +.toolbar .button:checked *:insensitive, +.header-bar .button:checked *:insensitive, .entry:insensitive { box-shadow: none; } @@ -233,20 +241,24 @@ GtkAssistant .sidebar { background-image: none; } -.button:active { +.button:active, +.button:checked { border-color: shade(@theme_bg_color, 0.8); background-color: shade(@theme_bg_color, 0.95); background-image: none; } -.button:active:hover { +.button:active:hover, +.button:checked:hover { border-color: shade(@theme_bg_color, 0.7); } .button:focus, .button:hover:focus, .button:active:focus, -.button:active:hover:focus { +.button:active:hover:focus, +.button:checked:focus, +.button:checked:hover:focus { border-color: shade(@theme_bg_color, 0.7); } @@ -256,7 +268,8 @@ GtkAssistant .sidebar { background-image: none; } -.button:active *:insensitive { +.button:active *:insensitive, +.button:checked *:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -274,12 +287,14 @@ GtkAssistant .sidebar { background-color: @theme_selected_bg_color; } -.button.default:active { +.button.default:active, +.button.default:checked { border-color: shade(@theme_selected_bg_color, 0.8); background-color: shade(@theme_selected_bg_color, 0.95); } -.button.default:active:hover { +.button.default:active:hover, +.button.default:checked:hover { border-color: shade(@theme_selected_bg_color, 0.7); background-color: shade(@theme_selected_bg_color, 0.97); } @@ -393,15 +408,18 @@ GtkRadioButton.text-button { * column-header * *****************/ column-header .button, -column-header .button:active { +column-header .button:active, +column-header .button:checked { border-width: 0 1px 1px 0; border-radius: 0; } column-header .button, column-header .button:active, +column-header .button:checked, column-header .button:focus, -column-header .button:active:focus { +column-header .button:active:focus, +column-header .button:checked:focus { border-color: shade(@theme_base_color, 0.9); border-bottom-color: shade(@theme_base_color, 0.8); background-color: shade(@theme_base_color, 0.97); @@ -410,8 +428,10 @@ column-header .button:active:focus { column-header .button:hover, column-header .button:active:hover, +column-header .button:checked:hover, column-header .button:hover:focus, -column-header .button:active:hover:focus { +column-header .button:active:hover:focus, +column-header .button:checked:hover:focus { border-color: shade(@theme_base_color, 0.9); border-bottom-color: shade(@theme_base_color, 0.8); background-color: shade(@theme_base_color, 0.99); @@ -537,10 +557,12 @@ GtkComboBox.combobox-entry .entry:insensitive { .primary-toolbar GtkComboBox.combobox-entry .button, .primary-toolbar GtkComboBox.combobox-entry .button:hover, .primary-toolbar GtkComboBox.combobox-entry .button:active, +.primary-toolbar GtkComboBox.combobox-entry .button:checked, .primary-toolbar GtkComboBox.combobox-entry .button:insensitive, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:hover, GtkComboBox.combobox-entry .button:active, +GtkComboBox.combobox-entry .button:checked, GtkComboBox.combobox-entry .button:insensitive { border-width: 1px 1px 1px 1px; border-bottom-left-radius: 0; @@ -727,12 +749,14 @@ GtkInfoBar { background-color: shade(@info_bg_color, 1.10); } -.info .button:active { +.info .button:active, +.info .button:checked { border-color: shade(@info_bg_color, 0.6); background-color: shade(@info_bg_color, 0.95); } -.info .button:active:hover { +.info .button:active:hover, +.info .button:active:checked { border-top-color: shade(@info_bg_color, 0.85); border-right-color: shade(@info_bg_color, 0.78); border-left-color: shade(@info_bg_color, 0.78); @@ -778,12 +802,14 @@ GtkInfoBar { background-color: shade(@warning_bg_color, 1.10); } -.warning .button:active { +.warning .button:active, +.warning .button:checked { border-color: shade(@warning_bg_color, 0.6); background-color: shade(@warning_bg_color, 0.95); } -.warning .button:active:hover { +.warning .button:active:hover, +.warning .button:checked:hover { border-top-color: shade(@warning_bg_color, 0.85); border-right-color: shade(@warning_bg_color, 0.78); border-left-color: shade(@warning_bg_color, 0.78); @@ -829,12 +855,14 @@ GtkInfoBar { background-color: shade(@question_bg_color, 1.10); } -.question .button:active { +.question .button:active, +.question .button:checked { border-color: shade(@question_bg_color, 0.6); background-color: shade(@question_bg_color, 0.95); } -.question .button:active:hover { +.question .button:active:hover, +.question .button:checked:hover { border-top-color: shade(@question_bg_color, 0.85); border-right-color: shade(@question_bg_color, 0.78); border-left-color: shade(@question_bg_color, 0.78); @@ -880,12 +908,14 @@ GtkInfoBar { background-color: shade(@error_bg_color, 1.10); } -.error .button:active { +.error .button:active, +.error .button:checked { border-color: shade(@error_bg_color, 0.6); background-color: shade(@error_bg_color, 0.95); } -.error .button:active:hover { +.error .button:active:hover, +.error .button:checked:hover { border-top-color: shade(@error_bg_color, 0.85); border-right-color: shade(@error_bg_color, 0.78); border-left-color: shade(@error_bg_color, 0.78); @@ -1027,7 +1057,9 @@ GtkComboBox .menu { .menu.button:hover, .menu.button:active, +.menu.button:checked, .menu.button:active *:insensitive, +.menu.button:checked *:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -1230,8 +1262,10 @@ GtkPopover .separator { .menuitem.button, .menuitem.button:active, +.menuitem.button:checked, .menuitem.button:insensitive, -.menuitem.button:active:insensitive { +.menuitem.button:active:insensitive, +.menuitem.button:checked:insensitive { background-color: transparent; background-image: none; border-color: transparent; @@ -1241,6 +1275,7 @@ GtkPopover .separator { } .menuitem.button:active:hover, +.menuitem.button:checked:hover, .menuitem.button:hover, .menuitem.button:selected { border-width: 0; @@ -1255,8 +1290,10 @@ GtkModelButton.button { } GtkModelButton.button:active, +GtkModelButton.button:checked, GtkModelButton.button:insensitive, GtkModelButton.button:active:insensitive, +GtkModelButton.button:checked:insensitive, GtkModelButton.button { background-color: transparent; background-image: none; @@ -1272,7 +1309,11 @@ GtkModelButton.button:insensitive:backdrop, GtkModelButton.button:active:insensitive:backdrop, GtkModelButton.button:active:backdrop, GtkModelButton.button:active:hover:backdrop, -GtkModelButton.button:active:selected:backdrop { +GtkModelButton.button:active:selected:backdrop, +GtkModelButton.button:checked:insensitive:backdrop, +GtkModelButton.button:checked:backdrop, +GtkModelButton.button:checked:hover:backdrop, +GtkModelButton.button:checked:selected:backdrop { text-shadow: none; icon-shadow: none; color: @theme_selected_fg_color; @@ -1285,6 +1326,7 @@ GtkModelButton.button:active:selected:backdrop { } GtkModelButton.button:active:hover, +GtkModelButton.button:checked:hover, GtkModelButton.button:hover, GtkModelButton.button:selected { background-image: none; @@ -1455,6 +1497,7 @@ GtkModelButton.button:selected { /* close button styling */ .notebook tab .button, .notebook tab .button:active, +.notebook tab .button:checked, .notebook tab .button:hover { padding: 1px; border-width: 1px; @@ -1472,7 +1515,9 @@ GtkModelButton.button:selected { } .notebook tab .button:active, -.notebook tab .button:active:hover { +.notebook tab .button:checked, +.notebook tab .button:active:hover, +.notebook tab .button:checked:hover { border-color: shade(@theme_base_color, 0.7); background-color: shade(@theme_base_color, 0.95); } @@ -1724,7 +1769,9 @@ GtkLevelBar.vertical { .scrollbar.button, .scrollbar.button:active, -.scrollbar.button:active:hover { +.scrollbar.button:checked, +.scrollbar.button:active:hover, +.scrollbar.button:checked:hover { border-width: 0; border-radius: 0; background-color: transparent; @@ -1932,6 +1979,7 @@ GtkComboBox .separator { } .spinbutton .button:active, +.spinbutton .button:checked, .spinbutton .button:hover { color: @theme_fg_color; } @@ -1966,20 +2014,24 @@ GtkComboBox .separator { background-image: none; } -.spinbutton.vertical .button:active { +.spinbutton.vertical .button:active, +.spinbutton.vertical .button:checked { border-color: shade(@theme_bg_color, 0.8); background-color: shade(@theme_bg_color, 0.95); background-image: none; } -.spinbutton.vertical .button:active:hover { +.spinbutton.vertical .button:active:hover, +.spinbutton.vertical .button:checked:hover { border-color: shade(@theme_bg_color, 0.7); } .spinbutton.vertical .button:focus, .spinbutton.vertical .button:hover:focus, .spinbutton.vertical .button:active:focus, -.spinbutton.vertical .button:active:hover:focus { +.spinbutton.vertical .button:active:hover:focus, +.spinbutton.vertical .button:checked:focus, +.spinbutton.vertical .button:checked:hover:focus { border-color: shade(@theme_bg_color, 0.7); } @@ -2250,20 +2302,24 @@ GtkColorButton.button { background-image: none; } -.header-bar .button:active { +.header-bar .button:active, +.header-bar .button:checked { border-color: shade(@titlebar_bg_color, 0.8); background-color: shade(@titlebar_bg_color, 0.95); background-image: none; } -.header-bar .button:active:hover { +.header-bar .button:active:hover, +.header-bar .button:checked:hover { border-color: shade(@titlebar_bg_color, 0.7); } .header-bar .button:focus, .header-bar .button:hover:focus, .header-bar .button:active:focus, -.header-bar .button:active:hover:focus { +.header-bar .button:checked:focus, +.header-bar .button:active:hover:focus +.header-bar .button:checked:hover:focus { border-color: shade(@titlebar_bg_color, 0.7); } @@ -2273,7 +2329,8 @@ GtkColorButton.button { background-image: none; } -.header-bar .button:active *:insensitive { +.header-bar .button:active *:insensitive, +.header-bar .button:checked *:insensitive { border-color: shade(@titlebar_bg_color, 0.75); background-color: shade(@titlebar_bg_color, 0.80); background-image: none; @@ -2367,14 +2424,18 @@ GtkColorButton.button { } .primary-toolbar .button:active, -.toolbar .button:active { +.toolbar .button:active, +.primary-toolbar .button:checked, +.toolbar .button:checked { border-color: shade(@toolbar_bg_color, 0.8); background-color: shade(@toolbar_bg_color, 0.95); background-image: none; } .primary-toolbar .button:active:hover, -.toolbar .button:active:hover { +.toolbar .button:active:hover, +.primary-toolbar .button:checked:hover, +.toolbar .button:checked:hover { border-color: shade(@toolbar_bg_color, 0.7); } @@ -2382,10 +2443,14 @@ GtkColorButton.button { .primary-toolbar .button:hover:focus, .primary-toolbar .button:active:focus, .primary-toolbar .button:active:hover:focus, +.primary-toolbar .button:checked:focus, +.primary-toolbar .button:checked:hover:focus, .toolbar .button:focus, .toolbar .button:hover:focus, .toolbar .button:active:focus, -.toolbar .button:active:hover:focus { +.toolbar .button:active:hover:focus, +.toolbar .button:checked:focus, +.toolbar .button:checked:hover:focus { border-color: shade(@toolbar_bg_color, 0.7); } @@ -2397,7 +2462,9 @@ GtkColorButton.button { } .primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive { +.toolbar .button:active *:insensitive, +.primary-toolbar .button:checked *:insensitive, +.toolbar .button:checked *:insensitive { border-color: shade(@toolbar_bg_color, 0.75); background-color: shade(@toolbar_bg_color, 0.80); background-image: none; @@ -2451,20 +2518,24 @@ GtkColorButton.button { background-image: none; } -.inline-toolbar.toolbar .button:active { +.inline-toolbar.toolbar .button:active, +.inline-toolbar.toolbar .button:checked { border-color: shade(@theme_bg_color, 0.8); background-color: shade(@theme_bg_color, 0.95); background-image: none; } -.inline-toolbar.toolbar .button:active:hover { +.inline-toolbar.toolbar .button:active:hover, +.inline-toolbar.toolbar .button:checked:hover { border-color: shade(@theme_bg_color, 0.7); } .inline-toolbar.toolbar .button:focus, .inline-toolbar.toolbar .button:hover:focus, .inline-toolbar.toolbar .button:active:focus, -.inline-toolbar.toolbar .button:active:hover:focus { +.inline-toolbar.toolbar .button:active:hover:focus, +.inline-toolbar.toolbar .button:checked:focus, +.inline-toolbar.toolbar .button:checked:hover:focus { border-color: shade(@theme_bg_color, 0.7); } @@ -2476,7 +2547,9 @@ GtkColorButton.button { } .inline-toolbar.toolbar .button:active *:insensitive -.inline-toolbar.toolbar GtkToolButton .button:active *:insensitive { +.inline-toolbar.toolbar GtkToolButton .button:active *:insensitive, +.inline-toolbar.toolbar .button:checked *:insensitive +.inline-toolbar.toolbar GtkToolButton .button:checked *:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -2496,7 +2569,11 @@ GtkColorButton.button { .linked .button:active, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton > .button:active { +.inline-toolbar.toolbar GtkToolButton > .button:active, +.linked .button:checked, +.inline-toolbar.toolbar .button:checked, +.inline-toolbar.toolbar GtkToolButton .button:checked, +.inline-toolbar.toolbar GtkToolButton > .button:checked { box-shadow: inset -1px 0 shade(@theme_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2517,18 +2594,24 @@ GtkColorButton.button { .linked .button:insensitive:only-child, .linked .button:active *:insensitive:last-child, .linked .button:active *:insensitive:only-child, +.linked .button:checked *:insensitive:last-child, +.linked .button:checked *:insensitive:only-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar .button:insensitive:only-child, .inline-toolbar.toolbar .button:active *:insensitive:last-child, .inline-toolbar.toolbar .button:active *:insensitive:only-child, +.inline-toolbar.toolbar .button:checked *:insensitive:last-child, +.inline-toolbar.toolbar .button:checked *:insensitive:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button, .inline-toolbar.toolbar GtkToolButton:only-child > .button, .inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive, .inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive { +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked *:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked *:insensitive { box-shadow: none; } @@ -2538,7 +2621,13 @@ GtkColorButton.button { .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active { +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active, +.linked .button:checked:last-child, +.linked .button:checked:only-child, +.inline-toolbar.toolbar .button:checked:last-child, +.inline-toolbar.toolbar .button:checked:only-child, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2549,12 +2638,16 @@ GtkColorButton.button { .linked .button, .linked .button:active, .linked .button:active:hover, +.linked .button:checked, +.linked .button:checked:hover, .linked .button:insensitive, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, +.inline-toolbar.toolbar .button:checked, .inline-toolbar.toolbar .button:insensitive, .inline-toolbar.toolbar GtkToolButton .button, .inline-toolbar.toolbar GtkToolButton .button:active, +.inline-toolbar.toolbar GtkToolButton .button:checked, .inline-toolbar.toolbar GtkToolButton .button:insensitive { border-width: 1px; border-radius: 0; @@ -2567,12 +2660,16 @@ GtkColorButton.button { .linked .button:first-child, .linked .button:active:first-child, .linked .button:active:hover:first-child, +.linked .button:checked:first-child, +.linked .button:checked:hover:first-child, .linked .button:insensitive:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, +.inline-toolbar.toolbar .button:checked:first-child, .inline-toolbar.toolbar .button:insensitive:first-child, .inline-toolbar.toolbar GtkToolButton:first-child .button, .inline-toolbar.toolbar GtkToolButton:first-child .button:active, +.inline-toolbar.toolbar GtkToolButton:first-child .button:checked, .inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive { border-width: 1px; border-radius: 2px; @@ -2586,12 +2683,16 @@ GtkColorButton.button { .linked .button:last-child, .linked .button:active:last-child, .linked .button:active:hover:last-child, +.linked .button:checked:last-child, +.linked .button:checked:hover:last-child, .linked .button:insensitive:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, +.inline-toolbar.toolbar .button:checked:last-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar GtkToolButton:last-child .button, .inline-toolbar.toolbar GtkToolButton:last-child .button:active, +.inline-toolbar.toolbar GtkToolButton:last-child .button:checked, .inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive { border-width: 1px; border-radius: 2px; @@ -2605,12 +2706,16 @@ GtkColorButton.button { .linked .button:only-child, .linked .button:active:only-child, .linked .button:active:hover:only-child, +.linked .button:checked:only-child, +.linked .button:checked:hover:only-child, .linked .button:insensitive:only-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, +.inline-toolbar.toolbar .button:checked:only-child, .inline-toolbar.toolbar .button:insensitive:only-child, .inline-toolbar.toolbar GtkToolButton:only-child .button, .inline-toolbar.toolbar GtkToolButton:only-child .button:active, +.inline-toolbar.toolbar GtkToolButton:only-child .button:checked, .inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive { border-width: 1px; border-radius: 2px; @@ -2625,7 +2730,10 @@ GtkColorButton.button { .linked.vertical .button:active, .inline-toolbar.toolbar.vertical .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:active { +.inline-toolbar.toolbar.vertical GtkToolButton > .button:activeactive, +.linked.vertical .button:checked, +.inline-toolbar.toolbar.vertical .button:checked, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:checked { box-shadow: inset 0 -1px shade(@theme_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2645,18 +2753,24 @@ GtkColorButton.button { .linked.vertical .button:insensitive:only-child, .linked.vertical .button:active *:insensitive:last-child, .linked.vertical .button:active *:insensitive:only-child, +.linked.vertical .button:checked *:insensitive:last-child, +.linked.vertical .button:checked *:insensitive:only-child, .inline-toolbar.toolbar.vertical .button:last-child, .inline-toolbar.toolbar.vertical .button:only-child, .inline-toolbar.toolbar.vertical .button:insensitive:last-child, .inline-toolbar.toolbar.vertical .button:insensitive:only-child, .inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, .inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:checked *:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:checked *:insensitive:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked *:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked *:insensitive { box-shadow: none; } @@ -2666,7 +2780,19 @@ GtkColorButton.button { .inline-toolbar.toolbar.vertical .button:active:last-child, .inline-toolbar.toolbar.vertical .button:active:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active { +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active, +.linked.vertical .button:active:last-child, +.linked.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical .button:active:last-child, +.inline-toolbar.toolbar.vertical .button:active:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active, +.linked.vertical .button:checked:last-child, +.linked.vertical .button:checked:only-child, +.inline-toolbar.toolbar.vertical .button:checkede:last-child, +.inline-toolbar.toolbar.vertical .button:checked:only-child, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2677,6 +2803,8 @@ GtkColorButton.button { .linked.vertical .button, .linked.vertical .button:active, .linked.vertical .button:active:hover, +.linked.vertical .button:checked, +.linked.vertical .button:checked:hover, .linked.vertical .button:insensitive { border-width: 1px; border-radius: 0; @@ -2689,6 +2817,8 @@ GtkColorButton.button { .linked.vertical .button:first-child, .linked.vertical .button:active:first-child, .linked.vertical .button:active:hover:first-child, +.linked.vertical .button:checked:first-child, +.linked.vertical .button:checked:hover:first-child, .linked.vertical .button:insensitive:first-child { border-width: 1px; border-radius: 2px; @@ -2702,6 +2832,8 @@ GtkColorButton.button { .linked.vertical .button:last-child, .linked.vertical .button:active:last-child, .linked.vertical .button:active:hover:last-child, +.linked.vertical .button:checked:last-child, +.linked.vertical .button:checked:hover:last-child, .linked.vertical .button:insensitive:last-child { border-width: 1px; border-radius: 2px; @@ -2715,6 +2847,8 @@ GtkColorButton.button { .linked.vertical .button:only-child, .linked.vertical .button:active:only-child, .linked.vertical .button:active:hover:only-child, +.linked.vertical .button:checked:only-child, +.linked.vertical .button:checked:hover:only-child, .linked.vertical .button:insensitive:only-child { border-width: 1px; border-radius: 2px; @@ -2733,7 +2867,11 @@ GtkColorButton.button { .primary-toolbar .raised.linked .button:active, .toolbar .button.raised.linked:active, .toolbar .raised.linked .button:active, -.toolbar .linked .button:active { +.toolbar .linked .button:active, +.primary-toolbar .raised.linked .button:checked, +.toolbar .button.raised.linked:checked, +.toolbar .raised.linked .button:checked, +.toolbar .linked .button:checked { box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2755,30 +2893,40 @@ GtkColorButton.button { .primary-toolbar .button:insensitive.raised.linked:only-child, .primary-toolbar .button:active *:insensitive.raised.linked:last-child, .primary-toolbar .button:active *:insensitive.raised.linked:only-child, +.primary-toolbar .button:checked *:insensitive.raised.linked:last-child, +.primary-toolbar .button:checked *:insensitive.raised.linked:only-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:insensitive:only-child, .primary-toolbar .raised.linked .button:active *:insensitive:last-child, .primary-toolbar .raised.linked .button:active *:insensitive:only-child, +.primary-toolbar .raised.linked .button:checked *:insensitive:last-child, +.primary-toolbar .raised.linked .button:checked *:insensitive:only-child, .toolbar .button.raised.linked:last-child, .toolbar .button.raised.linked:only-child, .toolbar .button:insensitive.raised.linked:last-child, .toolbar .button:insensitive.raised.linked:only-child, .toolbar .button:active *:insensitive.raised.linked:last-child, .toolbar .button:active *:insensitive.raised.linked:only-child, +.toolbar .button:checked *:insensitive.raised.linked:last-child, +.toolbar .button:checked *:insensitive.raised.linked:only-child, .toolbar .raised.linked .button:last-child, .toolbar .raised.linked .button:only-child, .toolbar .raised.linked .button:insensitive:last-child, .toolbar .raised.linked .button:insensitive:only-child, .toolbar .raised.linked .button:active *:insensitive:last-child, .toolbar .raised.linked .button:active *:insensitive:only-child, +.toolbar .raised.linked .button:checked *:insensitive:last-child, +.toolbar .raised.linked .button:checked *:insensitive:only-child, .toolbar .linked .button:last-child, .toolbar .linked .button:only-child, .toolbar .linked .button:insensitive:last-child, .toolbar .linked .button:insensitive:only-child, .toolbar .linked .button:active *:insensitive:last-child, -.toolbar .linked .button:active *:insensitive:only-child { +.toolbar .linked .button:active *:insensitive:only-child +.toolbar .linked .button:checked *:insensitive:last-child, +.toolbar .linked .button:checked *:insensitive:only-child { box-shadow: none; } @@ -2792,7 +2940,17 @@ GtkColorButton.button { .toolbar .raised.linked .button:active:last-child, .toolbar .raised.linked .button:active:only-child, .toolbar .linked .button:active:last-child, -.toolbar .linked .button:active:only-child { +.toolbar .linked .button:active:only-child, +.primary-toolbar .button:checked.raised.linked:last-child, +.primary-toolbar .button:checked.raised.linked:only-child, +.primary-toolbar .raised.linked .button:checked:last-child, +.primary-toolbar .raised.linked .button:checked:only-child, +.toolbar .button:checked.raised.linked:last-child, +.toolbar .button:checked.raised.linked:only-child, +.toolbar .raised.linked .button:checked:last-child, +.toolbar .raised.linked .button:checked:only-child, +.toolbar .linked .button:checked:last-child, +.toolbar .linked .button:checked:only-child { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2801,18 +2959,23 @@ GtkColorButton.button { /* middle button */ .primary-toolbar .button.raised.linked, .primary-toolbar .button.raised.linked:active, +.primary-toolbar .button.raised.linked:checked, .primary-toolbar .button.raised.linked:insensitive, .primary-toolbar .raised.linked .button, .primary-toolbar .raised.linked .button:active, +.primary-toolbar .raised.linked .button:checked, .primary-toolbar .raised.linked .button:insensitive, .toolbar .button.raised.linked, .toolbar .button.raised.linked:active, +.toolbar .button.raised.linked:checked, .toolbar .button.raised.linked:insensitive, .toolbar .raised.linked .button, .toolbar .raised.linked .button:active, +.toolbar .raised.linked .button:checked, .toolbar .raised.linked .button:insensitive, .toolbar .linked .button, .toolbar .linked .button:active, +.toolbar .linked .button:checked, .toolbar .linked .button:insensitive { border-width: 1px; border-radius: 0; @@ -2823,18 +2986,23 @@ GtkColorButton.button { /* leftmost button */ .primary-toolbar .button.raised.linked:first-child, .primary-toolbar .button.raised.linked:active:first-child, +.primary-toolbar .button.raised.linked:checked:first-child, .primary-toolbar .button.raised.linked:insensitive:first-child, .primary-toolbar .raised.linked .button:first-child, .primary-toolbar .raised.linked .button:active:first-child, +.primary-toolbar .raised.linked .button:checked:first-child, .primary-toolbar .raised.linked .button:insensitive:first-child, .toolbar .button.raised.linked:first-child, .toolbar .button.raised.linked:active:first-child, +.toolbar .button.raised.linked:checked:first-child, .toolbar .button.raised.linked:insensitive:first-child, .toolbar .raised.linked .button:first-child, .toolbar .raised.linked .button:active:first-child, +.toolbar .raised.linked .button:checked:first-child, .toolbar .raised.linked .button:insensitive:first-child, .toolbar .linked .button:first-child, -.toolbar .linked .button:active:first-child { +.toolbar .linked .button:active:first-child, +.toolbar .linked .button:checked:first-child { border-width: 1px; border-radius: 2px; border-right-width: 0; @@ -2845,18 +3013,23 @@ GtkColorButton.button { /* rightmost button */ .primary-toolbar .button.raised.linked:last-child, .primary-toolbar .button.raised.linked:active:last-child, +.primary-toolbar .button.raised.linked:checked:last-child, .primary-toolbar .button.raised.linked:insensitive:last-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:active:last-child, +.primary-toolbar .raised.linked .button:checked:last-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .toolbar .button.raised.linked:last-child, .toolbar .button.raised.linked:active:last-child, +.toolbar .button.raised.linked:checked:last-child, .toolbar .button.raised.linked:insensitive:last-child, .toolbar .raised.linked .button:last-child, .toolbar .raised.linked .button:active:last-child, +.toolbar .raised.linked .button:checked:last-child, .toolbar .raised.linked .button:insensitive:last-child, .toolbar .linked .button:last-child, .toolbar .linked .button:active:last-child, +.toolbar .linked .button:checked:last-child, .toolbar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 2px; @@ -2868,18 +3041,23 @@ GtkColorButton.button { /* linked single button */ .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .button.raised.linked:active:only-child, +.primary-toolbar .button.raised.linked:checked:only-child, .primary-toolbar .button.raised.linked:insensitive:only-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:active:only-child, +.primary-toolbar .raised.linked .button:checked:only-child, .primary-toolbar .raised.linked .button:insensitive:only-child, .toolbar .button.raised.linked:only-child, .toolbar .button.raised.linked:active:only-child, +.toolbar .button.raised.linked:checked:only-child, .toolbar .button.raised.linked:insensitive:only-child, .toolbar .raised.linked .button:only-child, .toolbar .raised.linked .button:active:only-child, +.toolbar .raised.linked .button:checked:only-child, .toolbar .raised.linked .button:insensitive:only-child, .toolbar .linked .button:only-child, .toolbar .linked .button:active:only-child, +.toolbar .linked .button:checked:only-child, .toolbar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 2px; @@ -2894,7 +3072,10 @@ GtkColorButton.button { .header-bar .button.raised.linked:active, .header-bar .raised.linked .button:active, -.header-bar .linked .button:active { +.header-bar .button.raised.linked:checked, +.header-bar .raised.linked .button:checked, +.header-bar .linked .button:active, +.header-bar .linked .button:checked { box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.9), inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), @@ -2914,18 +3095,24 @@ GtkColorButton.button { .header-bar .button:insensitive.raised.linked:only-child, .header-bar .button:active *:insensitive.raised.linked:last-child, .header-bar .button:active *:insensitive.raised.linked:only-child, +.header-bar .button:checked *:insensitive.raised.linked:last-child, +.header-bar .button:checked *:insensitive.raised.linked:only-child, .header-bar .raised.linked .button:last-child, .header-bar .raised.linked .button:only-child, .header-bar .raised.linked .button:insensitive:last-child, .header-bar .raised.linked .button:insensitive:only-child, .header-bar .raised.linked .button:active *:insensitive:last-child, .header-bar .raised.linked .button:active *:insensitive:only-child, +.header-bar .raised.linked .button:checked *:insensitive:last-child, +.header-bar .raised.linked .button:checked *:insensitive:only-child, .header-bar .linked .button:last-child, .header-bar .linked .button:only-child, .header-bar .linked .button:insensitive:last-child, .header-bar .linked .button:insensitive:only-child, .header-bar .linked .button:active *:insensitive:last-child, -.header-bar .linked .button:active *:insensitive:only-child { +.header-bar .linked .button:active *:insensitive:only-child, +.header-bar .linked .button:checked *:insensitive:last-child, +.header-bar .linked .button:checked *:insensitive:only-child { box-shadow: none; } @@ -2935,7 +3122,13 @@ GtkColorButton.button { .header-bar .raised.linked .button:active:last-child, .header-bar .raised.linked .button:active:only-child, .header-bar .linked .button:active:last-child, -.header-bar .linked .button:active:only-child { +.header-bar .linked .button:active:only-child, +.header-bar .button:checked.raised.linked:last-child, +.header-bar .button:checked.raised.linked:only-child, +.header-bar .raised.linked .button:checked:last-child, +.header-bar .raised.linked .button:checked:only-child, +.header-bar .linked .button:checked:last-child, +.header-bar .linked .button:checked:only-child { box-shadow: inset 1px 0 alpha(@dark_shadow, 0.07), inset 0 1px alpha(@dark_shadow, 0.08), inset -1px 0 alpha(@dark_shadow, 0.07); @@ -2944,12 +3137,15 @@ GtkColorButton.button { /* middle button */ .header-bar .button.raised.linked, .header-bar .button.raised.linked:active, +.header-bar .button.raised.linked:checked, .header-bar .button.raised.linked:insensitive, .header-bar .raised.linked .button, .header-bar .raised.linked .button:active, +.header-bar .raised.linked .button:checked, .header-bar .raised.linked .button:insensitive, .header-bar .linked .button, .header-bar .linked .button:active, +.header-bar .linked .button:checked, .header-bar .linked .button:insensitive { border-width: 1px; border-radius: 0; @@ -2977,12 +3173,15 @@ GtkColorButton.button { /* rightmost button */ .header-bar .button.raised.linked:last-child, .header-bar .button.raised.linked:active:last-child, +.header-bar .button.raised.linked:checked:last-child, .header-bar .button.raised.linked:insensitive:last-child, .header-bar .raised.linked .button:last-child, .header-bar .raised.linked .button:active:last-child, +.header-bar .raised.linked .button:checked:last-child, .header-bar .raised.linked .button:insensitive:last-child, .header-bar .linked .button:last-child, .header-bar .linked .button:active:last-child, +.header-bar .linked .button:checked:last-child, .header-bar .linked .button:insensitive:last-child { border-width: 1px; border-radius: 2px; @@ -2994,12 +3193,15 @@ GtkColorButton.button { /* linked single button */ .header-bar .button.raised.linked:only-child, .header-bar .button.raised.linked:active:only-child, +.header-bar .button.raised.linked:checked:only-child, .header-bar .button.raised.linked:insensitive:only-child, .header-bar .raised.linked .button:only-child, .header-bar .raised.linked .button:active:only-child, +.header-bar .raised.linked .button:checked:only-child, .header-bar .raised.linked .button:insensitive:only-child, .header-bar .linked .button:only-child, .header-bar .linked .button:active:only-child, +.header-bar .linked .button:checked:only-child, .header-bar .linked .button:insensitive:only-child { border-width: 1px; border-radius: 2px; @@ -3214,7 +3416,10 @@ GtkOverlay.osd { .osd.button:active, .osd .button:active, -.osd GtkMenuButton.button:active { +.osd GtkMenuButton.button:active, +.osd.button:checked, +.osd .button:checked, +.osd GtkMenuButton.button:checked { border-color: shade(@osd_bg, 0.8); background-color: shade(@osd_bg, 0.95); background-image: none; @@ -3222,7 +3427,10 @@ GtkOverlay.osd { .osd.button:active:hover, .osd .button:active:hover, -.osd GtkMenuButton.button:active:hover { +.osd GtkMenuButton.button:active:hover, +.osd.button:checked:hover, +.osd .button:checked:hover, +.osd GtkMenuButton.button:checked:hover { border-color: shade(@osd_bg, 0.7); } @@ -3234,7 +3442,9 @@ GtkOverlay.osd { } .osd.button:active *:insensitive, -.osd .button:active *:insensitive { +.osd .button:active *:insensitive, +.osd.button:checked *:insensitive, +.osd .button:checked *:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -3269,20 +3479,24 @@ GtkOverlay.osd { background-image: none; } -.osd.toolbar .button:active { +.osd.toolbar .button:active, +.osd.toolbar .button:checked { border-color: shade(@osd_bg, 0.8); background-color: shade(@osd_bg, 0.95); background-image: none; } -.osd.toolbar .button:active:hover { +.osd.toolbar .button:active:hover, +.osd.toolbar .button:checked:hover { border-color: shade(@osd_bg, 0.7); } .osd.toolbar .button:focus, .osd.toolbar .button:hover:focus, .osd.toolbar .button:active:focus, -.osd.toolbar .button:active:hover:focus { +.osd.toolbar .button:active:hover:focus, +.osd.toolbar .button:checked:focus, +.osd.toolbar .button:checked:hover:focus { border-color: shade(@osd_bg, 0.7); } @@ -3292,7 +3506,8 @@ GtkOverlay.osd { background-image: none; } -.osd.toolbar .button:active *:insensitive { +.osd.toolbar .button:active *:insensitive, +.osd.toolbar .button:checked *:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; @@ -3468,7 +3683,8 @@ GtkProgressBar.osd.progressbar { background-image: none; } -.destructive-action.button:active { +.destructive-action.button:active, +.destructive-action.button:checked { border-color: shade(@error_color, 0.8); background-color: shade(@error_color, 0.87); background-image: none; @@ -3497,13 +3713,15 @@ GtkProgressBar.osd.progressbar { background-image: none; } -.suggested-action.button:active { +.suggested-action.button:active, +.suggested-action.button:checked { border-color: shade(@theme_selected_bg_color, 0.9); background-color: shade(@theme_selected_bg_color, 1.05); background-image: none; } -.suggested-action.button:hover:active { +.suggested-action.button:hover:active, +.suggested-action.button:hover:checked { border-color: shade(@theme_selected_bg_color, 0.8); } @@ -3551,7 +3769,10 @@ GtkProgressBar.osd.progressbar { .selection-mode.header-bar .button:active, .selection-mode.toolbar .button:active, -.selection-mode.toolbar GtkToolButton .button:active { +.selection-mode.toolbar GtkToolButton .button:active, +.selection-mode.header-bar .button:checked, +.selection-mode.toolbar .button:checked, +.selection-mode.toolbar GtkToolButton .button:checked { border-color: shade(@theme_selected_bg_color, 0.9); background-color: shade(@theme_selected_bg_color, 1.55); background-image: none; @@ -3586,7 +3807,10 @@ GtkProgressBar.osd.progressbar { .selection-mode.header-bar .suggested-action.button:active, .selection-mode.toolbar .suggested-action.button:active, -.selection-mode.toolbar GtkToolButton.suggested-action:active { +.selection-mode.toolbar GtkToolButton.suggested-action:active, +.selection-mode.header-bar .suggested-action.button:checked, +.selection-mode.toolbar .suggested-action.button:checked, +.selection-mode.toolbar GtkToolButton.suggested-action:checked { border-color: shade(@theme_selected_bg_color, 0.9); background-color: shade(@theme_selected_bg_color, 1.05); background-image: none; @@ -3594,7 +3818,10 @@ GtkProgressBar.osd.progressbar { .selection-mode.header-bar .suggested-action.button:hover:active, .selection-mode.toolbar .suggested-action.button:hover:active, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active { +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:active, +.selection-mode.header-bar .suggested-action.button:hover:checked, +.selection-mode.toolbar .suggested-action.button:hover:checked, +.selection-mode.toolbar GtkToolButton.suggested-action .button:hover:checked { border-color: shade(@theme_selected_bg_color, 0.8); } @@ -3620,7 +3847,9 @@ GtkProgressBar.osd.progressbar { } .selection-mode.header-bar .selection-menu.button:active, -.selection-mode.toolbar .selection-menu.button:active { +.selection-mode.toolbar .selection-menu.button:active, +.selection-mode.header-bar .selection-menu.button:checked, +.selection-mode.toolbar .selection-menu.button:checked { color: shade(@theme_selected_bg_color, 0.8); box-shadow: none; } @@ -3695,7 +3924,9 @@ GtkBubbleWindow .toolbar { } .titlebar .titlebutton:active, -.titlebar .titlebutton:active:hover { +.titlebar .titlebutton:active:hover, +.titlebar .titlebutton:checked, +.titlebar .titlebutton:checked:hover { background: none; color: shade(@theme_selected_bg_color, 0.9); box-shadow: none; From 70ee0e0f88134376771b3799c4c1413179f8493f Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sun, 23 Nov 2014 22:04:36 +0530 Subject: [PATCH 07/15] Style popover background. Fixes #163 --- gtk-3.0/gtk-widgets.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 197ba5e..20f4e97 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -1222,11 +1222,17 @@ GtkPopover { border-width: 1px; border-style: solid; background-clip: border-box; + background-image: none; background-color: @menu_bg_color; color: @menu_fg_color; box-shadow: 0 2px 3px alpha(black, 0.5); } +GtkPopover.background { + background-image: none; + background-color: @menu_bg_color; +} + GtkPopover:backdrop { box-shadow: none; } @@ -1238,6 +1244,7 @@ GtkPopover.osd { GtkPopover > .list, GtkPopover > .view, GtkPopover > .toolbar { + background-image: none; background-color: transparent; } @@ -1297,7 +1304,7 @@ GtkModelButton.button:checked:insensitive, GtkModelButton.button { background-color: transparent; background-image: none; - border-color: transparent; + border: transparent; border-image: none; border-style: none; box-shadow: none; From 8cea27c2555223e8f0f26349a60c6673a019ec2d Mon Sep 17 00:00:00 2001 From: Eugene Date: Fri, 28 Nov 2014 08:58:36 +0100 Subject: [PATCH 08/15] s/checkede/checked/ --- gtk-3.0/gtk-widgets.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 20f4e97..18f3dab 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -2796,7 +2796,7 @@ GtkColorButton.button { .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active, .linked.vertical .button:checked:last-child, .linked.vertical .button:checked:only-child, -.inline-toolbar.toolbar.vertical .button:checkede:last-child, +.inline-toolbar.toolbar.vertical .button:checked:last-child, .inline-toolbar.toolbar.vertical .button:checked:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked { From e83762218c0537958fc7a590712300c08c92a5e8 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 17:38:43 +0530 Subject: [PATCH 09/15] Add proper assets --- gtk-3.0/assets/checkbox-checked-dark.svg | 7 + .../checkbox-checked-insensitive-dark.svg | 9 + .../assets/checkbox-checked-insensitive.svg | 9 + gtk-3.0/assets/checkbox-checked.svg | 7 + gtk-3.0/assets/checkbox-mixed-dark.svg | 7 + .../checkbox-mixed-insensitive-dark.svg | 9 + gtk-3.0/assets/checkbox-mixed-insensitive.svg | 9 + gtk-3.0/assets/checkbox-mixed.svg | 7 + gtk-3.0/assets/checkbox-unchecked-dark.svg | 6 + .../checkbox-unchecked-insensitive-dark.svg | 6 + .../assets/checkbox-unchecked-insensitive.svg | 6 + gtk-3.0/assets/checkbox-unchecked.svg | 6 + .../assets/grid-selection-checked-dark.svg | 7 + gtk-3.0/assets/grid-selection-checked.svg | 7 + .../assets/grid-selection-unchecked-dark.svg | 6 + gtk-3.0/assets/grid-selection-unchecked.svg | 6 + .../menuitem-checkbox-checked-hover.svg | 5 + .../menuitem-checkbox-checked-insensitive.svg | 5 + gtk-3.0/assets/menuitem-checkbox-checked.svg | 5 + .../assets/menuitem-checkbox-mixed-hover.svg | 5 + .../menuitem-checkbox-mixed-insensitive.svg | 5 + .../menuitem-checkbox-mixed-selected.svg | 5 + gtk-3.0/assets/menuitem-checkbox-mixed.svg | 11 + .../assets/menuitem-radio-checked-hover.svg | 5 + .../menuitem-radio-checked-insensitive.svg | 5 + gtk-3.0/assets/menuitem-radio-checked.svg | 5 + gtk-3.0/assets/pane-handle-vertical.svg | 7 + gtk-3.0/assets/pane-handle.svg | 7 + gtk-3.0/assets/radio-mixed-dark.svg | 7 + .../assets/radio-mixed-insensitive-dark.svg | 9 + gtk-3.0/assets/radio-mixed-insensitive.svg | 9 + gtk-3.0/assets/radio-mixed.svg | 7 + gtk-3.0/assets/radio-selected-dark.svg | 7 + .../radio-selected-insensitive-dark.svg | 9 + gtk-3.0/assets/radio-selected-insensitive.svg | 9 + gtk-3.0/assets/radio-selected.svg | 7 + gtk-3.0/assets/radio-unselected-dark.svg | 6 + .../radio-unselected-insensitive-dark.svg | 6 + .../assets/radio-unselected-insensitive.svg | 6 + gtk-3.0/assets/radio-unselected.svg | 6 + gtk-3.0/gtk-widgets-assets.css | 294 +++--------------- 41 files changed, 317 insertions(+), 249 deletions(-) create mode 100644 gtk-3.0/assets/checkbox-checked-dark.svg create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive-dark.svg create mode 100644 gtk-3.0/assets/checkbox-checked-insensitive.svg create mode 100644 gtk-3.0/assets/checkbox-checked.svg create mode 100644 gtk-3.0/assets/checkbox-mixed-dark.svg create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg create mode 100644 gtk-3.0/assets/checkbox-mixed-insensitive.svg create mode 100644 gtk-3.0/assets/checkbox-mixed.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked-dark.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked-insensitive.svg create mode 100644 gtk-3.0/assets/checkbox-unchecked.svg create mode 100644 gtk-3.0/assets/grid-selection-checked-dark.svg create mode 100644 gtk-3.0/assets/grid-selection-checked.svg create mode 100644 gtk-3.0/assets/grid-selection-unchecked-dark.svg create mode 100644 gtk-3.0/assets/grid-selection-unchecked.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-hover.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-checked.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg create mode 100644 gtk-3.0/assets/menuitem-checkbox-mixed.svg create mode 100644 gtk-3.0/assets/menuitem-radio-checked-hover.svg create mode 100644 gtk-3.0/assets/menuitem-radio-checked-insensitive.svg create mode 100644 gtk-3.0/assets/menuitem-radio-checked.svg create mode 100644 gtk-3.0/assets/pane-handle-vertical.svg create mode 100644 gtk-3.0/assets/pane-handle.svg create mode 100644 gtk-3.0/assets/radio-mixed-dark.svg create mode 100644 gtk-3.0/assets/radio-mixed-insensitive-dark.svg create mode 100644 gtk-3.0/assets/radio-mixed-insensitive.svg create mode 100644 gtk-3.0/assets/radio-mixed.svg create mode 100644 gtk-3.0/assets/radio-selected-dark.svg create mode 100644 gtk-3.0/assets/radio-selected-insensitive-dark.svg create mode 100644 gtk-3.0/assets/radio-selected-insensitive.svg create mode 100644 gtk-3.0/assets/radio-selected.svg create mode 100644 gtk-3.0/assets/radio-unselected-dark.svg create mode 100644 gtk-3.0/assets/radio-unselected-insensitive-dark.svg create mode 100644 gtk-3.0/assets/radio-unselected-insensitive.svg create mode 100644 gtk-3.0/assets/radio-unselected.svg diff --git a/gtk-3.0/assets/checkbox-checked-dark.svg b/gtk-3.0/assets/checkbox-checked-dark.svg new file mode 100644 index 0000000..2aaeaa6 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg new file mode 100644 index 0000000..c3219e2 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.svg b/gtk-3.0/assets/checkbox-checked-insensitive.svg new file mode 100644 index 0000000..4dbe967 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-checked.svg b/gtk-3.0/assets/checkbox-checked.svg new file mode 100644 index 0000000..0a5e5a5 --- /dev/null +++ b/gtk-3.0/assets/checkbox-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-dark.svg b/gtk-3.0/assets/checkbox-mixed-dark.svg new file mode 100644 index 0000000..5765056 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg new file mode 100644 index 0000000..27e0ef1 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/gtk-3.0/assets/checkbox-mixed-insensitive.svg new file mode 100644 index 0000000..d408465 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/checkbox-mixed.svg b/gtk-3.0/assets/checkbox-mixed.svg new file mode 100644 index 0000000..414f2f2 --- /dev/null +++ b/gtk-3.0/assets/checkbox-mixed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.svg b/gtk-3.0/assets/checkbox-unchecked-dark.svg new file mode 100644 index 0000000..36eeb4d --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg new file mode 100644 index 0000000..3488e66 --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg new file mode 100644 index 0000000..f90aa4c --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/checkbox-unchecked.svg b/gtk-3.0/assets/checkbox-unchecked.svg new file mode 100644 index 0000000..06176e3 --- /dev/null +++ b/gtk-3.0/assets/checkbox-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/grid-selection-checked-dark.svg b/gtk-3.0/assets/grid-selection-checked-dark.svg new file mode 100644 index 0000000..c1d5486 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-checked-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/grid-selection-checked.svg b/gtk-3.0/assets/grid-selection-checked.svg new file mode 100644 index 0000000..a660356 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-checked.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.svg b/gtk-3.0/assets/grid-selection-unchecked-dark.svg new file mode 100644 index 0000000..f925043 --- /dev/null +++ b/gtk-3.0/assets/grid-selection-unchecked-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/grid-selection-unchecked.svg b/gtk-3.0/assets/grid-selection-unchecked.svg new file mode 100644 index 0000000..689da2d --- /dev/null +++ b/gtk-3.0/assets/grid-selection-unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg new file mode 100644 index 0000000..8ab7153 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg new file mode 100644 index 0000000..f570a1c --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.svg b/gtk-3.0/assets/menuitem-checkbox-checked.svg new file mode 100644 index 0000000..6fbfb3e --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-checked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg new file mode 100644 index 0000000..d150f8f --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg new file mode 100644 index 0000000..fd8b0d4 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg new file mode 100644 index 0000000..d150f8f --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/gtk-3.0/assets/menuitem-checkbox-mixed.svg new file mode 100644 index 0000000..a82b2c0 --- /dev/null +++ b/gtk-3.0/assets/menuitem-checkbox-mixed.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/gtk-3.0/assets/menuitem-radio-checked-hover.svg new file mode 100644 index 0000000..afb9db2 --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked-hover.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg new file mode 100644 index 0000000..0bc947f --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/menuitem-radio-checked.svg b/gtk-3.0/assets/menuitem-radio-checked.svg new file mode 100644 index 0000000..61f0626 --- /dev/null +++ b/gtk-3.0/assets/menuitem-radio-checked.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/gtk-3.0/assets/pane-handle-vertical.svg b/gtk-3.0/assets/pane-handle-vertical.svg new file mode 100644 index 0000000..8a983c7 --- /dev/null +++ b/gtk-3.0/assets/pane-handle-vertical.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/pane-handle.svg b/gtk-3.0/assets/pane-handle.svg new file mode 100644 index 0000000..7bd3be0 --- /dev/null +++ b/gtk-3.0/assets/pane-handle.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-dark.svg b/gtk-3.0/assets/radio-mixed-dark.svg new file mode 100644 index 0000000..b6b0d76 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg new file mode 100644 index 0000000..6b93fc4 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed-insensitive.svg b/gtk-3.0/assets/radio-mixed-insensitive.svg new file mode 100644 index 0000000..9fa3659 --- /dev/null +++ b/gtk-3.0/assets/radio-mixed-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-mixed.svg b/gtk-3.0/assets/radio-mixed.svg new file mode 100644 index 0000000..a85a7ac --- /dev/null +++ b/gtk-3.0/assets/radio-mixed.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-selected-dark.svg b/gtk-3.0/assets/radio-selected-dark.svg new file mode 100644 index 0000000..28da8de --- /dev/null +++ b/gtk-3.0/assets/radio-selected-dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-selected-insensitive-dark.svg b/gtk-3.0/assets/radio-selected-insensitive-dark.svg new file mode 100644 index 0000000..f5cfbe0 --- /dev/null +++ b/gtk-3.0/assets/radio-selected-insensitive-dark.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-selected-insensitive.svg b/gtk-3.0/assets/radio-selected-insensitive.svg new file mode 100644 index 0000000..e782ba6 --- /dev/null +++ b/gtk-3.0/assets/radio-selected-insensitive.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gtk-3.0/assets/radio-selected.svg b/gtk-3.0/assets/radio-selected.svg new file mode 100644 index 0000000..91cafc1 --- /dev/null +++ b/gtk-3.0/assets/radio-selected.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/gtk-3.0/assets/radio-unselected-dark.svg b/gtk-3.0/assets/radio-unselected-dark.svg new file mode 100644 index 0000000..214ed94 --- /dev/null +++ b/gtk-3.0/assets/radio-unselected-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unselected-insensitive-dark.svg b/gtk-3.0/assets/radio-unselected-insensitive-dark.svg new file mode 100644 index 0000000..0fdfaf4 --- /dev/null +++ b/gtk-3.0/assets/radio-unselected-insensitive-dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unselected-insensitive.svg b/gtk-3.0/assets/radio-unselected-insensitive.svg new file mode 100644 index 0000000..a0f2168 --- /dev/null +++ b/gtk-3.0/assets/radio-unselected-insensitive.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/assets/radio-unselected.svg b/gtk-3.0/assets/radio-unselected.svg new file mode 100644 index 0000000..2f05a0d --- /dev/null +++ b/gtk-3.0/assets/radio-unselected.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css index 6f878e1..536c01e 100644 --- a/gtk-3.0/gtk-widgets-assets.css +++ b/gtk-3.0/gtk-widgets-assets.css @@ -1,339 +1,135 @@ /******************* * check and radio * *******************/ +/* draw regular check and radio items using our assets */ .check, +.check:focus, .check row:selected, .check row:selected:focus { - background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-unchecked.svg"); } .check:insensitive, .check row:selected:insensitive, .check row:selected:focus:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.svg"); } .check:active, +.check:checked, .check row:selected:active, .check row:selected:focus:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-checked.svg"); } .check:active:insensitive, .check row:selected:active:insensitive, .check row:selected:focus:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, shade(@theme_base_color, 0.6) 30%, shade(@theme_base_color, 0.6) 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, shade(@theme_base_color, 0.6) 37%, shade(@theme_base_color, 0.6) 62%, transparent 62%, transparent), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-checked-insensitive.svg"); } .check:inconsistent, .check row:selected:inconsistent, .check row:selected:focus:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 50% 12%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-mixed.svg"); } .check:inconsistent:insensitive, .check row:selected:inconsistent:insensitive, .check row:selected:focus:inconsistent:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.85), shade(@theme_base_color, 0.85)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 50% 12%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/checkbox-mixed-insensitive.svg"); } .radio, .radio row:selected, .radio row:selected:focus { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center; - background-size: 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-unselected.svg"); } .radio:insensitive, .radio row:selected:insensitive, .radio row:selected:focus:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center; - background-size: 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-unselected-insensitive.svg"); } .radio:active, +.radio:checked, .radio row:selected:active, .radio row:selected:focus:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 40% 40%, 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-selected.svg"); } .radio:active:insensitive, .radio row:selected:active:insensitive, .radio row:selected:focus:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 40% 40%, 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-selected-insensitive.svg"); } .radio:inconsistent, .radio row:selected:inconsistent, .radio row:selected:focus:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center; - background-size: 50% 12%, 90% 90%, 100% 100%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/radio-mixed.svg"); } .radio:inconsistent:insensitive, .radio row:selected:inconsistent:insensitive, .radio row:selected:focus:inconsistent:insensitive { - background-image: linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.85)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); + -gtk-icon-source: url("assets/radio-mixed-insensitive.svg"); +} - background-position: center center, center center, center center; - background-size: 50% 12%, 90% 90%, 100% 100%; - background-repeat: no-repeat; +.menuitem.check { + -gtk-icon-source: none; } .menuitem.check:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/menuitem-checkbox-checked.svg"); } .menuitem.check:active:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_fg_color 30%, @theme_selected_fg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_fg_color 37%, @theme_selected_fg_color 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/menuitem-checkbox-checked-hover.svg"); } .menuitem.check:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, mix(@menu_fg_color, @menu_bg_color, 0.5) 30%, mix(@menu_fg_color, @menu_bg_color, 0.5) 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, mix(@menu_fg_color, @menu_bg_color, 0.5) 37%, mix(@menu_fg_color, @menu_bg_color, 0.5) 62%, transparent 62%, transparent); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%; - background-repeat: no-repeat; -} - -.menuitem.radio:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.radio:active:hover { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_fg_color), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.radio:active:insensitive { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(mix(@menu_fg_color, @menu_bg_color, 0.5)), to(transparent)); - background-position: center center; - background-size: 40% 40%; - background-repeat: no-repeat; -} - -.menuitem.check:inconsistent, -.menuitem.radio:inconsistent { - background-image: linear-gradient(to bottom, @theme_selected_bg_color, @theme_selected_bg_color); - - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/menuitem-checkbox-checked-insensitive.svg"); } .menuitem.check:inconsistent:hover, .menuitem.radio:inconsistent:hover { - background-image: linear-gradient(to bottom, @theme_selected_fg_color, @theme_selected_fg_color); + -gtk-icon-source: url("assets/menuitem-checkbox-mixed-hover.svg"); +} - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; +.menuitem.check:inconsistent, +.menuitem.radio:inconsistent { + -gtk-icon-source: url("assets/menuitem-checkbox-mixed.svg"); } .menuitem.check:inconsistent:insensitive, .menuitem.radio:inconsistent:insensitive { - background-image: linear-gradient(to bottom, mix(@menu_fg_color, @menu_bg_color, 0.5), mix(@menu_fg_color, @menu_bg_color, 0.5)); + -gtk-icon-source: url("assets/menuitem-checkbox-mixed-insensitive.svg"); +} - background-position: center center; - background-size: 50% 12%; - background-repeat: no-repeat; +.menuitem.radio { + -gtk-icon-source: url("assets/menuitem-radio-checked.svg"); +} + +.menuitem.radio:active { + -gtk-icon-source: url("assets/menuitem-radio-checked.svg"); +} + +.menuitem.radio:active:hover { + -gtk-icon-source: url("assets/menuitem-radio-checked-hover.svg"); +} + +.menuitem.radio:active:insensitive { + -gtk-icon-source: url("assets/menuitem-radio-checked-insensitive.svg"); } GtkIconView.content-view.cell.check { - background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/grid-selection-unchecked.svg"); } GtkIconView.content-view.cell.check:active { - background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_selected_bg_color), to(transparent)), - linear-gradient(45deg, transparent, transparent 30%, @theme_selected_bg_color 30%, @theme_selected_bg_color 70%, transparent 70%, transparent), - linear-gradient(-45deg, transparent, transparent 37%, @theme_selected_bg_color 37%, @theme_selected_bg_color 62%, transparent 62%, transparent), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, @theme_base_color, @theme_base_color), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - linear-gradient(to bottom, shade(@theme_base_color, 0.6), shade(@theme_base_color, 0.6)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(@theme_base_color), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)), - -gtk-gradient(radial, center center, 0, center center, 0.5, to(shade(@theme_base_color, 0.6)), to(transparent)); - - background-position: 17% 50%, 41% 73%, 90% 26%, 24% 64%, 76% 48%, center center, center center, center center, center center, 6% 6%, 6% 94%, 94% 94%, 94% 6%, 0% 0%, 0% 100%, 100% 100%, 100% 0%; - background-size: 17% 17%, 20% 20%, 18% 18%, 30% 30%, 50% 50%, 80% 90%, 90% 80%, 80% 100%, 100% 80%, 10% 10%, 10% 10%, 10% 10%, 10% 10%, 20% 20%, 20% 20%, 20% 20%, 20% 20%; - background-repeat: no-repeat; + -gtk-icon-source: url("assets/grid-selection-checked.svg"); } /****************** From 9fb1bef63596e0cc3f253591dbb6a7d6e8e3f7df Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 17:42:44 +0530 Subject: [PATCH 10/15] Fix more stuff --- gtk-3.0/gtk-widgets.css | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 18f3dab..283a7d0 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -635,8 +635,8 @@ GtkExpander { * list boxes * **************/ .list { - background-color: shade(@theme_bg_color, 0.97); - color: @theme_fg_color; + background-image: none; + background-color: transparent; } .list-row { @@ -644,6 +644,7 @@ GtkExpander { border-radius: 0; padding: 3px; background-image: none; + background-color: transparent; } .list-row:hover { @@ -668,12 +669,7 @@ GtkExpander { /********* * frame * *********/ -.frame { - border-width: 1px; - border-style: solid; - border-color: shade(@theme_bg_color, 0.8); - border-radius: 0; -} +.frame { border: none; } /******************* * scrolled window * From 992b04845859eca739781c2567204055d0609eb4 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 17:52:54 +0530 Subject: [PATCH 11/15] Add styles for dark assets --- gtk-3.0/gtk-dark.css | 1 + gtk-3.0/gtk-widgets-assets-dark.css | 86 +++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 gtk-3.0/gtk-widgets-assets-dark.css diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index 22f93ef..709de5b 100644 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -76,6 +76,7 @@ @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css"); +@import url("gtk-widgets-assets-dark.css"); @import url("apps/gnome-applications.css"); @import url("apps/granite-widgets.css"); @import url("apps/unity.css"); diff --git a/gtk-3.0/gtk-widgets-assets-dark.css b/gtk-3.0/gtk-widgets-assets-dark.css new file mode 100644 index 0000000..c79103b --- /dev/null +++ b/gtk-3.0/gtk-widgets-assets-dark.css @@ -0,0 +1,86 @@ +/******************* +* check and radio * +*******************/ +/* draw regular check and radio items using our assets */ +.check, +.check:focus, +.check row:selected, +.check row:selected:focus { + -gtk-icon-source: url("assets/checkbox-unchecked-dark.svg"); +} + +.check:insensitive, +.check row:selected:insensitive, +.check row:selected:focus:insensitive { + -gtk-icon-source: url("assets/checkbox-unchecked-insensitive-dark.svg"); +} + +.check:active, +.check:checked, +.check row:selected:active, +.check row:selected:focus:active { + -gtk-icon-source: url("assets/checkbox-checked-dark.svg"); +} + +.check:active:insensitive, +.check row:selected:active:insensitive, +.check row:selected:focus:active:insensitive { + -gtk-icon-source: url("assets/checkbox-checked-insensitive-dark.svg"); +} + +.check:inconsistent, +.check row:selected:inconsistent, +.check row:selected:focus:inconsistent { + -gtk-icon-source: url("assets/checkbox-mixed-dark.svg"); +} + +.check:inconsistent:insensitive, +.check row:selected:inconsistent:insensitive, +.check row:selected:focus:inconsistent:insensitive { + -gtk-icon-source: url("assets/checkbox-mixed-insensitive-dark.svg"); +} + +.radio, +.radio row:selected, +.radio row:selected:focus { + -gtk-icon-source: url("assets/radio-unselected-dark.svg"); +} + +.radio:insensitive, +.radio row:selected:insensitive, +.radio row:selected:focus:insensitive { + -gtk-icon-source: url("assets/radio-unselected-insensitive-dark.svg"); +} + +.radio:active, +.radio:checked, +.radio row:selected:active, +.radio row:selected:focus:active { + -gtk-icon-source: url("assets/radio-selected-dark.svg"); +} + +.radio:active:insensitive, +.radio row:selected:active:insensitive, +.radio row:selected:focus:active:insensitive { + -gtk-icon-source: url("assets/radio-selected-insensitive-dark.svg"); +} + +.radio:inconsistent, +.radio row:selected:inconsistent, +.radio row:selected:focus:inconsistent { + -gtk-icon-source: url("assets/radio-mixed-dark.svg"); +} + +.radio:inconsistent:insensitive, +.radio row:selected:inconsistent:insensitive, +.radio row:selected:focus:inconsistent:insensitive { + -gtk-icon-source: url("assets/radio-mixed-insensitive-dark.svg"); +} + +GtkIconView.content-view.cell.check { + -gtk-icon-source: url("assets/grid-selection-unchecked-dark.svg"); +} + +GtkIconView.content-view.cell.check:active { + -gtk-icon-source: url("assets/grid-selection-checked-dark.svg"); +} From 699d91d08abeb1a88f226c1abc2ab2b45987cc08 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 17:55:46 +0530 Subject: [PATCH 12/15] Reset radio and check in dark theme --- gtk-3.0/gtk-widgets-assets-dark.css | 8 ++++++++ gtk-3.0/gtk-widgets-assets.css | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gtk-3.0/gtk-widgets-assets-dark.css b/gtk-3.0/gtk-widgets-assets-dark.css index c79103b..f50f176 100644 --- a/gtk-3.0/gtk-widgets-assets-dark.css +++ b/gtk-3.0/gtk-widgets-assets-dark.css @@ -77,6 +77,14 @@ -gtk-icon-source: url("assets/radio-mixed-insensitive-dark.svg"); } +.menuitem.check { + -gtk-icon-source: none; +} + +.menuitem.radio { + -gtk-icon-source: none; +} + GtkIconView.content-view.cell.check { -gtk-icon-source: url("assets/grid-selection-unchecked-dark.svg"); } diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css index 536c01e..d7413ea 100644 --- a/gtk-3.0/gtk-widgets-assets.css +++ b/gtk-3.0/gtk-widgets-assets.css @@ -109,7 +109,7 @@ } .menuitem.radio { - -gtk-icon-source: url("assets/menuitem-radio-checked.svg"); + -gtk-icon-source: none; } .menuitem.radio:active { From 88c2f921a8586a3279e1b60a7d9d5383ca05e06f Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 18:08:28 +0530 Subject: [PATCH 13/15] Added style for flat buttons --- gtk-3.0/gtk-widgets.css | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 283a7d0..a64d06d 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -299,6 +299,13 @@ GtkAssistant .sidebar { background-color: shade(@theme_selected_bg_color, 0.97); } +.button.flat, +.button.flat:insensitive { + border-color: transparent; + background-color: transparent; + background-image: none; +} + /**************** * cell and row * ****************/ @@ -2409,6 +2416,23 @@ GtkColorButton.button { color: @toolbar_fg_color; } +.primary-toolbar GtkComboBox.flat, +.primary-toolbar .button.flat, +.primary-toolbar GtkComboBox.flat, +.primary-toolbar .button.flat, +.toolbar GtkComboBox.flat, +.toolbar .button.flat, +.primary-toolbar GtkComboBox.flat:insensitive, +.primary-toolbar .button.flat:insensitive, +.primary-toolbar GtkComboBox.flat:insensitive, +.primary-toolbar .button.flat:insensitive, +.toolbar GtkComboBox.flat:insensitive, +.toolbar .button.flat:insensitive { + border-color: transparent; + background-color: transparent; + background-image: none; +} + .primary-toolbar .raised .button, .primary-toolbar .raised.button, .toolbar GtkComboBox, From 96dd174f9539b8f6581f57302c951996bb7b68bb Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 20:42:21 +0530 Subject: [PATCH 14/15] Don't use * for insensitive --- gtk-3.0/gtk-widgets.css | 245 ++++++++++++++-------------------------- 1 file changed, 84 insertions(+), 161 deletions(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index a64d06d..81c9d58 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -189,14 +189,14 @@ GtkGrid:insensitive { } /* disable inset shadow */ -.button:active *:insensitive, -.primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive, -.header-bar .button:active *:insensitive, -.button:checked *:insensitive, -.primary-toolbar .button:checked *:insensitive, -.toolbar .button:checked *:insensitive, -.header-bar .button:checked *:insensitive, +.button:active:insensitive, +.primary-toolbar .button:active:insensitive, +.toolbar .button:active:insensitive, +.header-bar .button:active:insensitive, +.button:checked:insensitive, +.primary-toolbar .button:checked:insensitive, +.toolbar .button:checked:insensitive, +.header-bar .button:checked:insensitive, .entry:insensitive { box-shadow: none; } @@ -268,8 +268,8 @@ GtkAssistant .sidebar { background-image: none; } -.button:active *:insensitive, -.button:checked *:insensitive { +.button:active:insensitive, +.button:checked:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -334,83 +334,6 @@ row:selected:focus { color: @theme_selected_fg_color; } -/******************* - * check and radio * - *******************/ -GtkCheckButton.text-button, -GtkRadioButton.text-button { - padding: 1px; - outline-offset: 0; -} - -.check { - color: shade(@theme_fg_color, 1.2); - background-image: none; - - -gtk-icon-source: -gtk-icontheme("checkbox-symbolic"); -} -.check:hover { - color: shade(@theme_fg_color, 1.1); -} - -.check:checked, -.check:active { - -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); - - color: @theme_fg_color; -} -.check:checked:hover, -.check:active:hover { - color: shade(@theme_fg_color, 1.1); -} - -.check:checked:insensitive, -.check:active:insensitive { - color: shade(@theme_fg_color, 1.1); -} - -.check:insensitive { - color: shade(@theme_fg_color, 1.8); -} - -.check:inconsistent { - -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); -} - -.radio { - color: shade(@theme_fg_color, 1.2); - background-image: none; - - -gtk-icon-source: -gtk-icontheme("radio-symbolic"); -} -.radio:hover { - color: shade(@theme_fg_color, 1.1); -} - -.radio:checked, -.radio:active { - -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); - - color: @theme_fg_color; -} - -.radio:checked:hover, -.radio:active:hover { - color: shade(@theme_fg_color, 1.1); -} -.radio:checked:insensitive, -.radio:active:insensitive { - color: shade(@theme_fg_color, 1.1); -} - -.radio:insensitive { - color: shade(@theme_fg_color, 1.8); -} - -.radio:inconsistent { - -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); -} - /***************** * column-header * *****************/ @@ -1061,8 +984,8 @@ GtkComboBox .menu { .menu.button:hover, .menu.button:active, .menu.button:checked, -.menu.button:active *:insensitive, -.menu.button:checked *:insensitive, +.menu.button:active:insensitive, +.menu.button:checked:insensitive, .menu.button:insensitive, .menu.button { border-width: 0; @@ -2339,8 +2262,8 @@ GtkColorButton.button { background-image: none; } -.header-bar .button:active *:insensitive, -.header-bar .button:checked *:insensitive { +.header-bar .button:active:insensitive, +.header-bar .button:checked:insensitive { border-color: shade(@titlebar_bg_color, 0.75); background-color: shade(@titlebar_bg_color, 0.80); background-image: none; @@ -2488,10 +2411,10 @@ GtkColorButton.button { background-image: none; } -.primary-toolbar .button:active *:insensitive, -.toolbar .button:active *:insensitive, -.primary-toolbar .button:checked *:insensitive, -.toolbar .button:checked *:insensitive { +.primary-toolbar .button:active:insensitive, +.toolbar .button:active:insensitive, +.primary-toolbar .button:checked:insensitive, +.toolbar .button:checked:insensitive { border-color: shade(@toolbar_bg_color, 0.75); background-color: shade(@toolbar_bg_color, 0.80); background-image: none; @@ -2573,10 +2496,10 @@ GtkColorButton.button { background-image: none; } -.inline-toolbar.toolbar .button:active *:insensitive -.inline-toolbar.toolbar GtkToolButton .button:active *:insensitive, -.inline-toolbar.toolbar .button:checked *:insensitive -.inline-toolbar.toolbar GtkToolButton .button:checked *:insensitive { +.inline-toolbar.toolbar .button:active:insensitive +.inline-toolbar.toolbar GtkToolButton .button:active:insensitive, +.inline-toolbar.toolbar .button:checked:insensitive +.inline-toolbar.toolbar GtkToolButton .button:checked:insensitive { border-color: shade(@theme_bg_color, 0.75); background-color: shade(@theme_bg_color, 0.80); background-image: none; @@ -2619,26 +2542,26 @@ GtkColorButton.button { .linked .button:only-child, .linked .button:insensitive:last-child, .linked .button:insensitive:only-child, -.linked .button:active *:insensitive:last-child, -.linked .button:active *:insensitive:only-child, -.linked .button:checked *:insensitive:last-child, -.linked .button:checked *:insensitive:only-child, +.linked .button:active:insensitive:last-child, +.linked .button:active:insensitive:only-child, +.linked .button:checked:insensitive:last-child, +.linked .button:checked:insensitive:only-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:insensitive:last-child, .inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar .button:active *:insensitive:last-child, -.inline-toolbar.toolbar .button:active *:insensitive:only-child, -.inline-toolbar.toolbar .button:checked *:insensitive:last-child, -.inline-toolbar.toolbar .button:checked *:insensitive:only-child, +.inline-toolbar.toolbar .button:active:insensitive:last-child, +.inline-toolbar.toolbar .button:active:insensitive:only-child, +.inline-toolbar.toolbar .button:checked:insensitive:last-child, +.inline-toolbar.toolbar .button:checked:insensitive:only-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button, .inline-toolbar.toolbar GtkToolButton:only-child > .button, .inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:active *:insensitive, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked *:insensitive, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked *:insensitive { +.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked:insensitive, +.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked:insensitive { box-shadow: none; } @@ -2778,26 +2701,26 @@ GtkColorButton.button { .linked.vertical .button:only-child, .linked.vertical .button:insensitive:last-child, .linked.vertical .button:insensitive:only-child, -.linked.vertical .button:active *:insensitive:last-child, -.linked.vertical .button:active *:insensitive:only-child, -.linked.vertical .button:checked *:insensitive:last-child, -.linked.vertical .button:checked *:insensitive:only-child, +.linked.vertical .button:active:insensitive:last-child, +.linked.vertical .button:active:insensitive:only-child, +.linked.vertical .button:checked:insensitive:last-child, +.linked.vertical .button:checked:insensitive:only-child, .inline-toolbar.toolbar.vertical .button:last-child, .inline-toolbar.toolbar.vertical .button:only-child, .inline-toolbar.toolbar.vertical .button:insensitive:last-child, .inline-toolbar.toolbar.vertical .button:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:active *:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:active *:insensitive:only-child, -.inline-toolbar.toolbar.vertical .button:checked *:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:checked *:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:checked:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:checked:insensitive:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active *:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active *:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked *:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked *:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked:insensitive { box-shadow: none; } @@ -2918,42 +2841,42 @@ GtkColorButton.button { .primary-toolbar .button.raised.linked:only-child, .primary-toolbar .button:insensitive.raised.linked:last-child, .primary-toolbar .button:insensitive.raised.linked:only-child, -.primary-toolbar .button:active *:insensitive.raised.linked:last-child, -.primary-toolbar .button:active *:insensitive.raised.linked:only-child, -.primary-toolbar .button:checked *:insensitive.raised.linked:last-child, -.primary-toolbar .button:checked *:insensitive.raised.linked:only-child, +.primary-toolbar .button:active:insensitive.raised.linked:last-child, +.primary-toolbar .button:active:insensitive.raised.linked:only-child, +.primary-toolbar .button:checked:insensitive.raised.linked:last-child, +.primary-toolbar .button:checked:insensitive.raised.linked:only-child, .primary-toolbar .raised.linked .button:last-child, .primary-toolbar .raised.linked .button:only-child, .primary-toolbar .raised.linked .button:insensitive:last-child, .primary-toolbar .raised.linked .button:insensitive:only-child, -.primary-toolbar .raised.linked .button:active *:insensitive:last-child, -.primary-toolbar .raised.linked .button:active *:insensitive:only-child, -.primary-toolbar .raised.linked .button:checked *:insensitive:last-child, -.primary-toolbar .raised.linked .button:checked *:insensitive:only-child, +.primary-toolbar .raised.linked .button:active:insensitive:last-child, +.primary-toolbar .raised.linked .button:active:insensitive:only-child, +.primary-toolbar .raised.linked .button:checked:insensitive:last-child, +.primary-toolbar .raised.linked .button:checked:insensitive:only-child, .toolbar .button.raised.linked:last-child, .toolbar .button.raised.linked:only-child, .toolbar .button:insensitive.raised.linked:last-child, .toolbar .button:insensitive.raised.linked:only-child, -.toolbar .button:active *:insensitive.raised.linked:last-child, -.toolbar .button:active *:insensitive.raised.linked:only-child, -.toolbar .button:checked *:insensitive.raised.linked:last-child, -.toolbar .button:checked *:insensitive.raised.linked:only-child, +.toolbar .button:active:insensitive.raised.linked:last-child, +.toolbar .button:active:insensitive.raised.linked:only-child, +.toolbar .button:checked:insensitive.raised.linked:last-child, +.toolbar .button:checked:insensitive.raised.linked:only-child, .toolbar .raised.linked .button:last-child, .toolbar .raised.linked .button:only-child, .toolbar .raised.linked .button:insensitive:last-child, .toolbar .raised.linked .button:insensitive:only-child, -.toolbar .raised.linked .button:active *:insensitive:last-child, -.toolbar .raised.linked .button:active *:insensitive:only-child, -.toolbar .raised.linked .button:checked *:insensitive:last-child, -.toolbar .raised.linked .button:checked *:insensitive:only-child, +.toolbar .raised.linked .button:active:insensitive:last-child, +.toolbar .raised.linked .button:active:insensitive:only-child, +.toolbar .raised.linked .button:checked:insensitive:last-child, +.toolbar .raised.linked .button:checked:insensitive:only-child, .toolbar .linked .button:last-child, .toolbar .linked .button:only-child, .toolbar .linked .button:insensitive:last-child, .toolbar .linked .button:insensitive:only-child, -.toolbar .linked .button:active *:insensitive:last-child, -.toolbar .linked .button:active *:insensitive:only-child -.toolbar .linked .button:checked *:insensitive:last-child, -.toolbar .linked .button:checked *:insensitive:only-child { +.toolbar .linked .button:active:insensitive:last-child, +.toolbar .linked .button:active:insensitive:only-child +.toolbar .linked .button:checked:insensitive:last-child, +.toolbar .linked .button:checked:insensitive:only-child { box-shadow: none; } @@ -3120,26 +3043,26 @@ GtkColorButton.button { .header-bar .button.raised.linked:only-child, .header-bar .button:insensitive.raised.linked:last-child, .header-bar .button:insensitive.raised.linked:only-child, -.header-bar .button:active *:insensitive.raised.linked:last-child, -.header-bar .button:active *:insensitive.raised.linked:only-child, -.header-bar .button:checked *:insensitive.raised.linked:last-child, -.header-bar .button:checked *:insensitive.raised.linked:only-child, +.header-bar .button:active:insensitive.raised.linked:last-child, +.header-bar .button:active:insensitive.raised.linked:only-child, +.header-bar .button:checked:insensitive.raised.linked:last-child, +.header-bar .button:checked:insensitive.raised.linked:only-child, .header-bar .raised.linked .button:last-child, .header-bar .raised.linked .button:only-child, .header-bar .raised.linked .button:insensitive:last-child, .header-bar .raised.linked .button:insensitive:only-child, -.header-bar .raised.linked .button:active *:insensitive:last-child, -.header-bar .raised.linked .button:active *:insensitive:only-child, -.header-bar .raised.linked .button:checked *:insensitive:last-child, -.header-bar .raised.linked .button:checked *:insensitive:only-child, +.header-bar .raised.linked .button:active:insensitive:last-child, +.header-bar .raised.linked .button:active:insensitive:only-child, +.header-bar .raised.linked .button:checked:insensitive:last-child, +.header-bar .raised.linked .button:checked:insensitive:only-child, .header-bar .linked .button:last-child, .header-bar .linked .button:only-child, .header-bar .linked .button:insensitive:last-child, .header-bar .linked .button:insensitive:only-child, -.header-bar .linked .button:active *:insensitive:last-child, -.header-bar .linked .button:active *:insensitive:only-child, -.header-bar .linked .button:checked *:insensitive:last-child, -.header-bar .linked .button:checked *:insensitive:only-child { +.header-bar .linked .button:active:insensitive:last-child, +.header-bar .linked .button:active:insensitive:only-child, +.header-bar .linked .button:checked:insensitive:last-child, +.header-bar .linked .button:checked:insensitive:only-child { box-shadow: none; } @@ -3468,10 +3391,10 @@ GtkOverlay.osd { background-image: none; } -.osd.button:active *:insensitive, -.osd .button:active *:insensitive, -.osd.button:checked *:insensitive, -.osd .button:checked *:insensitive { +.osd.button:active:insensitive, +.osd .button:active:insensitive, +.osd.button:checked:insensitive, +.osd .button:checked:insensitive { background-color: shade(@osd_bg, 0.80); background-image: none; } @@ -3533,8 +3456,8 @@ GtkOverlay.osd { background-image: none; } -.osd.toolbar .button:active *:insensitive, -.osd.toolbar .button:checked *:insensitive { +.osd.toolbar .button:active:insensitive, +.osd.toolbar .button:checked:insensitive { border-color: shade(@osd_bg, 0.75); background-color: shade(@osd_bg, 0.80); background-image: none; From 44fd27e84d581b3529cc2cbbe726ab34722b29c7 Mon Sep 17 00:00:00 2001 From: Satyajit Sahoo Date: Sat, 6 Dec 2014 22:21:20 +0530 Subject: [PATCH 15/15] Fix popover issues --- gtk-3.0/gtk-widgets.css | 42 +++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 81c9d58..ed35097 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -1174,6 +1174,34 @@ GtkPopover > .toolbar { background-color: transparent; } +GtkPopover .list-row { + color: @menu_fg_color; +} + +GtkPopover .list-row:hover { + background-image: none; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +GtkPopover .frame { + border: 1px solid mix(@menu_bg_color, @menu_fg_color, 0.12); + border-radius: 2px; +} + +GtkPopover .entry { + border-color: mix(@menu_bg_color, @menu_fg_color, 0.12); + background-color: @menu_bg_color; + background-image: none; + color: @menu_fg_color; +} + +GtkPopover .entry:hover, +GtkPopover .entry:focus, +GtkPopover .entry:active { + border-color: mix(@menu_bg_color, @menu_fg_color, 0.21); +} + GtkPopover.osd > .toolbar .button { border-radius: 0; border-width: 0; @@ -1201,8 +1229,7 @@ GtkPopover .separator { .menuitem.button:checked:insensitive { background-color: transparent; background-image: none; - border-color: transparent; - border-style: none; + border: none; box-shadow: none; color: @menu_fg_color; } @@ -1211,8 +1238,7 @@ GtkPopover .separator { .menuitem.button:checked:hover, .menuitem.button:hover, .menuitem.button:selected { - border-width: 0; - border-color: transparent; + border: none; background-color: @theme_selected_bg_color; background-image: none; color: @theme_selected_fg_color; @@ -1222,15 +1248,19 @@ GtkModelButton.button { color: @menu_fg_color; } + +GtkModelButton.button:focus, +GtkModelButton.button:active:focus, +GtkModelButton.button:checked:focus, GtkModelButton.button:active, GtkModelButton.button:checked, -GtkModelButton.button:insensitive, +GtkModelButton.button:insensitive:insensitive, GtkModelButton.button:active:insensitive, GtkModelButton.button:checked:insensitive, GtkModelButton.button { background-color: transparent; background-image: none; - border: transparent; + border-color: transparent; border-image: none; border-style: none; box-shadow: none;