Merge pull request #202 from maxgrapps/core

Xdai network colors changed
This commit is contained in:
varasev 2019-06-14 18:36:17 +03:00 committed by GitHub
commit 8acf0348db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 51 additions and 133 deletions

4
package-lock.json generated
View File

@ -13757,9 +13757,7 @@
"from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2",
"requires": {
"debug": "^2.2.0",
"nan": "^2.3.3",
"typedarray-to-buffer": "^3.1.2",
"yaeti": "^0.0.6"
"nan": "^2.3.3"
}
}
}

View File

@ -1,3 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14">
<path fill="#333333" fill-rule="evenodd" d="M13.711 13.711a1.01 1.01 0 0 1-1.427 0l-1.97-1.97A6.444 6.444 0 0 1 6.5 13 6.5 6.5 0 1 1 13 6.5c0 1.43-.476 2.741-1.259 3.814l1.97 1.97a1.01 1.01 0 0 1 0 1.427zM6.5 2a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9z"/>
<path fill="#16D1A5" fill-rule="evenodd" d="M13.711 13.711a1.01 1.01 0 0 1-1.427 0l-1.97-1.97A6.444 6.444 0 0 1 6.5 13 6.5 6.5 0 1 1 13 6.5c0 1.43-.476 2.741-1.259 3.814l1.97 1.97a1.01 1.01 0 0 1 0 1.427zM6.5 2a4.5 4.5 0 1 0 0 9 4.5 4.5 0 0 0 0-9z"/>
</svg>

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 326 B

View File

@ -50,7 +50,7 @@
&#{ & }-dai {
&:before {
background-color: rgba($xdai-orange, 0.5);
background-color: rgba($xdai-green, 0.5);
}
}

View File

@ -63,7 +63,7 @@
}
&#{ & }-dai {
color: $xdai-orange;
color: $xdai-green;
}
&#{ & }-kovan {

View File

@ -37,11 +37,11 @@ $sw-ButtonAddBallot-height: 44px;
}
&#{ & }-dai {
background-color: $xdai-orange;
background-color: $xdai-green;
color: #fff;
&:hover {
background-color: lighten($xdai-orange, 5%);
background-color: lighten($xdai-green, 5%);
}
}

View File

@ -35,11 +35,11 @@
}
&#{ & }-dai {
background-color: $xdai-orange;
background-color: $xdai-green;
&:active,
&:hover {
background-color: darken($xdai-orange, 10%);
background-color: darken($xdai-green, 10%);
}
}

View File

@ -56,6 +56,6 @@
}
.sw-Footer-dai & {
color: #333;
color: #fff;
}
}

View File

@ -22,7 +22,7 @@
&#{ & }-dai {
a {
color: $xdai-orange;
color: $xdai-green;
}
}

View File

@ -66,9 +66,9 @@
.frm-KeysTypes_Radio:checked + &#{ & }-dai {
&,
&:hover {
background-color: $xdai-orange;
border-color: $xdai-orange;
box-shadow: 0 5px 10px 0 rgba($xdai-orange, 0.3);
background-color: $xdai-green;
border-color: $xdai-green;
box-shadow: 0 5px 10px 0 rgba($xdai-green, 0.3);
color: #fff;
}
}

View File

@ -3,3 +3,7 @@
justify-content: center;
width: 100%;
}
.sw-ButtonLoadMore-dai {
border-color: transparent !important;
}

View File

@ -20,7 +20,7 @@
}
&#{ & }-dai {
background-color: rgba($xdai-orange, 0.5);
background-color: rgba($xdai-green, 0.5);
}
&#{ & }-kovan {

View File

@ -4,11 +4,11 @@
justify-content: center;
.sw-Header & {
width: 167px;
width: 158px;
}
.sw-Footer & {
width: 120px;
width: 135px;
}
}

View File

