Skip to content

Commit 5f26a26

Browse files
author
Rafael Grigorian
committed
Fixed GH-85
1 parent 4bb258f commit 5f26a26

File tree

10 files changed

+57
-99
lines changed

10 files changed

+57
-99
lines changed

package.xml

Lines changed: 30 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
3-
<date>2018-07-13</date>
4-
<time>16:27:34</time>
3+
<date>2018-07-17</date>
4+
<time>11:53:23</time>
55
<version>1.0.1</version>
66
<contents>
77
<target name="magecommunity">
@@ -16,12 +16,22 @@
1616
<dir name="Helper">
1717
<dir name="Data.php" hash="963b2f83ad8e16f3e9e109ac8c78e30a"/>
1818
</dir>
19+
<dir name="etc">
20+
<dir name="adminhtml.xml" hash="40fddb62fcacb851210b4ad6ccd105cc"/>
21+
<dir name="config.xml" hash="d4ab1eb13b2de2d7050165ec1fdd5085"/>
22+
</dir>
23+
<dir name="Block">
24+
<dir name="Adminhtml">
25+
<dir name="Dashboard.php" hash="b29053b9aeafde22f10a98d81fb68507"/>
26+
<dir name="Dashboard">
27+
<dir name="Section.php" hash="49c268efab4f3f09f9c718d1b4654885"/>
28+
<dir name="Tab.php" hash="dccfacfb0d1233483ef8d2ed2ff79d9c"/>
29+
</dir>
30+
</dir>
31+
</dir>
1932
<dir name="controllers">
20-
<dir name="DashboardController.php" hash="78d79028d899e33c56faeb1cda5a5ca9"/>
21-
<dir name="DebugController.php" hash="6791279fcf9f21498bc29f0607d2be80"/>
2233
<dir name="Cloudflare">
2334
<dir name="DashboardController.php" hash="d264f2edf250edeb805d5f12867df111"/>
24-
<dir name="DebugController.php" hash="fafab914d1485b6eb7dd3fb6dfbff137"/>
2535
<dir name="Api">
2636
<dir name="Caching">
2737
<dir name="AlwaysOnlineController.php" hash="53afa73d6df5c7701287bb8498b14750"/>
@@ -41,29 +51,29 @@
4151
<dir name="SslController.php" hash="e14a88d1628dd7da89de1b224a102145"/>
4252
<dir name="Tls13Controller.php" hash="0723ac9194df9b68c2c005f5463e3b57"/>
4353
</dir>
44-
<dir name="Dns">
45-
<dir name="CloudflareNameserversController.php" hash="99bd2889f965e9b12cacde02efe67481"/>
46-
<dir name="DnsRecordsController.php" hash="bbbc6d0f9f115588758dc178211410bc"/>
47-
</dir>
4854
<dir name="Firewall">
4955
<dir name="AccessRulesController.php" hash="e09fe1c5b9b2481c30d110e5b0de3962"/>
5056
<dir name="ChallengePassageController.php" hash="22cfa477ff57a76e5130d03e8e43fc8b"/>
5157
<dir name="SecurityLevelController.php" hash="3aa131edd0565a3a550083f7f190d547"/>
5258
<dir name="UserAgentBlockingController.php" hash="d53f5926f9dea30f46cb6fb0a268b015"/>
5359
</dir>
60+
<dir name="Dns">
61+
<dir name="CloudflareNameserversController.php" hash="99bd2889f965e9b12cacde02efe67481"/>
62+
<dir name="DnsRecordsController.php" hash="bbbc6d0f9f115588758dc178211410bc"/>
63+
</dir>
5464
<dir name="Network">
5565
<dir name="Http2Controller.php" hash="cec02362712bb3012cfa083dbd8bd4af"/>
5666
<dir name="IpGeolocationController.php" hash="a66151c62dd4d13058e0d6d84cb17381"/>
5767
<dir name="Ipv6CompatibilityController.php" hash="814922927bae3e45c254112cd5f75865"/>
5868
<dir name="PseudoIpv4Controller.php" hash="ffdea6ea79557377703f8e36bdceb02c"/>
5969
<dir name="WebsocketsController.php" hash="8881485d4c172cec1cb2595e27bf8ebc"/>
6070
</dir>
61-
<dir name="PageRules">
62-
<dir name="PageRulesController.php" hash="76c5912e6343c6d00d7791c37f81d606"/>
63-
</dir>
6471
<dir name="Overview">
6572
<dir name="StatusController.php" hash="e6e9f2a3ce5eb0d8fed4d2b651d82d04"/>
6673
</dir>
74+
<dir name="PageRules">
75+
<dir name="PageRulesController.php" hash="76c5912e6343c6d00d7791c37f81d606"/>
76+
</dir>
6777
<dir name="ScrapeShield">
6878
<dir name="EmailAddressObfuscationController.php" hash="1ee3ec5e41d93bf6079ff87887ea5643"/>
6979
<dir name="HotlinkProtectionController.php" hash="d157db779894f2dca577c98693ee582f"/>
@@ -78,75 +88,6 @@
7888
</dir>
7989
</dir>
8090
</dir>
81-
<dir name="Api">
82-
<dir name="Caching">
83-
<dir name="AlwaysOnlineController.php" hash="3a72396cf6f3229c7790fbe1af4c28a0"/>
84-
<dir name="BrowserCacheExpirationController.php" hash="4f5321d6c58886d417abb0247013911e"/>
85-
<dir name="CachingLevelController.php" hash="a71aba5dd98fbfa647282fdc01bef033"/>
86-
<dir name="DevelopmentModeController.php" hash="668da4bf2565fe0935dd3cce3ee0a572"/>
87-
<dir name="PurgeCacheController.php" hash="b63035ffcb6f9e8c42d2ec5f3323e33d"/>
88-
</dir>
89-
<dir name="Crypto">
90-
<dir name="AlwaysUseHttpsController.php" hash="6daa2afddf4003962e2295e4109f02b1"/>
91-
<dir name="AuthenticatedOriginPullsController.php" hash="dbde756c347cba1a21468da0aeef892e"/>
92-
<dir name="AutomaticHttpsRewritesController.php" hash="8c256fd93eef2ceb08292e64d2b242d5"/>
93-
<dir name="DisableUniversalSslController.php" hash="6ea97fcdb3722e79a3c14c72df80ada0"/>
94-
<dir name="HttpStrictTransportSecurityController.php" hash="7537cebf4d2972e1eb73c10441581c5b"/>
95-
<dir name="MinimumTlsVersionController.php" hash="116a2062c34185d3ae31b386c39ed79a"/>
96-
<dir name="OpportunisticEncryptionController.php" hash="48c523d5298fc4b3635c0a85bd2bb77f"/>
97-
<dir name="RequireModernTlsController.php" hash="43abbb262c254b5068fb886827565c83"/>
98-
<dir name="SslController.php" hash="009626c37e53141b21515dca9ad98cf2"/>
99-
<dir name="Tls13Controller.php" hash="db70c228ab4a43d520249139135f2c97"/>
100-
</dir>
101-
<dir name="Dns">
102-
<dir name="CloudflareNameserversController.php" hash="fc1d814cbb0c7dc19bec1346070b661c"/>
103-
<dir name="DnsRecordsController.php" hash="31f30f4877efafa68fe4e06965d8fd01"/>
104-
</dir>
105-
<dir name="Firewall">
106-
<dir name="AccessRulesController.php" hash="2a7b94d880ada386478aaec8230d6255"/>
107-
<dir name="ChallengePassageController.php" hash="c2ef413ad0fdbae30f325b64423be0b2"/>
108-
<dir name="SecurityLevelController.php" hash="b4ab2bdcdaca074202b8ffb9d37d1db2"/>
109-
<dir name="UserAgentBlockingController.php" hash="72f5cac927eb29816e9e402095f84089"/>
110-
</dir>
111-
<dir name="Network">
112-
<dir name="Http2Controller.php" hash="2ae1d4cd447d540e0a75f4a91b12a7bf"/>
113-
<dir name="IpGeolocationController.php" hash="c30c71af866bbf2f02c939e9766d8098"/>
114-
<dir name="Ipv6CompatibilityController.php" hash="f47e337da28164fceb01f40ecb12b6f7"/>
115-
<dir name="PseudoIpv4Controller.php" hash="89940ed7711211dceccbaa3f3098544e"/>
116-
<dir name="WebsocketsController.php" hash="5067b71a0bee985a4ca3f5f4d307ff8a"/>
117-
</dir>
118-
<dir name="Overview">
119-
<dir name="StatusController.php" hash="55a8e58331cc85e008aa7c0f67908841"/>
120-
</dir>
121-
<dir name="PageRules">
122-
<dir name="PageRulesController.php" hash="98518ea5d1c2b94ac282dcca733acabd"/>
123-
</dir>
124-
<dir name="ScrapeShield">
125-
<dir name="EmailAddressObfuscationController.php" hash="1ec743e504509bfca51f09e0a5d8fcd9"/>
126-
<dir name="HotlinkProtectionController.php" hash="ba81d47ca112d0db9c6535317567510b"/>
127-
<dir name="ServerSideExcludesController.php" hash="2a223eb9d440041125df7872139fccbf"/>
128-
</dir>
129-
<dir name="Speed">
130-
<dir name="AutoMinifyController.php" hash="0c29f78f6789948d61c54d83e4d96e88"/>
131-
<dir name="BrotliController.php" hash="aa70a0a7d144d9e9aff264f9367b9e51"/>
132-
<dir name="MirageController.php" hash="cbc20e00f7d71f67f3e441e9b3fb44ed"/>
133-
<dir name="PolishController.php" hash="ad5d9d287b9017d0d1f2ebca350a1a3c"/>
134-
<dir name="RocketLoaderController.php" hash="509a304a80ae3deaf1e0c666b8b29668"/>
135-
</dir>
136-
</dir>
137-
</dir>
138-
<dir name="etc">
139-
<dir name="adminhtml.xml" hash="40fddb62fcacb851210b4ad6ccd105cc"/>
140-
<dir name="config.xml" hash="d4ab1eb13b2de2d7050165ec1fdd5085"/>
141-
</dir>
142-
<dir name="Block">
143-
<dir name="Adminhtml">
144-
<dir name="Dashboard.php" hash="b29053b9aeafde22f10a98d81fb68507"/>
145-
<dir name="Dashboard">
146-
<dir name="Section.php" hash="49c268efab4f3f09f9c718d1b4654885"/>
147-
<dir name="Tab.php" hash="dccfacfb0d1233483ef8d2ed2ff79d9c"/>
148-
</dir>
149-
</dir>
15091
</dir>
15192
<dir name="Model">
15293
<dir name="Adminhtml">
@@ -174,7 +115,6 @@
174115
<dir name="HttpStrictTransportSecurity.php" hash="63ab32193a8346247acedfbe8df9ce98"/>
175116
<dir name="MinimumTlsVersion.php" hash="e634427902e8ccd328c7448a25a1d85e"/>
176117
<dir name="OpportunisticEncryption.php" hash="f104b47586f9431236b4514148d62e4a"/>
177-
<dir name="RequireModernTls.php" hash="3f0176f0735cdd290bed53ebb1ba04bf"/>
178118
<dir name="Ssl.php" hash="43fbd4dd237b71c7e50b567449124c94"/>
179119
<dir name="Tls13.php" hash="709388c8ed614b7f8bf658d01787aafb"/>
180120
</dir>
@@ -184,20 +124,20 @@
184124
<dir name="SecurityLevel.php" hash="53e97d8097256379989b1ba5dab40b51"/>
185125
<dir name="UserAgentBlocking.php" hash="c13ec821972845f4faa6ccfaeec06e22"/>
186126
</dir>
187-
<dir name="Overview">
188-
<dir name="Configuration.php" hash="f31c48bdf57f5855486adc42b0ac2c66"/>
189-
<dir name="Status.php" hash="e412319f8dd06b9410957c8cbbe770cf"/>
190-
</dir>
191-
<dir name="PageRules">
192-
<dir name="PageRules.php" hash="57b844cb25bc9af89e8d8ab513e0d9d8"/>
193-
</dir>
194127
<dir name="Network">
195128
<dir name="Http2.php" hash="2dfe36da760f4e5c8bf12fb59393d8a3"/>
196129
<dir name="IpGeolocation.php" hash="c4446df1da6e5fd50972767ea2f25e72"/>
197130
<dir name="Ipv6Compatibility.php" hash="dc8e53e4ed64ee8f2fab77314a5191aa"/>
198131
<dir name="PseudoIpv4.php" hash="98d0faf8ea93dea645d01a10fd91bd65"/>
199132
<dir name="Websockets.php" hash="911edc3af79b891c0e1a846a6c294b26"/>
200133
</dir>
134+
<dir name="Overview">
135+
<dir name="Configuration.php" hash="f31c48bdf57f5855486adc42b0ac2c66"/>
136+
<dir name="Status.php" hash="e412319f8dd06b9410957c8cbbe770cf"/>
137+
</dir>
138+
<dir name="PageRules">
139+
<dir name="PageRules.php" hash="57b844cb25bc9af89e8d8ab513e0d9d8"/>
140+
</dir>
201141
<dir name="ScrapeShield">
202142
<dir name="EmailAddressObfuscation.php" hash="a3d6a4c0fec2c32345a70652624054dd"/>
203143
<dir name="HotlinkProtection.php" hash="1ee2cf0356f8a2e65b2e557866d0d390"/>
@@ -255,7 +195,6 @@
255195
<dir name="http_strict_transport_security.phtml" hash="4d9433e747c1a5401cd3e65f9b352a86"/>
256196
<dir name="minimum_tls_version.phtml" hash="c4a1a815a7346d8939530176cd79ee38"/>
257197
<dir name="opportunistic_encryption.phtml" hash="95d3f1047285e8ac4fecf4b5666b896f"/>
258-
<dir name="require_modern_tls.phtml" hash="96af878298ad0f6cc80ec4784d024708"/>
259198
<dir name="ssl.phtml" hash="8fd44e8591f11a4b7fc558b6d2f86ba1"/>
260199
<dir name="tls_13.phtml" hash="7aa60ade3768312a68759ddb7154769f"/>
261200
</dir>
@@ -313,7 +252,7 @@
313252
<dir name="default">
314253
<dir name="css">
315254
<dir name="cloudflare">
316-
<dir name="bundle.min.css" hash="8a9b5c81c0f4a641bfbc60d26e57f8f9"/>
255+
<dir name="bundle.min.css" hash="3f45bdf765d88b35c40fbe27b8ad80df"/>
317256
<dir name="fonts">
318257
<dir name="cloudflare-font.woff" hash="23613915553427be651a4781521f0ec9"/>
319258
</dir>

