Skip to content

Commit c4e4b76

Browse files
petertaitpetertait
committed
Merge pull request #34 from pebblecode/sprite-refactor
update logo + refactor sprite
2 parents 6af11c1 + c7561df commit c4e4b76

21 files changed

+68
-894
lines changed

‎.DS_Store‎

-8 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1+
# Jekyll
12
_site/
23
.sass-cache/
34
.jekyll-metadata
4-
.idea/
5+
.idea/
6+
7+
# MacOS
8+
.DS_Store
9+
_sass/.DS_store
10+
img/.DS_Store
11+
12+
13+
# NPM files
14+
node_modules
15+
npm-debug.log

‎_includes/header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<header class="gbl-head {{ page.colour }}">
2-
<a href="../" class="gbl-head-logo" data-sr="enter left move 100px, vF 0">go to pebble {code} home page</a>
2+
<a href="../" class="gbl-head-logo" data-sr="enter left move 100px, vF 0">pebble {code}</a>
33
<button id="navBtn" class="gbl-head-btn">Menu</button>
44
<nav id="navMenu" class="gbl-head-nav">
55
{% assign nav = site.pages %}

‎_sass/.DS_Store‎

-6 KB
Binary file not shown.

‎_sass/components/_gbl-foot.scss‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,10 @@
9191
opacity: 0.8;
9292
}
9393

94-
&.github:after {
95-
@extend .i-github-pink;
96-
}
94+
&.github:after { @include sprite($octocat-pink); }
9795

98-
&.twitter:after {
99-
@extend .i-twitter-pink;
100-
}
96+
&.twitter:after { @include sprite($twitter-pink); }
10197

102-
&.vimeo:after {
103-
@extend .i-vimeo-pink;
104-
}
98+
&.vimeo:after { @include sprite($vimeo-pink); }
10599
}
106100
}

‎_sass/components/_gbl-head.scss‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
&:after {
4949
@include icon-pseudo;
50-
@extend .i-gbl-logo-white;
50+
@include sprite($logo-white);
5151
bottom: 0;
5252
left: 0;
5353
}
@@ -159,8 +159,8 @@
159159

160160
&:after {
161161
@include icon-pseudo;
162-
@extend .i-menu-grey;
163-
top: 14px;
162+
@include sprite($menu-grey);
163+
top: 13px;
164164
left: 13px;
165165
}
166166

@@ -170,7 +170,8 @@
170170
}
171171

172172
&.active:after {
173-
@extend .i-close-grey;
173+
@include sprite($close-grey);
174+
top: 14px;
174175
left: 15px;
175176
}
176177

‎_sass/pages/_careers.scss‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -115,46 +115,34 @@
115115
&.benefit-flexible {
116116
padding-top: 8px;
117117

118-
&:after {
119-
@extend .i-flexible-white;
120-
}
118+
&:after { @include sprite($flexible-white); }
121119
}
122120

123121
&.benefit-10 {
124122
padding-top: 8px;
125123

126-
&:after {
127-
@extend .i-10-white;
128-
}
124+
&:after { @include sprite($ten-white); }
129125
}
130126

131-
&.benefit-holidays:after {
132-
@extend .i-holidays-white;
133-
}
127+
&.benefit-holidays:after { @include sprite($holiday-white); }
134128

135129
&.benefit-snacks:after {
136-
@extend .i-snacks-white;
130+
@include sprite($snacks-white);
137131
left: 28px;
138132
}
139133

140-
&.benefit-pay:after {
141-
@extend .i-pay-white;
142-
}
134+
&.benefit-pay:after { @include sprite($pay-white); }
143135

144136
&.benefit-gym {
145137
padding-top: 8px;
146138

147-
&:after {
148-
@extend .i-gym-white;
149-
}
139+
&:after { @include sprite($gym-white); }
150140
}
151141

152-
&.benefit-social:after {
153-
@extend .i-social-white;
154-
}
142+
&.benefit-social:after { @include sprite($beer-white); }
155143

156144
&.benefit-charity:after {
157-
@extend .i-charity-white;
145+
@include sprite($charity-white);
158146
left: 28px;
159147
}
160148
}
@@ -415,7 +403,7 @@
415403

416404
&:after {
417405
@include icon-pseudo;
418-
@extend .i-close-grey;
406+
@include sprite($close-grey);
419407
top: 17px;
420408
left: 17px;
421409
}

‎_sass/pages/_contact.scss‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -126,32 +126,27 @@
126126

127127
&:after {
128128
@include icon-pseudo;
129+
opacity: 0.2;
129130
top: 0;
130131
left: 0;
131132
}
132133
}
133134
}
134135

135136
.location-item-address {
136-
& a:after {
137-
@extend .i-location-grey;
138-
}
137+
& a:after { @include sprite($location-black); }
139138
}
140139

141140
.location-item-phone {
142141
line-height: 1;
143142

144-
& a:after {
145-
@extend .i-phone-grey;
146-
}
143+
& a:after { @include sprite($phone-black); }
147144
}
148145

149146
.location-item-email {
150147
line-height: 1;
151148

152-
& a:after {
153-
@extend .i-email-grey;
154-
}
149+
& a:after { @include sprite($mail-black); }
155150
}
156151

157152
// Map

‎_sass/pages/_post.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214

215215
&:after {
216216
@include icon-pseudo;
217-
@extend .i-twitter-pink;
217+
@include sprite($twitter-pink);
218218
top: 2px;
219219
right: -32px;
220220
}

‎_sass/shared/_ie.scss‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
//===============================================================================
44
.lt-ie9 {
55

6-
// Global Sprite
7-
.i-gym-white, .i-10-white, .i-pay-white, .i-charity-white, .i-snacks-white, .i-holidays-white, .i-flexible-white, .i-social-white, .i-vimeo-pink, .i-github-pink, .i-menu-grey, .i-twitter-pink, .i-gbl-logo-white, .i-close-grey, .i-phone-grey, .i-email-grey, .i-location-grey { background: url(../img/gbl-sprite.png); }
8-
9-
106
// Global Header
11-
.gbl-head-logo{
12-
text-indent: -9999px;
7+
.gbl-head-logo {
8+
color: white;
9+
width: auto;
10+
font-size: $gamma;
11+
font-weight: $font-bold;
1312
}
1413

1514
.gbl-head-nav {

0 commit comments

Comments
 (0)