diff --git a/src/app/commoncomponents/PushButton.qml b/src/app/commoncomponents/PushButton.qml
index 19f359b968da6975b5f996c1d04b6470891917d8..944fc9432d4bbcfcadf4540198194c58d03c0b1b 100644
--- a/src/app/commoncomponents/PushButton.qml
+++ b/src/app/commoncomponents/PushButton.qml
@@ -37,7 +37,7 @@ AbstractButton {
property int preferredLeftMargin: 16
property int preferredRightMargin: 16
// Note the radius will default to preferredSize
- property bool circled: true
+ property bool circled: false//true
property alias radius: background.radius
property alias border: background.border
diff --git a/src/app/commoncomponents/SBSMessageBase.qml b/src/app/commoncomponents/SBSMessageBase.qml
index 407026c6079d0dbb9ae9c619e19352c4b9beb67f..a6b5ce0784b8ab0e8aae941f24202e7230c0582a 100644
--- a/src/app/commoncomponents/SBSMessageBase.qml
+++ b/src/app/commoncomponents/SBSMessageBase.qml
@@ -278,7 +278,7 @@ Control {
anchors.leftMargin: !isOutgoing ? 10 : 0
imageColor: JamiTheme.emojiReactPushButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.primaryBackgroundColor
toolTipText: JamiStrings.moreOptions
anchors.verticalCenter: parent.verticalCenter
anchors.right: isOutgoing ? optionButtonItem.right : undefined
@@ -308,12 +308,13 @@ Control {
id: reply
imageColor: JamiTheme.emojiReactPushButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.primaryBackgroundColor
toolTipText: JamiStrings.reply
source: JamiResources.reply_svg
width: optionButtonItem.width / 2
height: optionButtonItem.height
anchors.verticalCenter: parent.verticalCenter
+ anchors.rightMargin: 5
anchors.right: isOutgoing ? more.left : undefined
anchors.left: !isOutgoing ? more.right : undefined
visible: CurrentAccount.type !== Profile.Type.SIP && Body !== "" && (bubbleArea.bubbleHovered || hovered || more.hovered || bgHandler.hovered)
diff --git a/src/app/commoncomponents/SharePopup.qml b/src/app/commoncomponents/SharePopup.qml
index 4c48bcc1d80f4a7fa7337a40c964d83423c01c0b..583f409a4417a5996a6e853908701b71a3b5cdfa 100644
--- a/src/app/commoncomponents/SharePopup.qml
+++ b/src/app/commoncomponents/SharePopup.qml
@@ -79,8 +79,8 @@ Popup {
contentItem: RowLayout {
Rectangle {
id: image
- width: 26
- height: 26
+ width: 20
+ height: 20
radius: 5
color: JamiTheme.transparentColor
ResponsiveImage {
@@ -92,7 +92,8 @@ Popup {
Text {
Layout.alignment: Qt.AlignLeft
text: control.text
- color: control.hovered ? JamiTheme.chatViewFooterImgHoverColor : "#7f7f7f"
+ color: JamiTheme.chatViewFooterImgHoverColor
+ font.pixelSize: JamiTheme.chatViewFooterFontSize
}
}
background: Rectangle {
@@ -108,6 +109,20 @@ Popup {
}
}
+ DropShadow {
+ z: -1
+
+ width: rect.width
+ height: rect.height
+ horizontalOffset: 3.0
+ verticalOffset: 3.0
+ radius: rect.radius * 4
+ color: JamiTheme.shadowColor
+ source: rect
+ transparentBorder: true
+ samples: radius + 1
+ }
+
background: Rectangle {
anchors.fill: parent
color: JamiTheme.transparentColor
diff --git a/src/app/mainview/components/ChatViewHeader.qml b/src/app/mainview/components/ChatViewHeader.qml
index 648aab36da1befb2b0cd78bbb2241586a3b9cb1f..52bdcca986ddf9cd77ab11722a6ff564e23f4584 100644
--- a/src/app/mainview/components/ChatViewHeader.qml
+++ b/src/app/mainview/components/ChatViewHeader.qml
@@ -86,8 +86,7 @@ Rectangle {
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
Layout.leftMargin: 8
- preferredSize: 24
-
+ //preferredSize: 24
mirror: UtilsAdapter.isRTL
source: JamiResources.back_24dp_svg
@@ -155,12 +154,12 @@ Rectangle {
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
Layout.preferredHeight: 30
- Layout.preferredWidth: 40 + (isOpen? JamiTheme.searchbarSize : 0)
+ Layout.preferredWidth: 40 + (isOpen ? JamiTheme.searchbarSize : 0)
colorSearchBar: JamiTheme.backgroundColor
hoverButtonRadius: JamiTheme.chatViewHeaderButtonRadius
- Behavior on Layout.preferredWidth {
+ Behavior on Layout.preferredWidth {
NumberAnimation {
duration: 150
}
@@ -168,7 +167,7 @@ Rectangle {
visible: root.swarmDetailsVisibility
- onSearchBarTextChanged: function(text){
+ onSearchBarTextChanged: function (text) {
MessagesAdapter.searchbarPrompt = text;
}
diff --git a/src/app/mainview/components/MessageBar.qml b/src/app/mainview/components/MessageBar.qml
index 6e4cb180f772a87610883cdd1c9436fd206db40c..a54e24525f29cd916c5281364d19a4d5ac57aaaa 100644
--- a/src/app/mainview/components/MessageBar.qml
+++ b/src/app/mainview/components/MessageBar.qml
@@ -110,7 +110,7 @@ RowLayout {
popup: SharePopup {
id: sharePopup
- y: -180
+ y: -160
x: -20
menuMoreButton: listViewMoreButton.menuMoreButton
@@ -1160,7 +1160,7 @@ RowLayout {
imageContainerHeight: 25
radius: 5
source: JamiResources.preview_black_24dp_svg
- normalColor: showPreview ? hoveredColor : JamiTheme.transparentColor
+ normalColor: showPreview ? hoveredColor : JamiTheme.primaryBackgroundColor
imageColor: (hovered || showPreview) ? JamiTheme.chatViewFooterImgHoverColor : JamiTheme.chatViewFooterImgColor
hoveredColor: JamiTheme.hoveredButtonColor
pressedColor: hoveredColor
diff --git a/src/app/mainview/components/Searchbar.qml b/src/app/mainview/components/Searchbar.qml
index 90a59d1fc737623255d1baf0a3f2680a251798e1..c2f2fff637f436e58af454a2d02098ce4fc911e4 100644
--- a/src/app/mainview/components/Searchbar.qml
+++ b/src/app/mainview/components/Searchbar.qml
@@ -76,7 +76,7 @@ Rectangle {
hoveredColor: JamiTheme.hoveredButtonColor
source: JamiResources.ic_baseline_search_24dp_svg
toolTipText: JamiStrings.search
- normalColor: "transparent"
+ normalColor: JamiTheme.primaryBackgroundColor
imageColor: {
if (reductionEnabled) {
if (hovered) {
diff --git a/src/app/webengine/map/MapPositionOverlay.qml b/src/app/webengine/map/MapPositionOverlay.qml
index ec2302b6c59e0de96a7d5e1aa56b193e9d5310fe..713377772306c8316afee20bddf529ab4cab93e2 100644
--- a/src/app/webengine/map/MapPositionOverlay.qml
+++ b/src/app/webengine/map/MapPositionOverlay.qml
@@ -42,7 +42,7 @@ Rectangle {
toolTipText: !isUnpin ? JamiStrings.unpin : JamiStrings.pinWindow
imageColor: JamiTheme.mapButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.mapButtonsOverlayColor
source: JamiResources.unpin_svg
onClicked: {
if (!isUnpin) {
@@ -58,7 +58,7 @@ Rectangle {
toolTipText: JamiStrings.centerMapTooltip
imageColor: JamiTheme.mapButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.mapButtonsOverlayColor
source: JamiResources.share_location_svg
onClicked: {
webView.runJavaScript("zoomTolayersExtent()");
@@ -70,7 +70,7 @@ Rectangle {
toolTipText: JamiStrings.dragMapTooltip
imageColor: JamiTheme.mapButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.mapButtonsOverlayColor
source: JamiResources.move_svg
visible: !isUnpin
@@ -90,7 +90,7 @@ Rectangle {
visible: !isUnpin
toolTipText: mapObject.isFullScreen ? JamiStrings.reduceMapTooltip : JamiStrings.maximizeMapTooltip
imageColor: JamiTheme.mapButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.mapButtonsOverlayColor
source: mapObject.isFullScreen ? JamiResources.close_fullscreen_24dp_svg : JamiResources.open_in_full_24dp_svg
onClicked: {
if (!mapObject.isFullScreen) {
@@ -106,7 +106,7 @@ Rectangle {
toolTipText: JamiStrings.closeMapTooltip
imageColor: JamiTheme.mapButtonColor
- normalColor: JamiTheme.transparentColor
+ normalColor: JamiTheme.mapButtonsOverlayColor
source: JamiResources.round_close_24dp_svg
visible: !isUnpin