Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc formatting fixes and tweaks #47

Merged
merged 6 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
}
}

// Button Clear
// Button Clear (just a ⨉ icon with no padding)
&.btn-clear {
background: transparent;
border: 0;
Expand Down
6 changes: 6 additions & 0 deletions src/_codes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,9 @@ code {
width: 100%;
}
}

// Don't style codeblocks likely to be styled via plugins
pre[class] code {
background: unset;
color: unset;
}
4 changes: 2 additions & 2 deletions src/_labels.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Labels
.label {
@include label-base();
@include label-base(.4em);
@include label-variant(lighten($body-font-color, 5%), $bg-color-dark);
display: inline-block;

// Label rounded
&.label-rounded {
border-radius: 5rem;
padding-left: .4rem;
padding-right: .4rem;
padding-right: .4rem;
}

// Label colors
Expand Down
10 changes: 9 additions & 1 deletion src/_normalize.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/**
Manually forked from modern-normalize with some removals:

- r1 Box model, already set by spectre.
Expand Down Expand Up @@ -169,6 +169,14 @@ button,
-webkit-appearance: button;
}

/**
Remove fieldset border.
*/

fieldset{
border: 0;
}

/**
Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
*/
Expand Down
8 changes: 5 additions & 3 deletions src/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ h6,

// Paragraphs
p {
margin: 0 0 $line-height;
margin-top: $line-height;
margin-bottom: $line-height;
}

// Semantic text elements
Expand Down Expand Up @@ -111,19 +112,20 @@ ol {

li {
margin-top: $unit-2;
margin-left: $unit-4;
}
}

ul {
list-style: disc inside;
list-style: disc outside;

ul {
list-style-type: circle;
}
}

ol {
list-style: decimal inside;
list-style: decimal outside;

ol {
list-style-type: lower-alpha;
Expand Down
4 changes: 2 additions & 2 deletions src/mixins/_label.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Label base style
@mixin label-base() {
@mixin label-base($padding-x: .2rem, $padding-y: .1rem) {
border-radius: $border-radius;
line-height: 1.25;
padding: .1rem .2rem;
padding: $padding-y $padding-x;
}

@mixin label-variant($color: $light-color, $bg-color: $primary-color) {
Expand Down