Skip to content
Snippets Groups Projects
Commit 733b0359 authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'features-2603' into 'develop'

Features 2603

See merge request !79
parents 98b897fa 18bc1564
No related branches found
No related tags found
1 merge request!79Features 2603
Pipeline #1675 passed with stage
in 14 minutes and 52 seconds
......@@ -59,7 +59,6 @@ DapAbstractTopPanel
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
sidePaddingActive: 16 * pt
topIndentActive: 10 * pt
normalColorText: "#070023"
hilightColorText: "#FFFFFF"
normalColorTopText: "#FFFFFF"
......@@ -75,15 +74,12 @@ DapAbstractTopPanel
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
normalColor: "#FFFFFF"
hilightTopColor: normalColor
topIndentNormal: 12 * pt
bottomIndentNormal: 14 * pt
bottomIndentActive: bottomIndentNormal
paddingTopItemDelegate: 8 * pt
paddingBottomItemDelegate: paddingTopItemDelegate
heightListElement: 32 * pt
intervalListElement: 10 * pt
indicatorWidth: 24 * pt
indicatorHeight: indicatorWidth
indicatorLeftInterval: 8 * pt
colorTopNormalDropShadow: "#00000000"
colorDropShadow: "#40ABABAB"
fontComboBox.pixelSize: 14 * pt
......@@ -139,7 +135,6 @@ DapAbstractTopPanel
colorButtonTextHover: "#FFFFFF"
indentTextRight: 20 * pt
fontButton.pixelSize: 14 * pt
existenceImage: true
borderColorButton: "#000000"
borderWidthButton: 0
fontButton.family: "Roboto"
......
......@@ -80,7 +80,6 @@ DapAbstractRightPanel
anchors.bottomMargin: 24 * pt
checkable: true
textButton: qsTr("Done")
existenceImage: false
horizontalAligmentText: Text.AlignHCenter
indentTextRight: 0
fontSizeButton: 18 * pt
......
......@@ -171,7 +171,6 @@ DapAbstractRightPanel
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
sidePaddingActive: 0 * pt
topIndentActive: 10 * pt
normalColorText: "#070023"
hilightColorText: "#transparent"
normalColorTopText: "#070023"
......@@ -187,15 +186,12 @@ DapAbstractRightPanel
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
normalColor: "#FFFFFF"
hilightTopColor: normalColor
topIndentNormal: 12 * pt
bottomIndentNormal: 14 * pt
bottomIndentActive: bottomIndentNormal
paddingTopItemDelegate: 8 * pt
paddingBottomItemDelegate: paddingTopItemDelegate
heightListElement: 32 * pt
intervalListElement: 10 * pt
indicatorWidth: 20 * pt
indicatorHeight: indicatorWidth
indicatorLeftInterval: 8 * pt
colorTopNormalDropShadow: "#00000000"
colorDropShadow: "#40ABABAB"
fontComboBox.pixelSize: 16 * pt
......@@ -307,7 +303,6 @@ DapAbstractRightPanel
anchors.top: frameChooseRecoveryMethod.bottom
anchors.topMargin: 64 * pt
textButton: qsTr("Next")
existenceImage: false
colorBackgroundHover: "#D51F5D"
colorBackgroundNormal: "#070023"
colorButtonTextNormal: "#FFFFFF"
......
Subproject commit dd57503b135663dd66df1376a265a40f058d7e2c
Subproject commit 049c20a0daf0097184e2cc60a4c9811d620d87e5
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment