Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit 9211438

Browse files
authored
Code snippet style changes in the docs + 404 page (#1052)
* homepage and support pages stackoverflow changes * typography changes for readme section * initial dropdown styling * code cleanup for dropdown component * further code cleanup for dropdowns * added comments * new loading page * code mirror background colour change * select state in code mirror colour change * table heading spacing change and transaction button alignment fix * header padding changes * notification typography changes * minor updates to the code section styling in the docs. * new 404 page and styles + homepage callout width fix
1 parent 0dfaf64 commit 9211438

File tree

7 files changed

+117
-16
lines changed

7 files changed

+117
-16
lines changed

packages/composer-website/jekylldocs/404.html

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,10 @@
44
category: 404
55
---
66

7-
<div class="container">
8-
9-
<div class="info">
10-
<h1>Hey - looks like someone turned the lights off!</h1>
11-
<p>Sorry, but the page you were trying to view does not exist.</p>
12-
<p>It looks like this was the result of either:</p>
13-
<ul>
14-
<li>a mistyped address</li>
15-
<li>an out-of-date link</li>
16-
</ul>
17-
18-
<p><a href="/">Try going back to the main site</a></p>
7+
<div class="pageproblem-container">
8+
<div class="pageproblem-info">
9+
<img src="{{ site.baseurl }}/assets/img/404.svg"/>
10+
<h1>Oh no!…there’s no blockchain here :(</h1>
11+
<p>If you fancy telling us about this <a href="https://github.com/hyperledger/composer">please raise an issue on our Github</a></p>
1912
</div>
20-
2113
</div>

packages/composer-website/jekylldocs/_includes/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{% endif %}
2121

2222
{% if page.category == 404 %}
23-
<link href="{{site.baseurl}}/assets/css/404.css" rel="stylesheet">
23+
<link href="{{site.baseurl}}/assets/css/404.min.css" rel="stylesheet">
2424
{% else %}
2525
<link href="{{site.baseurl}}/assets/css/normalize.css" rel="stylesheet">
2626
<link href="{{site.baseurl}}/assets/css/main.css" rel="stylesheet">

packages/composer-website/jekylldocs/assets/css/404.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// imports from main scss
2+
3+
@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600');
4+
5+
$font-stack: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
6+
$display-font: 'Open Sans';
7+
$primary-text: #19273C;
8+
$secondary-text: #8C9696;
9+
$first-highlight: #3F55AF;
10+
$second-highlight: #5068C2;
11+
$third-highlight: #F9F9F9;
12+
$fourth-highlight: #F1F3F7;
13+
$fifth-highlight: #B8C1C1;
14+
$sixth-highlight: #2D3D7D;
15+
$error-colour-1: #FF5C49;
16+
$error-colour-2: #F7E6E6;
17+
$success-colour: #40d5bb;
18+
$keyline-highlight: #E3ECEC;
19+
$white: #FDFDFD;
20+
$black: #000000;
21+
$callout: #FFD640;
22+
23+
24+
html {
25+
font-family: $font-stack;
26+
font-size: 16px;
27+
height: 100%;
28+
-webkit-font-smoothing: antialiased;
29+
-moz-osx-font-smoothing: grayscale;
30+
}
31+
32+
body {
33+
font-family: $font-stack;
34+
padding-bottom: 0;
35+
}
36+
37+
h1 {
38+
font-family: $display-font;
39+
font-weight: 300;
40+
font-size: 2.50rem;
41+
color: $first-highlight;
42+
margin-bottom: 0rem;
43+
}
44+
45+
h2 {
46+
font-family: $font-stack;
47+
font-weight: 300;
48+
font-size: 1.35rem;
49+
line-height: 130%;
50+
color: $first-highlight;
51+
}
52+
53+
p {
54+
font-family: $font-stack;
55+
color: $primary-text;
56+
font-weight: 400;
57+
font-size: 0.9rem;
58+
}
59+
60+
// 404 styles
61+
62+
.content-chunk {
63+
height: 94vh;
64+
background-color: rgba( $fourth-highlight, .5 );
65+
border-radius: 5px;
66+
margin: 2rem;
67+
.pageproblem-container {
68+
width: 100%;
69+
height: 100%;
70+
display: flex;
71+
flex-wrap: wrap;
72+
justify-content: center;
73+
align-items: center;
74+
.pageproblem-info {
75+
display: inline-block;
76+
vertical-align: top;
77+
text-align: left;
78+
a {
79+
text-decoration: none;
80+
border-bottom: 1px solid $primary-text;
81+
color: $primary-text;
82+
transition: all 0.2s ease-in-out;
83+
&:hover {
84+
border-bottom: 1px solid $primary-text;
85+
padding-bottom: 3px;
86+
}
87+
}
88+
}
89+
}
90+
}

packages/composer-website/jekylldocs/assets/css/new-style.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/composer-website/jekylldocs/assets/css/new-style.scss

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,17 @@ li {
320320
box-shadow: 2px 2px 10px 0 rgba(0,0,0,0.20);
321321
.callout-copy {
322322
margin: auto;
323-
width: 70vh;
323+
// width: 70vh;
324324
margin-top: 1rem;
325325
margin-bottom: 0.5rem;
326326
a {
327327
text-decoration: none;
328328
border-bottom: 1px solid $primary-text;
329329
color: $primary-text;
330+
transition: all 0.2s ease-in-out;
330331
&:hover {
331332
border-bottom: 1px solid $primary-text;
333+
padding-bottom: 3px;
332334
}
333335
}
334336
}
@@ -922,6 +924,14 @@ nav {
922924
border: 1px solid $keyline-highlight;
923925
}
924926

927+
code {
928+
border-radius: 2px;
929+
padding-left: 5px;
930+
padding-right: 5px;
931+
padding-top: 1px;
932+
padding-bottom: 1px;
933+
}
934+
925935
ul {
926936
list-style: none;
927937
padding-left: 2em;
@@ -965,3 +975,10 @@ nav {
965975
// bottom: 0;
966976
background-color: $sixth-highlight;
967977
}
978+
979+
// 404 page
980+
.container {
981+
.404-info {
982+
983+
}
984+
}
Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)