Skip to content

Commit 21fa69d

Browse files
FlynnD273FlynnD273
committed
css seems to be in a working state
1 parent 0fc1276 commit 21fa69d

File tree

13 files changed

+132
-118
lines changed

13 files changed

+132
-118
lines changed

‎source/_includes/mainmenu.html‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
11
{% comment %}
2-
Copyright 2025 Google LLC
2+
Copyright 2025 Google LLC
33

4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77

8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99

10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
{% endcomment %}
1616

17-
<li class="mainmenu__item mainmenu__item--getting-started{% if page.menu_section != 'none' and (page.menu_section == 'tutorials' or (page.menu_section == null and layout.menu_section == 'tutorials')) %} active{% endif %}"><a href="/tutorials/"><span>Tutorials</span></a></li>
18-
<li class="mainmenu__item mainmenu__item--sdk{% if page.menu_section != 'none' and (page.menu_section == 'sdk' or (page.menu_section == null and layout.menu_section == 'sdk')) %} active{% endif %}"><a href="/sdk/"><span>Get the SDK</span></a></li>
19-
<li class="mainmenu__item mainmenu__item--guides{% if page.menu_section != 'none' and (page.menu_section == 'guides' or (page.menu_section == null and layout.menu_section == 'guides')) %} active{% endif %}"><a href="/guides/"><span>Guides</span></a></li>
20-
<li class="mainmenu__item mainmenu__item--docs{% if page.menu_section != 'none' and (page.menu_section == 'docs' or (page.menu_section == null and layout.menu_section == 'docs')) %} active{% endif %}"><a href="/docs/"><span>Documentation</span></a></li>
21-
<li class="mainmenu__item mainmenu__item--examples{% if page.menu_section != 'none' and (page.menu_section == 'examples' or (page.menu_section == null and layout.menu_section == 'examples')) %} active{% endif %}"><a href="/examples/"><span>Examples</span></a></li>
22-
<li class="mainmenu__item mainmenu__item--blog{% if page.menu_section != 'none' and (page.menu_section == 'blog' or (page.menu_section == null and layout.menu_section == 'blog')) %} active{% endif %}"><a href="/blog/"><span>Blog</span></a></li>
23-
<li class="mainmenu__item mainmenu__item--more{% if page.menu_section != 'none' and (page.menu_section == 'more' or (page.menu_section == null and layout.menu_section == 'more')) %} active{% endif %}"><a href="/more/"><span>More</span></a></li>
17+
<li
18+
class="mainmenu__item mainmenu__item--getting-started{% if page.menu_section != 'none' and (page.menu_section == 'tutorials' or (page.menu_section == null and layout.menu_section == 'tutorials')) %} active{% endif %}">
19+
<a href="/tutorials/"><span>Tutorials</span></a></li>
20+
<li
21+
class="mainmenu__item mainmenu__item--sdk{% if page.menu_section != 'none' and (page.menu_section == 'sdk' or (page.menu_section == null and layout.menu_section == 'sdk')) %} active{% endif %}">
22+
<a href="/sdk/"><span>Get the SDK</span></a></li>
23+
<li
24+
class="mainmenu__item mainmenu__item--guides{% if page.menu_section != 'none' and (page.menu_section == 'guides' or (page.menu_section == null and layout.menu_section == 'guides')) %} active{% endif %}">
25+
<a href="/guides/"><span>Guides</span></a></li>
26+
<li
27+
class="mainmenu__item mainmenu__item--docs{% if page.menu_section != 'none' and (page.menu_section == 'docs' or (page.menu_section == null and layout.menu_section == 'docs')) %} active{% endif %}">
28+
<a href="/docs/"><span>Documentation</span></a></li>
29+
<li
30+
class="mainmenu__item mainmenu__item--examples{% if page.menu_section != 'none' and (page.menu_section == 'examples' or (page.menu_section == null and layout.menu_section == 'examples')) %} active{% endif %}">
31+
<a href="/examples/"><span>Examples</span></a></li>
32+
<li
33+
class="mainmenu__item mainmenu__item--blog{% if page.menu_section != 'none' and (page.menu_section == 'blog' or (page.menu_section == null and layout.menu_section == 'blog')) %} active{% endif %}">
34+
<a href="/blog/"><span>Blog</span></a></li>
35+
<li
36+
class="mainmenu__item mainmenu__item--more{% if page.menu_section != 'none' and (page.menu_section == 'more' or (page.menu_section == null and layout.menu_section == 'more')) %} active{% endif %}">
37+
<a href="/more/"><span>More</span></a></li>

