Commit 66428bdd authored by Matthias Clasen's avatar Matthias Clasen

Adwaita: Work towards working touch selection popups

This fixes some of the confusion around toolbars inside .osd.
The look is not perfect, but less broken than before.
parent d4e8a501
......@@ -666,7 +666,7 @@ GtkComboBox {
.toolbar { //FIXME: why is all this being ignored?
padding: 6px;
background-color: $bg_color;
&.osd {
.osd & {
background-color: $osd_bg_color;
border-radius: 6px;
padding: 12px;
......@@ -1019,7 +1019,9 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
}
& > .list,
& > .view,
& > .toolbar {
& > .toolbar
&.osd > .toolbar {
border-style: none;
background-color: transparent;
}
.separator {
......@@ -1036,7 +1038,7 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
text-shadow: none;
transition: none;
}
&.osd { // Also used for touch cutnpaste overlays
&.osd { // Also used for touch cut'n'paste overlays
// FIXME Doesn't work
background-image: none;
background-color: $osd_bg_color;
......
......@@ -811,7 +811,7 @@ GtkComboBox {
.toolbar, .inline-toolbar, .search-bar {
padding: 6px;
background-color: #393f3f; }
.toolbar.osd, .osd.inline-toolbar, .osd.search-bar {
.osd .toolbar, .osd .inline-toolbar, .osd .search-bar {
background-color: rgba(0, 0, 0, 0.6);
border-radius: 6px;
padding: 12px; }
......@@ -1155,7 +1155,17 @@ GtkTreeView.view.progressbar {
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
.popover:backdrop {
box-shadow: none; }
.popover > .list, .popover > .view, .popover > .toolbar, .popover > .inline-toolbar, .popover > .search-bar {
.popover > .list, .popover > .view, .popover > .toolbar
.popover.osd > .toolbar, .popover > .inline-toolbar
.popover.osd > .toolbar, .popover > .search-bar
.popover.osd > .toolbar, .popover > .toolbar
.popover.osd > .inline-toolbar, .popover > .inline-toolbar
.popover.osd > .inline-toolbar, .popover > .search-bar
.popover.osd > .inline-toolbar, .popover > .toolbar
.popover.osd > .search-bar, .popover > .inline-toolbar
.popover.osd > .search-bar, .popover > .search-bar
.popover.osd > .search-bar {
border-style: none;
background-color: transparent; }
.popover .separator {
font-size: 80%;
......
......@@ -803,7 +803,7 @@ GtkComboBox {
.toolbar, .inline-toolbar, .search-bar {
padding: 6px;
background-color: #ededed; }
.toolbar.osd, .osd.inline-toolbar, .osd.search-bar {
.osd .toolbar, .osd .inline-toolbar, .osd .search-bar {
background-color: rgba(0, 0, 0, 0.6);
border-radius: 6px;
padding: 12px; }
......@@ -1148,7 +1148,17 @@ GtkTreeView.view.progressbar {
box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
.popover:backdrop {
box-shadow: none; }
.popover > .list, .popover > .view, .popover > .toolbar, .popover > .inline-toolbar, .popover > .search-bar {
.popover > .list, .popover > .view, .popover > .toolbar
.popover.osd > .toolbar, .popover > .inline-toolbar
.popover.osd > .toolbar, .popover > .search-bar
.popover.osd > .toolbar, .popover > .toolbar
.popover.osd > .inline-toolbar, .popover > .inline-toolbar
.popover.osd > .inline-toolbar, .popover > .search-bar
.popover.osd > .inline-toolbar, .popover > .toolbar
.popover.osd > .search-bar, .popover > .inline-toolbar
.popover.osd > .search-bar, .popover > .search-bar
.popover.osd > .search-bar {
border-style: none;
background-color: transparent; }
.popover .separator {
font-size: 80%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment