Skip to content

Commit c80f519

Browse files
mac-cain13mac-cain13
committed
# Conflicts: # source/options.css
2 parents 6b8dcef + 314db6d commit c80f519

17 files changed

+156
-109
lines changed

‎source/images/bug-gray.png

-680 Bytes
Binary file not shown.

‎source/images/bug.png

-795 Bytes
Binary file not shown.

‎source/images/clock.png

-882 Bytes
Binary file not shown.

‎source/images/icon--128.png

3.32 KB
Loading

‎source/images/icon--16.png

1.13 KB
Loading

‎source/images/icon--256.png

5.9 KB
Loading

‎source/images/icon--48.png

1.84 KB
Loading

‎source/images/icon--512.png

11.6 KB
Loading

‎source/images/icon-128.png

-14.2 KB
Binary file not shown.

‎source/images/icon-16.png

-778 Bytes
Binary file not shown.

‎source/images/icon-48.png

-2.69 KB
Binary file not shown.

‎source/images/script.png

-824 Bytes
Binary file not shown.

‎source/manifest.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,23 @@
88
"minimum_chrome_version": "20",
99
"permissions": [ "tabs", "*://*/*" ],
1010
"icons": {
11-
"128": "images/icon-128.png",
12-
"16": "images/icon-16.png",
13-
"48": "images/icon-48.png"
11+
"16": "images/icon--16.png",
12+
"48": "images/icon--48.png",
13+
"128": "images/icon--128.png",
14+
"256": "images/icon--256.png",
15+
"512": "images/icon--256.png"
1416
},
1517

1618
"options_page": "options.html",
1719

1820
"browser_action": {
19-
"default_icon": "images/bug-gray.png",
21+
"default_icon": {
22+
"16": "images/icon--16.png",
23+
"48": "images/icon--48.png",
24+
"128": "images/icon--128.png",
25+
"256": "images/icon--256.png",
26+
"512": "images/icon--256.png"
27+
},
2028
"default_title": "Debugging, profiling & tracing disabled",
2129
"default_popup" : "popup.html"
2230
},

‎source/options.css

Lines changed: 67 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,107 @@
1-
* {
2-
font-family: Arial, Helvetica, sans-serif;
1+
html,
2+
body {
3+
font-family: 'Roboto', sans-serif;
4+
font-size: 14px;
5+
line-height: 1.4em;
6+
background-color: #e2e1e0;
37
}
48

59
::selection {
6-
background: #64d153;
7-
color: #fff;
8-
text-shadow: none;
9-
}
10-
11-
h1, h2, h3 {
12-
font-family: Georgia, 'Times New Roman', Times, serif;
13-
margin-bottom: -5px;
14-
}
15-
16-
h3 {
17-
background-color: rgba(61, 167, 41, 0.48);
18-
color: rgba(27, 54, 23, 0.99);
19-
padding: 5px;
20-
}
21-
22-
h1 {
23-
margin: 0 0 -15px 0;
10+
background: #4285f4;
11+
color: #fff;
12+
text-shadow: none;
2413
}
2514

2615
a {
27-
color: inherit;
28-
text-decoration: inherit;
29-
}
30-
31-
a span {
32-
text-decoration: underline;
33-
}
34-
35-
a.txtlink {
36-
text-decoration: none;
37-
border-bottom: 1px dotted #356816;
38-
color: #356816;
39-
}
40-
41-
body {
42-
background-color: #eee;
43-
font-size: 0.95em;
16+
text-decoration: none;
17+
color: #4285f4;
4418
}
4519

4620
.contentTxt {
47-
margin-bottom: 5px;
21+
margin-bottom: 5px;
4822
}
4923

5024
#heading {
51-
text-align: right;
25+
background-color: #4285f4;
26+
margin: -20px -20px 20px;
27+
color: #ffffff;
28+
padding: 20px;
5229
}
5330

5431
.inlineicon {
55-
vertical-align: bottom;
56-
width: 16px;
57-
height: 16px;
32+
vertical-align: bottom;
33+
width: 16px;
34+
height: 16px;
5835
}
5936

6037
#content, #footer {
61-
width: 400px;
62-
padding: 7px;
63-
margin-left: auto;
64-
margin-right: auto;
38+
max-width: 600px;
39+
margin-left: auto;
40+
margin-right: auto;
6541
}
6642

6743
#content {
68-
border: 5px solid #64d153;
69-
background-color: #fff;
70-
border-radius: 7px;
44+
background: #fff;
45+
border-radius: 2px;
46+
padding: 20px;
47+
position: relative;
48+
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
7149
}
7250

7351
#footer {
74-
text-align: right;
52+
border-top: 1px solid #cccccc;
53+
padding: 20px;
54+
margin: 0 -20px;
7555
}
7656

7757
#footer img {
78-
margin-right: -7px;
58+
margin-right: -7px;
7959
}
8060

8161
.hint {
82-
font-size: 0.8em;
83-
padding: 7px;
84-
text-align: center;
85-
background-color: rgb(251, 242, 185);
86-
border-radius: 5px;
62+
display: inline-block;
63+
margin: 10px 0;
64+
color: #ffffff;
65+
padding: 10px;
66+
background-color: #4285f4;
67+
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12);
8768
}
8869

8970
.hint img {
90-
vertical-align: bottom;
71+
vertical-align: bottom;
9172
}
9273

9374
.contribute {
94-
font-size: 10px;
95-
color: #808080;
96-
float: left;
97-
text-decoration: none;
75+
font-size: 10px;
76+
color: #808080;
77+
float: left;
78+
text-decoration: none;
9879
}
9980

10081
.contribute span {
101-
text-decoration: underline;
82+
text-decoration: underline;
83+
}
84+
85+
.color--green {
86+
color: #4CAF50;
87+
}
88+
89+
.color--blue {
90+
color: #039BE5;
10291
}
92+
93+
.color--deep-purple {
94+
color: #673AB7;
95+
}
96+
97+
.color--gray {
98+
color: #6D6D6D;
99+
}
100+
101+
.material-icons {
102+
font-size: 18px;
103+
line-height: 0;
104+
position: relative;
105+
top: 4px;
106+
margin-right: 5px;
107+
}

‎source/options.html

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<meta charset="utf-8">
55
<title>Xdebug helper</title>
66

7+
<link href='https://fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
8+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
79
<link rel="stylesheet" href="options.css">
810

911
<script type="text/javascript" src="jquery.js"></script>
@@ -22,10 +24,10 @@ <h3>Introduction</h3>
2224
First install and configure <a target="_blank" class="txtlink" href="http://www.xdebug.org/docs/install">Xdebug</a>, then set your IDE key below. Now tell Xdebug to debug, profile or trace by clicking the little bug in the addressbar:
2325
</p>
2426
<p class="contentTxt">
25-
<img class="inlineicon" alt="" src="images/bug-gray.png" /> Debugging, profiling &amp; tracing disabled<br />
26-
<img class="inlineicon" alt="" src="images/bug.png" /> Debugging enabled<br />
27-
<img class="inlineicon" alt="" src="images/clock.png" /> Profiling enabled<br />
28-
<img class="inlineicon" alt="" src="images/script.png" /> Tracing enabled
27+
<i class="material-icons color--gray">bug_report</i> Debugging, profiling &amp; tracing disabled<br />
28+
<i class="material-icons color--green">bug_report</i> Debugging enabled<br />
29+
<i class="material-icons color--blue">alarm</i> Profiling enabled<br />
30+
<i class="material-icons color--deep-purple">find_in_page</i> Tracing enabled
2931
</p>
3032
<p class="hint"><img src="images/lightbulb.png" alt="Tip!" title="Tip!" /> Love hotkeys? Use Ctrl+Shift+X (Cmd+Shift+X on Mac) to open the popup, Alt+Shift+X to toggle the debugging state.</p>
3133

@@ -58,12 +60,11 @@ <h3>Profile Trigger Value</h3>
5860
<input type="text" id="profiletrigger" value="">
5961
<button class="save-button">Save</button>
6062
</p>
61-
</div>
62-
63-
<div id="footer">
64-
<a href="https://github.com/mac-cain13/xdebug-helper-for-chrome" class="contribute" target="_blank">
65-
Feel free to submit ideas, bugs and pull request to our <span>Github project</span>
66-
</a>
63+
<footer id="footer">
64+
<a href="https://github.com/mac-cain13/xdebug-helper-for-chrome" class="contribute" target="_blank">
65+
Feel free to submit ideas, bugs and pull request to our <span>Github project</span>
66+
</a>
67+
</footer>
6768
</div>
6869
</body>
6970
</html>

‎source/popup.css

Lines changed: 60 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,85 @@
1+
html,
12
body {
2-
font-family: Arial;
3-
font-size: 14px;
3+
font-family: 'Roboto', sans-serif;
4+
font-size: 13px;
5+
line-height: 1.4em;
46
}
57

68
.togglelist {
7-
list-style: none;
8-
padding-left: 0;
9-
margin: 0;
9+
list-style: none;
10+
padding-left: 0;
11+
margin: 0;
1012
}
1113

