Skip to content

Commit 0f4d4e8

Browse files
committed
Reorganized style guides and IDE files
Moved IDE style guide files to separate folder and renamed style guide web files to match their corresponding languages
1 parent d08f472 commit 0f4d4e8

13 files changed

+90
-1011
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ This repository contains our style guides for C++ and Java code, various IDE sup
1010

1111
Anything submitted to a wpilibsuite project needs to follow the code style guides outlined here. For details about the style, please see the contributors document [here](CONTRIBUTING.md#coding-guidelines).
1212

13+
Style configuration files for IDEs are in the [ide](ide) folder. The style guides for C++, Java, and Python are named `cppguide`, `javaguide`, and `pyguide` respectively.
14+
1315
## Setup
1416

1517
See the `wpiformat` Python package [README](wpiformat/README.rst).
File renamed without changes.

cppguide.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
55
<title>WPILib C++ Style Guide</title>
6-
<link rel="stylesheet" type="text/css" href="include/styleguide.css">
7-
<script language="javascript" src="include/styleguide.js"></script>
6+
<link rel="stylesheet" type="text/css" href="cppguide.css">
7+
<script language="javascript" src="cppguide.js"></script>
88
</head>
99
<body onload="initStyleGuide();">
1010
<div id="content">

include/styleguide.js renamed to cppguide.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ function LinkifyHeader(header, fileName, sizePixels) {
247247
link.href = '#' + header.id;
248248
link.alt = 'link to ' + header.id;
249249
link.innerHTML =
250-
'<img src="include/' + fileName + '"' +
250+
'<img src="' + fileName + '"' +
251251
' width=' + sizePixels +
252252
' height=' + sizePixels +
253253
' style="float:left;position:relative;bottom:5px;">';
@@ -263,7 +263,7 @@ function LinkifyHeadersForTag(tagName) {
263263
header = headers[j];
264264
if (!hasClass(header, 'ignoreLink') && ('id' in header)) {
265265
if (header.id != '') {
266-
LinkifyHeader(header, 'link.png', 21);
266+
LinkifyHeader(header, 'guidelink.png', 21);
267267
header.style.left = '-46px';
268268
header.style.position = 'relative';
269269
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

javaguide.html

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

javaguidelink.png

-189 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)