@@ -25,7 +25,7 @@ import "../Components/"
2525
2626Rectangle {
2727 id: root
28− color: "#E0292929"
28+ color: Qt.rgba(17/255, 17/255, 17/255, 0.95) // #111111, 95%
2929
3030 rotation: inverted ? 180 : 0
3131
@@ -633,9 +633,10 @@ Rectangle {
633633 id: quickListShape
634634 objectName: "quickListShape"
635635 anchors.fill: quickList
636− opacity: quickList.state === "open" ? 0.8 : 0
636+ opacity: quickList.state === "open" ? 0.95 : 0 // FIXME: should this have some transparency at all?
637637 visible: opacity > 0
638638 rotation: root.rotation
639+ aspect: UbuntuShape.Flat
639640
640641 Behavior on opacity {
641642 UbuntuNumberAnimation {}
@@ -696,7 +697,7 @@ Rectangle {
696697 Rectangle {
697698 id: quickList
698699 objectName: "quickList"
699− color: "#f5f5f5"
700+ color: UbuntuColors.jet
700701 // Because we're setting left/right anchors depending on orientation, it will break the
701702 // width setting after rotating twice. This makes sure we also re-apply width on rotation
702703 width: root.inverted ? units.gu(30) : units.gu(30)
@@ -767,14 +768,10 @@ Rectangle {
767768 quickList.state = "open";
768769 }
769770
770− StyledItem {
771+ Item {
771772 width: parent.width
772773 height: quickListColumn.height
773774
774− theme: ThemeSettings {
775− name: "Ubuntu.Components.Themes.Ambiance"
776− }
777−
778775 Column {
779776 id: quickListColumn
780777 width: parent.width
@@ -784,11 +781,23 @@ Rectangle {
784781 id: popoverRepeater
785782 model: quickList.model
786783
787− ListItems.Standard {
784+ ListItem {
788785 objectName: "quickListEntry" + index
789− text: (model.clickable ? "" : "<b>") + model.label + (model.clickable ? "" : "</b>")
790− highlightWhenPressed: model.clickable
791786 selected: index === quickList.selectedIndex
787+ divider.colorFrom: UbuntuColors.slate
788+ divider.colorTo: UbuntuColors.slate
789+ highlightColor: !model.clickable ? quickList.color : undefined
790+
791+ Label {
792+ anchors.fill: parent
793+ anchors.leftMargin: units.gu(4) // 2 GU for an optional checkmark
794+ anchors.rightMargin: units.gu(1)
795+ verticalAlignment: Label.AlignVCenter
796+ text: model.label
797+ color: model.clickable ? "white" /*theme.palette.normal.backgroundText*/ : theme.palette.normal.backgroundSecondaryText
798+ //fontSize: model.clickable && index == 0 ? "medium" : "small" // FIXME too small
799+ font.weight: index == 0 ? Font.Medium : Font.Light
800+ }
792801
793802 onClicked: {
794803 if (!model.clickable) {