1214
.togglelist li a {
13-
display: block;
14-
min-width: 70px;
15-
line-height: 16px;
16-
margin: 3px auto;
17-
padding: 6px;
18-
background-color: #eee;
19-
color: #333;
20-
text-decoration: none;
15+
display: block;
16+
min-width: 70px;
17+
line-height: 16px;
18+
margin: 3px auto;
19+
padding: 10px 20px;
20+
background-color: #eee;
21+
color: #000000;
22+
text-decoration: none;
23+
}
24+
25+
.togglelist li a .material-icons {
26+
font-size: 18px;
27+
line-height: 0;
28+
position: relative;
29+
top: 4px;
30+
margin-right: 5px;
2131
}
2232

2333
.togglelist li:first-child a {
24-
margin-top: 0;
25-
border-top-left-radius: 3px 3px;
26-
border-top-right-radius: 3px 3px;
34+
margin-top: 0;
35+
border-top-left-radius: 3px 3px;
36+
border-top-right-radius: 3px 3px;
2737
}
2838

2939
.togglelist li:last-child a {
30-
margin-bottom: 0;
31-
border-bottom-left-radius: 3px 3px;
32-
border-bottom-right-radius: 3px 3px;
40+
margin-bottom: 0;
41+
border-bottom-left-radius: 3px 3px;
42+
border-bottom-right-radius: 3px 3px;
3343
}
3444

35-
.togglelist li a:hover, .togglelist li a:focus {
36-
background-color: #c8e8c3;
37-
outline: none;
45+
.togglelist li a:hover, .togglelist li a:focus, .togglelist li a:hover .material-icons {
46+
background-color: #4FC3F7;
47+
color: #000;
48+
outline: none;
3849
}
3950

4051
.togglelist li .active {
41-
background: #64d153;
52+
background: #039BE5;
53+
color: #ffffff;
54+
}
55+
56+
.togglelist li .active .material-icons {
57+
color: #ffffff;
4258
}
4359

4460
.inlineicon {
45-
vertical-align: middle;
46-
min-width: 16px;
47-
min-height: 16px;
48-
padding: 0 6px 0 0;
61+
vertical-align: middle;
62+
min-width: 16px;
63+
min-height: 16px;
64+
padding: 0 6px 0 0;
4965
}
5066

5167
.hotkey {
52-
text-decoration: underline;
68+
text-decoration: underline;
69+
}
70+
71+
.color--green {
72+
color: #4CAF50;
5373
}
74+
75+
.color--blue {
76+
color: #039BE5;
77+
}
78+
79+
.color--deep-purple {
80+
color: #673AB7;
81+
}
82+
83+
.color--gray {
84+
color: #6D6D6D;
85+
}

‎source/popup.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<head>
44
<meta charset="utf-8">
55
<title>Xdebug helper popup</title>
6-
6+
<link href='https://fonts.googleapis.com/css?family=Roboto:400,700' rel='stylesheet' type='text/css'>
7+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
78
<link rel="stylesheet" href="popup.css">
89

910
<script type="text/javascript" src="jquery.js"></script>
@@ -15,22 +16,22 @@
1516
<ul class="togglelist">
1617
<li>
1718
<a href="#" class="action" id="action-debug" data-status="1">
18-
<img class="inlineicon" alt="" src="images/bug.png" /><span class="hotkey">D</span>ebug
19+
<i class="material-icons color--green">bug_report</i><span class="hotkey">D</span>ebug
1920
</a>
2021
</li>
2122
<li>
2223
<a href="#" class="action" id="action-profile" data-status="2">
23-
<img class="inlineicon" alt="" src="images/clock.png" /><span class="hotkey">P</span>rofile
24+
<i class="material-icons color--blue">alarm</i><span class="hotkey">P</span>rofile
2425
</a>
2526
</li>
2627
<li>
2728
<a href="#" class="action" id="action-trace" data-status="3">
28-
<img class="inlineicon" alt="" src="images/script.png" /><span class="hotkey">T</span>race
29+
<i class="material-icons color--deep-purple">find_in_page</i><span class="hotkey">T</span>race
2930
</a>
3031
</li>
3132
<li>
3233
<a href="#" class="action" id="action-disable" data-status="0">
33-
<img class="inlineicon" alt="" src="images/bug-gray.png" />Di<span class="hotkey">s</span>able
34+
<i class="material-icons color--gray">bug_report</i>Di<span class="hotkey">s</span>able
3435
</a>
3536
</li>
3637
</ul>

0 commit comments

Comments
 (0)