diff --git a/view/molistar/modules/dailyConsumption/css/index.css b/view/molistar/modules/dailyConsumption/css/index.css index 7baf9f7..1d92287 100644 --- a/view/molistar/modules/dailyConsumption/css/index.css +++ b/view/molistar/modules/dailyConsumption/css/index.css @@ -266,12 +266,23 @@ body { background-size: 100% 100%; } +.tab .tabbox { + background: url(../images/tab2.png) no-repeat; + background-size: 100% 100%; +} + .tab .act { color: #290C05; background: url(../images/act.png) no-repeat; background-size: 100% 100%; } +.tab .act2 { + color: #290C05; + background: url(../images/tabact2.png) no-repeat; + background-size: 100% 100%; +} + .content1 { width: 10rem; height: auto; @@ -403,6 +414,7 @@ body { border-radius: 50%; left: 0; top: 0; + border: 0.04rem #FFED70 solid; } .content1 .contentBox1 .priorityWinnersBox div span, @@ -420,6 +432,7 @@ body { position: absolute; left: 0; bottom: -0.6rem; + height: 0.4rem; } .content1 .contentBox2 .box { @@ -731,6 +744,11 @@ body { margin-bottom: 0.45333rem; } +.arabic .header { + background: url(../images/header-ar.png) no-repeat; + background-size: 100% 100%; +} + .arabic .myBox .tetxBox { direction: ltr; } diff --git a/view/molistar/modules/dailyConsumption/css/index.scss b/view/molistar/modules/dailyConsumption/css/index.scss index b9a0c5e..5d5beae 100644 --- a/view/molistar/modules/dailyConsumption/css/index.scss +++ b/view/molistar/modules/dailyConsumption/css/index.scss @@ -269,11 +269,22 @@ body { background-size: 100% 100%; } + .tabbox { + background: url(../images/tab2.png) no-repeat; + background-size: 100% 100%; + } + .act { color: #290C05; background: url(../images/act.png) no-repeat; background-size: 100% 100%; } + + .act2 { + color: #290C05; + background: url(../images/tabact2.png) no-repeat; + background-size: 100% 100%; + } } .content1 { @@ -382,6 +393,7 @@ body { border-radius: 50%; left: 0; top: 0; + border: px2rem(3) #FFED70 solid; } span { @@ -397,6 +409,7 @@ body { position: absolute; left: 0; bottom: -0.6rem; + height: 0.4rem; } } } @@ -689,6 +702,11 @@ body { } .arabic { + .header { + background: url(../images/header-ar.png) no-repeat; + background-size: 100% 100%; + } + .myBox .tetxBox { direction: ltr; } diff --git a/view/molistar/modules/dailyConsumption/images/header-ar.png b/view/molistar/modules/dailyConsumption/images/header-ar.png new file mode 100644 index 0000000..0370f61 Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/header-ar.png differ diff --git a/view/molistar/modules/dailyConsumption/images/null.png b/view/molistar/modules/dailyConsumption/images/null.png new file mode 100644 index 0000000..71d79c2 Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/null.png differ diff --git a/view/molistar/modules/dailyConsumption/images/tab2.png b/view/molistar/modules/dailyConsumption/images/tab2.png new file mode 100644 index 0000000..85813d5 Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/tab2.png differ diff --git a/view/molistar/modules/dailyConsumption/images/tabact2.png b/view/molistar/modules/dailyConsumption/images/tabact2.png new file mode 100644 index 0000000..55e7ac7 Binary files /dev/null and b/view/molistar/modules/dailyConsumption/images/tabact2.png differ diff --git a/view/molistar/modules/dailyConsumption/index.html b/view/molistar/modules/dailyConsumption/index.html index d3716fc..f9ec803 100644 --- a/view/molistar/modules/dailyConsumption/index.html +++ b/view/molistar/modules/dailyConsumption/index.html @@ -57,12 +57,12 @@
-
+
-
+
@@ -77,7 +77,7 @@
-
+
@@ -100,7 +100,7 @@
-->
-
+
@@ -118,7 +118,7 @@
-
+
@@ -135,7 +135,7 @@
-
+
@@ -160,7 +160,7 @@
-->
-
+
@@ -178,19 +178,19 @@
-
-
-