Skip to content
This repository was archived by the owner on Nov 12, 2019. It is now read-only.

Commit 038635d

Browse files
committed
fix a bug of theme color
1 parent 5bd6a0e commit 038635d

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

js/assets/model.png

-36 Bytes
Loading

js/constants/colors.js

+4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ export default {
77
orangeRed: '#ff4500',
88
orange: '#ff8500',
99
yellow: '#ffd500',
10+
yellowGreen: '#9acd32',
1011
lightGreen: '#70dc70',
1112
limeGreen: '#32cd32',
1213
seaGreen: '#20b2aa',
14+
skyBlue: '#87ceeb',
1315
lightBlue: '#1ec8ff',
1416
dodgerBlue: '#1e90ff',
17+
thistle: '#d8bfd8',
1518
purple: '#7e83e3',
19+
slateBlue: '#6a5acd',
1620
black: '#000'
1721
}

js/containers/MoreTab/ThemeColorPage.js

+9-6
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,16 @@ class ThemeColorPage extends BackPageComponent{
3737
{this._renderColorItem(colors.orangeRed)}
3838
{this._renderColorItem(colors.orange)}
3939
{this._renderColorItem(colors.yellow)}
40+
{this._renderColorItem(colors.yellowGreen)}
4041
{this._renderColorItem(colors.lightGreen)}
4142
{this._renderColorItem(colors.limeGreen)}
4243
{this._renderColorItem(colors.seaGreen)}
44+
{this._renderColorItem(colors.skyBlue)}
4345
{this._renderColorItem(colors.lightBlue)}
4446
{this._renderColorItem(colors.dodgerBlue)}
47+
{this._renderColorItem(colors.thistle)}
4548
{this._renderColorItem(colors.purple)}
49+
{this._renderColorItem(colors.slateBlue)}
4650
{this._renderColorItem(colors.black)}
4751
</ScrollView>
4852
</View>
@@ -92,20 +96,19 @@ const styles = StyleSheet.create({
9296
},
9397
img:{
9498
width: px2dp(250),
95-
height: px2dp(412),
99+
height: px2dp(411),
96100
position: 'absolute',
97101
top: (theme.screenHeight-px2dp(420))/2,
98102
left: (theme.screenWidth-px2dp(250))/2,
103+
borderWidth: theme.segment.width,
104+
borderColor: theme.segment.color
99105
},
100106
colorPanel: {
101107
width: px2dp(250),
102-
height: px2dp(390),
108+
height: px2dp(411),
103109
position: 'absolute',
104110
top: (theme.screenHeight-px2dp(420))/2,
105-
left: (theme.screenWidth-px2dp(250))/2,
106-
borderWidth: theme.segment.width,
107-
borderColor: theme.segment.color,
108-
//elevation: 5,
111+
left: (theme.screenWidth-px2dp(250))/2
109112
},
110113
colorBlock: {
111114
borderRadius: 5,

0 commit comments

Comments
 (0)