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

Styling changes to README & typography fixes #1532

Merged
merged 4 commits into from
Jul 11, 2017
Merged

Styling changes to README & typography fixes #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
915693b
styling changes to READMEs
Tobias-Hunter Jul 11, 2017
5bfa556
fixes
Tobias-Hunter Jul 11, 2017
579dd42
fixes
Tobias-Hunter Jul 11, 2017
cd38d68
fixes
Tobias-Hunter Jul 11, 2017
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
16 changes: 8 additions & 8 deletions packages/composer-playground/src/app/editor/editor-file/editor-file.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../assets/styles/base/colors';
@import '../../../assets/styles/base/colors';
@import '../../../assets/styles/base/variables';

editor-file {
Expand All @@ -25,13 +25,13 @@ editor-file {
}
}

.readme {
background-color: $white;
padding: $space-large;
min-height: 63vh;
max-height: 63vh;
overflow-y: scroll;
}
// .readme {
// background-color: $white;
// padding: $space-large;
// min-height: 63vh;
// max-height: 63vh;
// overflow-y: scroll;
// }
}

.CodeMirror {
Expand Down
25 changes: 23 additions & 2 deletions packages/composer-playground/src/app/editor/editor.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,30 @@ app-editor {
.readme {
background-color: $white;
padding: $space-large;
min-height: 63vh;
max-height: 63vh;
min-height: 72vh;
max-height: 72vh;
overflow-y: auto;

pre {
font-size: 0.8rem;
color: $white;
background-color: #272B36;
Copy link
Contributor

@nklincoln nklincoln Jul 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

global color?

Copy link
Contributor Author

@Tobias-Hunter Tobias-Hunter Jul 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't a global colour - pulled from the documentation code blocks!

code {
background-color: transparent;
border: none;
font-size: 0.7rem;
}
}

code {
border: 1px solid $keyline-highlight;
background-color: $white;
border-radius: 2px;
padding-right: 5px;
padding-left: 5px;
padding-top: 1px;
padding-bottom: 1px;
}
}

.edit_icon {
Expand Down
6 changes: 5 additions & 1 deletion packages/composer-playground/src/assets/styles/base/_codemirror.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@

.alert-message{
flex:1;
color: #8C9696;
color: $secondary-text;
padding-left:1rem;

p {
margin-top: 5px;
}
}
9 changes: 9 additions & 0 deletions packages/composer-playground/src/assets/styles/base/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700|Source+Code+Pro');

.composer {
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: greyscale;

h1, h2, h3 {
line-height: 100%;
margin: 0;
Expand Down Expand Up @@ -131,6 +134,12 @@
border: 1px solid $keyline-highlight;
padding: 1rem;
border-radius: 5px;
// -webkit-font-smoothing: antialiased;
}

code {
font-family: $svg-font;
font-size: 0.8rem;
}

blockquote {
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-playground/src/assets/styles/composer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import 'base/_codemirror';
@import 'base/_colors.scss';
@import 'base/_codemirror';
@import 'base/_variables.scss';
@import 'base/_extends.scss';
@import 'base/_typography.scss';
Expand Down