src/skin/adminhtml/base/default/scss/cloudflare/common.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
font-size: 1.5em;
44
font-weight: normal;
55
font-style: normal;
6+
font-smoothing: antialiased;
67
-webkit-font-smoothing: antialiased;
8+
-moz-osx-font-smoothing: grayscale;
79
}

src/skin/adminhtml/base/default/scss/cloudflare/core/dashboard.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
height: initial;
1717
background: #FFF;
1818
width: 221px;
19+
min-width: 221px;
1920
height: 85px;
2021
padding: 20px;
2122
box-sizing: border-box;
@@ -126,7 +127,9 @@
126127
font-family: "cloudflare-font", sans-serif;
127128
font-style: normal;
128129
font-weight: 500;
130+
font-smoothing: antialiased;
129131
-webkit-font-smoothing: antialiased;
132+
-moz-osx-font-smoothing: grayscale;
130133
text-rendering: geometricPrecision;
131134
margin: 7.5px 20px;
132135
padding: 0;

src/skin/adminhtml/base/default/scss/cloudflare/core/modal.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@
6363
.message_container {
6464
max-height: 300px;
6565
overflow-y: scroll;
66-
-webkit-font-smoothing: subpixel-antialiased;
66+
font-smoothing: antialiased;
67+
-webkit-font-smoothing: antialiased;
68+
-moz-osx-font-smoothing: grayscale;
6769
div {
6870
padding: 0 22.5px;
6971
font-size: 1.1em;

src/skin/adminhtml/base/default/scss/cloudflare/core/notification.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
font-size: 1.3em;
6363
line-height: 1.2em;
6464
font-style: normal;
65+
font-smoothing: antialiased;
6566
-webkit-font-smoothing: antialiased;
67+
-moz-osx-font-smoothing: grayscale;
6668
}
6769
.status {
6870
left: 4px;

src/skin/adminhtml/base/default/scss/cloudflare/core/section.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ h1.tab-content {
66
font-size: 28px;
77
max-width: 960px;
88
margin: 30px auto 0;
9+
font-smoothing: antialiased;
910
-webkit-font-smoothing: antialiased;
11+
-moz-osx-font-smoothing: grayscale;
1012
}
1113

1214
h2.tab-content {
@@ -16,7 +18,9 @@ h2.tab-content {
1618
font-size: 22px;
1719
max-width: 960px;
1820
margin: 0 auto 0;
21+
font-smoothing: antialiased;
1922
-webkit-font-smoothing: antialiased;
23+
-moz-osx-font-smoothing: grayscale;
2024
}
2125

2226
section.cloudflare {
@@ -513,7 +517,9 @@ section.tabs-wrapper {
513517
font-size: 1.3em;
514518
transition: all 200ms;
515519
font-weight: 100;
520+
font-smoothing: antialiased;
516521
-webkit-font-smoothing: antialiased;
522+
-moz-osx-font-smoothing: grayscale;
517523
margin-bottom: 40px;
518524
&:before {
519525
content: "";

src/skin/adminhtml/base/default/scss/cloudflare/elements/checkbox.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
input[type="checkbox"] {
22
margin-right: 12px;
3-
visibility: hidden;
3+
visibility: visible;
44
cursor: pointer;
55
&:after {
66
content: "";

src/skin/adminhtml/base/default/scss/cloudflare/elements/radio.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
input[type="radio"] {
22
margin-right: 12px;
3-
visibility: hidden;
3+
visibility: visible;
44
cursor: pointer;
55
&:after {
66
content: "";
77
position: absolute;
8-
width: 15px;
9-
height: 15px;
8+
width: 18px;
9+
height: 18px;
1010
box-shadow: inset 0 0 0px 10px #FFF;
1111
background: $color-text_gray_dark;
12-
margin-top: -2px;
12+
margin-top: -3px;
1313
border: solid 1px #BCBEC0;
1414
border-radius: 100%;
1515
box-sizing: border-box;
1616
visibility: visible;
1717
transition: all 200ms;
18+
margin-left: -2px;
1819
}
1920
&:focus:after, &hover:after {
2021
border-color: $color-blue;

src/skin/adminhtml/base/default/scss/cloudflare/elements/select.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
section.cloudflare, .cloudflare_modal {
2+
font-smoothing: antialiased;
23
-webkit-font-smoothing: antialiased;
4+
-moz-osx-font-smoothing: grayscale;
35
select {
6+
appearance: none;
47
-webkit-appearance: none;
8+
-moz-appearance: none;
59
font-size: 1em;
610
width: 100%;
711
color: $color-text_gray_dark;

src/skin/adminhtml/base/default/scss/cloudflare/elements/switch.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,9 @@
6969
top: 0;
7070
width: 2.73367rem;
7171
z-index: 2;
72+
transition: all 0.15s linear;
7273
-moz-transition: all 0.15s linear;
73-
-o-transition: all 0.15s linear;
7474
-webkit-transition: all 0.15s linear;
75-
transition: all 0.15s linear;
7675
position: relative;
7776
margin: 0;
7877
padding: 0;

0 commit comments

Comments
 (0)