‎source/_includes/search.html‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
{% comment %}
2-
Copyright 2025 Google LLC
2+
Copyright 2025 Google LLC
33

4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
77

8-
http://www.apache.org/licenses/LICENSE-2.0
8+
http://www.apache.org/licenses/LICENSE-2.0
99

10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
1515
{% endcomment %}
1616

1717
<div class="search">
18-
<a href="javascript:void(0);" class="mobile-nav__hamburger js-mobile-nav-toggle"><i class="fa fa-reorder"></i></a>
19-
<i class="fa fa-lg fa-search search__icon"></i><input type="search" id="quicksearch" placeholder="Search Developer Site">
18+
<a href="javascript:void(0);" class="mobile-nav__hamburger js-mobile-nav-toggle"><i class="fa fa-reorder"></i></a>
19+
<i class="fa fa-lg fa-search search__icon"></i><input type="search" id="quicksearch"
20+
placeholder="Search Developer Site">
2021
</div>
2122
<div class="quicksearch" style="display: none;" id="quicksearch__results"></div>
2223
<div id="search__blackout" style="display: none;"></div>

‎source/_sass/app.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
@use 'colors';
2222

23-
@use 'base/base';
24-
@use 'responsive/responsive';
25-
@use 'font-awesome/font-awesome';
23+
@forward 'base/base';
24+
@forward 'responsive/responsive';
25+
@forward 'font-awesome/font-awesome';
2626

2727
@use 'header';
2828
@use 'footer';

‎source/_sass/elements/search.scss‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
@use "../responsive/utilities/mixins/breakpoints";
55
@use "../responsive/utilities/variables" as utilities-variables;
66

