Skip to content

Commit

Permalink
Merge branch 'io-1128' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
cristain7 committed Nov 1, 2023
2 parents 057294b + e652fd9 commit 79ad6fc
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [Unreleased]

### Changed

- Change background color and text for default state of radio button.

## [1.0.4] - 30.10.2023

### Changed

- Change getting started -> bundle to refer to npm instead of github
- Change "pages" reference to "templates"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<div align="center">

![Version](https://img.shields.io/badge/Version-1.0.3-blue?style=for-the-badge&logo=rocket&label=Version)
![Version](https://img.shields.io/badge/Version-1.0.4-blue?style=for-the-badge&logo=rocket&label=Version)
[![License](https://img.shields.io/badge/License-MIT-green?style=for-the-badge&logo=open-source-initiative&label=License)](https://opensource.org/licenses/MIT)
[![JavaScript](https://img.shields.io/badge/JS-F7DF1E?style=for-the-badge&logo=javascript&logoColor=ffffff&label=JavaScript)](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
[![Vue](https://img.shields.io/badge/Vue-2.x-green?style=for-the-badge&logo=vue.js&label=Vue)](https://v2.vuejs.org/)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oslokommune/oslo-designsystem",
"version": "1.0.3",
"version": "1.0.4",
"description": "Oslo Designsystem",
"main": "index.js",
"scripts": {
Expand Down
9 changes: 4 additions & 5 deletions src/components/form/radio/radio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
@extend %ods-text--weight-light;

align-items: center;
color: colors.$blue-state;
color: colors.$blue-dark;
display: flex;

&:focus-within {
&__label {
color: colors.$blue-dark;
transform: scale(1.05);
opacity: 1;
}
Expand Down Expand Up @@ -70,10 +71,6 @@
align-items: inherit;
display: flex;

& input:checked + &__control {
background-color: colors.$blue-state;
}

& input {
opacity: 0;
width: 0;
Expand All @@ -86,6 +83,7 @@

& input:checked + .ods-radio__control {
background-color: colors.$blue-state;
border-color: colors.$blue-state;
}

}
Expand All @@ -109,6 +107,7 @@
@extend %ods-text--size-kilo, %ods-text--size-juliett-breakpoint-large;
@extend %ods-text--weight-medium;

color: colors.$blue-state;
line-height: 1.5em !important;
}

Expand Down
2 changes: 1 addition & 1 deletion src/getting_started/contribute/basics/basics.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h3>Technical</h3>
<strong>general</strong> generates css classes and its documentation which can be used directly in html<br />
<strong>getting_started</strong> documents how to consume and how to contribute<br />
<strong>packages</strong> contains combinations of Designsystem which lets you consume it in different ways<br />
<strong>templates</strong> hold examples of how a selection of components can make a page<br />
<strong>templates</strong> Shows the core templates used on oslo.kommune.no<br />
<strong>system</strong> hold the core of the scss framework. It does not generate css by itself but is rather consumed by components which in turn generate css<br />
<strong>utils</strong> hold helper scripts for mundane tasks<br />
</p>
Expand Down

0 comments on commit 79ad6fc

Please sign in to comment.