@ -60,7 +60,7 @@
}
&#{ & }-dai {
color: #333;
color: #fff;
&:active,
&.active {
@ -77,7 +77,7 @@
&:active,
&.active {
background-color: darken($kovan-cyan-darker, 10%);
background-color: darken(#fff, 10%);
@media (min-width: $breakpoint-md) {
background-color: transparent;

View File

@ -44,10 +44,10 @@
}
&#{ & }-dai#{ & }-active {
color: $xdai-orange;
color: $xdai-green;
&::before {
background-color: $xdai-orange;
background-color: $xdai-green;
}
}

View File

@ -57,8 +57,6 @@
padding-left: 30px;
width: 100%;
&#{ & }-core {
@include input-color(rgba(255, 255, 255, 0.5), #fff);
background-image: url('#{ $base-images-path }/SearchBar/core.svg');
@ -68,7 +66,7 @@
background-image: url('#{ $base-images-path }/SearchBar/sokol.svg');
}
&#{ & }-dai {
@include input-color(rgba(51, 51, 51, 0.5), #333);
@include input-color(rgba(255, 255, 255, 0.5), #fff);
background-image: url('#{ $base-images-path }/SearchBar/dai.svg');
}
&#{ & }-kovan {

View File

@ -14,11 +14,11 @@ $sokol-freeze-color: #50bbda;
$sokol-danger-color: #f24c67;
$sokol-menu-icon-color: #fff;
$xdai-orange: #fec042;
$xdai-gray-darker: #eaeef0;
$xdai-gray: #f2f6f8;
$xdai-green: #15bba6;
$xdai-gray-darker: #132942;
$xdai-gray: #173250;
$xdai-gray-dark: #333;
$xdai-menu-icon-color: #333;
$xdai-menu-icon-color: $xdai-green;
$kovan-cyan: #28aca4;
$kovan-cyan-darker: #1f857f;
@ -88,7 +88,7 @@ $voting-positive-sokol: #6ac9b9;
$voting-negative-dai: #f21b57;
$voting-neutral-dai: #50bbda;
$voting-positive-dai: #60db97;
$voting-positive-dai: $xdai-green;
$voting-negative-kovan: #f24c67;
$voting-neutral-kovan: #50bbda;

File diff suppressed because one or more lines are too long

View File

@ -1,24 +1,24 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 45 52">
<svg xmlns="http://www.w3.org/2000/svg" width="173" height="195">
<defs>
<filter id="a" width="44" height="52" x="0" y="0" filterUnits="userSpaceOnUse">
<feOffset dy="3" in="SourceAlpha"/>
<feGaussianBlur result="blurOut" stdDeviation="2.449"/>
<feFlood flood-color="#D2D5D7" result="floodOut"/>
<filter id="a" width="173" height="195" x="0" y="0" filterUnits="userSpaceOnUse">
<feOffset dy="13" in="SourceAlpha"/>
<feGaussianBlur result="blurOut" stdDeviation="5.196"/>
<feFlood flood-color="#1DB79B" result="floodOut"/>
<feComposite in="floodOut" in2="blurOut" operator="atop"/>
<feComponentTransfer>
<feFuncA slope=".5" type="linear"/>
<feFuncA slope=".27" type="linear"/>
</feComponentTransfer>
<feMerge>
<feMergeNode/>
<feMergeNode in="SourceGraphic"/>
</feMerge>
</filter>
<linearGradient id="b" x1="0%" x2="0%" y1="100%" y2="0%">
<stop offset="0%" stop-color="#FFAD45"/>
<stop offset="100%" stop-color="#FFD342"/>
<linearGradient id="b" x1="0%" x2="0%" y1="0%" y2="100%">
<stop offset="0%" stop-color="#13D8A7"/>
<stop offset="100%" stop-color="#23A695"/>
</linearGradient>
</defs>
<path fill="#FFF" fill-rule="evenodd" d="M17.771 40.253c-3.368-2.101-9.884-6.163-10.841-6.762C5 32.154 5 30.021 5 30.021l.001-16.044S5 11.656 6.947 10.492l10.824-6.751c3.729-2.324 3.729-2.324 7.464.004l10.808 6.741c1.957 1.23 1.956 3.487 1.956 3.487v16.049s.001 2.235-1.956 3.485L25.232 40.25c-3.732 2.33-3.732 2.33-7.461.003z" filter="url(#a)"/>
<path fill="#FFF" fill-rule="evenodd" d="M30.055 13.884l-6.233 8.128 6.229 8.122h-4.644L21.5 25.039l-3.907 5.095h-4.644l6.229-8.122-6.233-8.128h4.644l3.911 5.1 3.911-5.1h4.644z"/>
<path fill="url(#b)" d="M30.055 13.884l-6.233 8.128 6.229 8.122h-4.644L21.5 25.039l-3.907 5.095h-4.644l6.229-8.122-6.233-8.128h4.644l3.911 5.1 3.911-5.1h4.644z"/>
<path fill="#FFF" fill-rule="evenodd" d="M72.437 148.388c-12.25-7.936-35.947-23.284-39.429-25.547-7.019-5.051-7.019-13.108-7.019-13.108l.002-51.478s-.002-8.769 7.079-13.168L72.436 19.58C86 10.799 86 10.799 99.586 19.597l39.308 25.47c7.117 4.644 7.111 13.173 7.111 13.173v51.496s.006 8.442-7.11 13.166L99.573 148.38c-13.573 8.8-13.573 8.8-27.136.008z" filter="url(#a)"/>
<path fill="#FFF" fill-rule="evenodd" d="M114.196 58.962L94.4 84.006l19.782 25.026H99.433L87.026 93.335l-12.408 15.697H59.869l19.782-25.026-19.796-25.044h14.749l12.422 15.714 12.421-15.714h14.749z"/>
<path fill="url(#b)" d="M114.196 58.962L94.4 84.006l19.782 25.026H99.433L87.026 93.335l-12.408 15.697H59.869l19.782-25.026-19.796-25.044h14.749l12.422 15.714 12.421-15.714h14.749z"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB