Skip to content

Commit

Permalink
fix(error): update error styles
Browse files Browse the repository at this point in the history
Pruned some styles; now using Bootstrap.
  • Loading branch information
danielmatthew committed Oct 8, 2021
1 parent 4b321d5 commit 0fc30d4
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 30 deletions.
2 changes: 1 addition & 1 deletion docs/assets/css/talis.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/css/talis.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/error/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
media="print"
onload="this.media='all'" />

<link rel="stylesheet" href="/bootstrap-theme/assets/css/error.css" />
<link rel="stylesheet" href="/bootstrap-theme/assets/css/talis.css" />
</head>
<body class="t-error">

Expand All @@ -31,7 +31,7 @@ <h2 class="c-error-page__subheader">
Something has gone wrong, and our team has been notified
</h2>
<hr/>
<dl id="errorDesc" class="o-dl--inline">
<dl class="o-dl--inline list-unstyled d-inline-block">
<dt>Error code:</dt>
<dd>Error message</dd>
</dl>
Expand Down
28 changes: 4 additions & 24 deletions scss/error.scss → scss/_error.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,11 @@

hr {
max-width: 20rem;
height: 1px;
margin: 2rem 0;
background-color: rgba(255, 255, 255, .2);
border: none;
box-sizing: content-box;
}

dl {
margin-top: 0;
margin-bottom: 20px;
}

dl {
line-height: 1.6;
}

dt{
font-weight: 700;
}

dd {
margin-left: 0;
}

a {
color: inherit;
color: $white;
}

a:hover,
Expand All @@ -45,7 +24,7 @@
}
}

.o-dl--inline *:not(div) {
.o-dl--inline > *:not(div) {
display: inline;
}

Expand All @@ -62,7 +41,7 @@
font-family: inherit;
font-size: 3.25rem;
font-weight: 700;
color: #fff;
color: $white;
line-height: 1.1;
margin-top: 20px;
margin-bottom: 10px;
Expand All @@ -71,6 +50,7 @@
.c-error-page__subheader {
margin-top: 20px;
margin-bottom: 10px;
color: $white;
font-size: 2.4375rem;
font-family: inherit;
font-weight: 300;
Expand Down
1 change: 1 addition & 0 deletions scss/talis.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ $enable-shadows: false;
@import "badges";
@import "buttons";
@import "dropdown";
@import "error";
@import "forms";
@import "loader";
@import "modal";
Expand Down
2 changes: 1 addition & 1 deletion src/docs/_includes/layouts/error.njk
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ title: Error Page
media="print"
onload="this.media='all'" />

<link rel="stylesheet" href="{{ '/assets/css/error.css' | url }}" />
<link rel="stylesheet" href="{{ '/assets/css/talis.css' | url }}" />
</head>
<body class="t-error">
{{ content | safe }}
Expand Down
2 changes: 1 addition & 1 deletion src/docs/error.njk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ title: Error
Something has gone wrong, and our team has been notified
</h2>
<hr/>
<dl id="errorDesc" class="o-dl--inline">
<dl class="o-dl--inline list-unstyled d-inline-block">
<dt>Error code:</dt>
<dd>Error message</dd>
</dl>
Expand Down

0 comments on commit 0fc30d4

Please sign in to comment.