7+
// THIS IS A HACK I DON'T KNOW HOW TO FIX IT PROPERLY
8+
$font-size: 15px;
9+
710
/**
811
* Copyright 2025 Google LLC
912
*
@@ -28,7 +31,7 @@
2831
border-bottom: 1px solid colors.$gray-10;
2932
height: header.$header-height;
3033
left: sidebar.$sidebar-width;
31-
padding: calc(utilities-variables.$base-font-size / 1.2);
34+
padding: calc($font-size / 1.2);
3235
position: fixed;
3336
right: 0;
3437
top: 0;
@@ -43,8 +46,8 @@
4346
-webkit-appearance: textfield;
4447
border: 0;
4548
box-shadow: none;
46-
font-size: utilities-variables.$base-font-size * 1.2;
47-
padding: calc(utilities-variables.$base-font-size / 2);
49+
font-size: $font-size * 1.2;
50+
padding: calc($font-size / 2);
4851
padding-left: 2em;
4952
width: 100%;
5053

@@ -65,10 +68,10 @@
6568
}
6669

6770
.search__icon {
68-
font-size: utilities-variables.$base-font-size * 1.2;
69-
left: calc(utilities-variables.$base-font-size / 0.6);
71+
font-size: $font-size * 1.2;
72+
left: calc($font-size / 0.6);
7073
position: absolute;
71-
top: calc(utilities-variables.$base-font-size / 0.6);
74+
top: calc($font-size / 0.6);
7275

7376
@include breakpoints.bp-max (sidebar.$sidebar-hide-at) {
7477
display: none;
@@ -108,7 +111,7 @@
108111
}
109112

110113
h3 {
111-
font-size: 1.2 * utilities-variables.$base-font-size;
114+
font-size: 1.2 * $font-size;
112115
margin: 0.5em 0;
113116
text-transform: uppercase;
114117
}
@@ -157,14 +160,14 @@
157160
}
158161

159162
.quicksearch__result {
160-
margin-bottom: 0.5 * utilities-variables.$base-font-size;
163+
margin-bottom: 0.5 * $font-size;
161164
overflow: hidden;
162165
text-overflow: ellipsis;
163166

164167
}
165168

166169
.quicksearch__summary {
167-
font-size: 0.9 * utilities-variables.$base-font-size;
170+
font-size: 0.9 * $font-size;
168171
line-height: 0.9 * utilities-variables.$base-line-height;
169172
margin: 0;
170173
max-height: 0.9 * utilities-variables.$base-line-height;

‎source/_sass/elements/sectionmenu.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ $section-menu-width: 240px;
4848
}
4949

5050
.content--section-menu {
51-
margin-left: sidebar.$sidebar-width + $section-menu-width;
51+
padding-left: $section-menu-width;
5252

5353
@include breakpoints.bp-max (sidebar.$sidebar-hide-at) {
54-
margin-left: 0;
54+
padding-left: 0;
5555
}
5656
}
5757

‎source/_sass/responsive/responsive.scss‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Utilities
2-
@use "utilities/variables";
3-
@use "utilities/mixins/breakpoints";
4-
@use "utilities/mixins/grid";
5-
@use "utilities/mixins/push-pull";
6-
@use "utilities/mixins/grid-state";
7-
@use "utilities/mixins/layout";
8-
@use "utilities/mixins/text-align";
9-
@use "utilities/mixins/visibility";
2+
@forward "utilities/variables";
3+
@forward "utilities/mixins/breakpoints";
4+
@forward "utilities/mixins/grid";
5+
@forward "utilities/mixins/push-pull";
6+
@forward "utilities/mixins/grid-state";
7+
@forward "utilities/mixins/layout";
8+
@forward "utilities/mixins/text-align";
9+
@forward "utilities/mixins/visibility";
1010

1111
// Base Styles
1212
// @import "partials/copyright";
@@ -29,13 +29,13 @@
2929
// @import "partials/autosize";
3030
// @import "partials/carousel";
3131
// @import "partials/dropdown";
32-
@use "partials/modal";
32+
@forward "partials/modal";
3333
// @import "partials/tablelist";
3434
// @import "partials/tabs";
3535

3636
// Helpers
37-
@use "partials/helpers-layout";
38-
@use "partials/helpers-visibility";
37+
@forward "partials/helpers-layout";
38+
@forward "partials/helpers-visibility";
3939

4040
// Print Styles
41-
@use "partials/print";
41+
@forward "partials/print";

‎source/_sass/responsive/utilities/_variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// General Styles
22
$base-font-size: 100% !default;
3-
$base-line-height: 1.4 !default;
3+
$base-line-height: 21px !default;
44
$base-text-color: #222 !default;
55

66
// Selected text

‎source/blog/index.html‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
permalink: /feed.xml
1716
title: Blog
1817
layout: blog/master
1918
tag: all
@@ -26,46 +25,48 @@ <h2 class="pagesubtitle">A Wristed Development</h2>
2625

2726
<div class="blog-index">
2827
{% for post in paginator.posts %}
29-
{% include blog/index-post.html post=post %}
28+
{% include blog/index-post.html post=post %}
3029
{% endfor %}
3130
<div class="hidden-s hidden-xs">
3231
<ul class="pagination clearfix">
3332
<li><a href="{{ paginator.previous_page_path | prepend: site.baseurl }}">Prev</a></li>
3433
{% for page in (1..paginator.total_pages) %}
35-
<li class="{% if page == paginator.page %}active{% endif %}" >
36-
{% if page == 1 %}
37-
<a href="{{ site.baseurl }}/blog/">{{page}}</a>
38-
{% else %}
39-
<a href="{{ site.baseurl }}/blog/{{page}}">{{page}}</a>
40-
{% endif %}
41-
</li>
34+
<li class="{% if page == paginator.page %}active{% endif %}">
35+
{% if page == 1 %}
36+
<a href="{{ site.baseurl }}/blog/">{{page}}</a>
37+
{% else %}
38+
<a href="{{ site.baseurl }}/blog/{{page}}">{{page}}</a>
39+
{% endif %}
40+
</li>
4241
{% endfor %}
4342
<li><a href="{{ paginator.next_page_path | prepend: site.baseurl }}">Next</a></li>
4443
</ul>
4544
</div>
4645
<div class="visible-s visible-xs">
4746
<div class="row">
4847
<div class="col-xs-2">
49-
<a href="{{ paginator.previous_page_path | prepend: site.baseurl }}" class="btn btn--wide btn--fg-white btn--bg-lightblue">Prev</a>
48+
<a href="{{ paginator.previous_page_path | prepend: site.baseurl }}"
49+
class="btn btn--wide btn--fg-white btn--bg-lightblue">Prev</a>
5050
</div>
5151
<div class="col-xs-8">
5252
<div class="form__group">
5353
<div class="select-style no-label">
5454
<select class="js-toc-select">
55-
<option>JUMP TO PAGE</option>
55+
<option>JUMP TO PAGE</option>
5656
{% for page in (1..paginator.total_pages) %}
57-
{% if page == 1 %}
58-
<option value="{{ site.baseurl }}/blog/">{{page}}</option>
59-
{% else %}
60-
<option value="{{ site.baseurl }}/blog/{{page}}">{{page}}</option>
61-
{% endif %}
57+
{% if page == 1 %}
58+
<option value="{{ site.baseurl }}/blog/">{{page}}</option>
59+
{% else %}
60+
<option value="{{ site.baseurl }}/blog/{{page}}">{{page}}</option>
61+
{% endif %}
6262
{% endfor %}
6363
</select>
6464
</div>
6565
</div>
6666
</div>
6767
<div class="col-xs-2">
68-
<a href="{{ paginator.next_page_path | prepend: site.baseurl }}" class="btn btn--wide btn--fg-white btn--bg-lightblue">Next</a>
68+
<a href="{{ paginator.next_page_path | prepend: site.baseurl }}"
69+
class="btn btn--wide btn--fg-white btn--bg-lightblue">Next</a>
6970
</div>
7071
</div>
7172
</div>

‎source/contact/index.html‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
77
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
8+
# http://www.apache.org/licenses/LICENSE-2.0
99
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
permalink: /feed.xml
1716
layout: more
1817
title: Contact Developer Support
1918
menu_subsection: contact
@@ -30,41 +29,41 @@ <h1 class="pagetitle">{{ page.title }}</h1>
3029
</p>
3130
<p>
3231
If you have shipping, billing or other non-developer related questions,
33-
please contact <a
34-
href="http://help.getpebble.com/customer/portal/emails/new">Pebble Support</a>
32+
please contact <a href="http://help.getpebble.com/customer/portal/emails/new">Pebble Support</a>
3533
instead.
3634
</p>
3735

3836
<h3>Developer Support</h3>
39-
<p>In order to find a resolution to a development issue, you may want to try
40-
our <a href="https://forums.pebble.com">community forums</a>.</p>
37+
<p>In order to find a resolution to a development issue, you may want to try
38+
our <a href="https://forums.pebble.com">community forums</a>.</p>
4139
<ul>
4240
<li>1. Try searching to locate a resolution for your problem.</li>
4341
<li>2. If you were unable to locate a solution, create a new topic. Try
44-
to provide as much detail as possible, including logs, screenshots or
45-
code snippets.</li>
42+
to provide as much detail as possible, including logs, screenshots or
43+
code snippets.</li>
4644
<li>3. If you haven't received an adequate response within a few days,
47-
you should seek help within our
48-
<a href="{{ site.links.discord_invite }}">Discord server</a>, providing a link to
49-
your topic.</li>
45+
you should seek help within our
46+
<a href="{{ site.links.discord_invite }}">Discord server</a>, providing a link to
47+
your topic.
48+
</li>
5049
</ul>
5150
<p>&nbsp;</p>
5251

5352
<h3>Appstore Featuring</h3>
5453

5554
<p>Unfortunately we cannot guarantee featuring with the appstore. In order
56-
to be selected for featuring within the Pebble appstore, you should adhere
57-
to the following guidelines to improve the chances of selection:</p>
55+
to be selected for featuring within the Pebble appstore, you should adhere
56+
to the following guidelines to improve the chances of selection:</p>
5857
<ul>
5958
<li>1. Ensure your app is high quality and bug free.</li>
6059
<li>2. Support multiple Pebble platforms.</li>
6160
<li>3. Utilize latest Pebble SDK functionality. (Unobstructed Area,
62-
AppGlances, Health etc.)</li>
61+
AppGlances, Health etc.)</li>
6362
<li>4. Provide app configuration options.</li>
6463
<li>5. Have a complete set of assets, including banners.</li>
6564
<li>6. Promote your app in the Showcase category of the forum.</li>
6665
<li>7. Tweet <a href="https://twitter.com/pebbledev">@pebbledev</a> with
67-
a link to the showcase.</li>
66+
a link to the showcase.</li>
6867
</ul>
6968

7069
</div>

‎source/docs/pebblekit-android/index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
permalink: /feed.xml
1716
layout: docs/markdown
1817
title: PebbleKit Android Documentation
1918
docs_language: pebblekit_android

0 commit comments

Comments
 (0)