Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Update loading splash to fit in with l&f #3685

Merged
merged 1 commit into from
Nov 29, 2016
Merged

Update loading splash to fit in with l&f #3685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 9 additions & 14 deletions js/src/dapps/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,23 @@
height: 100%;
margin: 0;
padding: 0;
}

.loading-container {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
font-family: Roboto;
background-color: rgba(0, 0, 0, 0.8);
color: #ddd;
background: white;
font-family: 'Roboto', sans-serif;
font-size: 16px;
font-weight: 300;
}

.loading {
font-size: 4em;
text-align: center;
padding-top: 5em;
font-size: 2em;
color: #999;
}
</style>
</head>
<body>
<div id="container">
<div class="loading-container">
<span class="loading">Loading...</span>
</div>
<div class="loading">Loading</div>
</div>
<script src="vendor.js"></script>
<% if (!htmlWebpackPlugin.options.secure) { %>
Expand Down
23 changes: 9 additions & 14 deletions js/src/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,23 @@
height: 100%;
margin: 0;
padding: 0;
}

.loading-container {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
font-family: Roboto;
background-color: rgba(0, 0, 0, 0.8);
color: #ddd;
background: white;
font-family: 'Roboto', sans-serif;
font-size: 16px;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not using em font size ?

Copy link
Contributor Author

@jacogr jacogr Nov 29, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

Material-UI defaults to 16px, so sticking with that so there is no jarring effect. (Bear in mind that this gets replaced in some dapps with "Loading Application" as soon as it does it's thing so there is no "o, it looks different now" effect - the dapps are also at 2em for the loading font)

font-weight: 300;
}

.loading {
font-size: 4em;
text-align: center;
padding-top: 5em;
font-size: 2em;
color: #999;
}
</style>
</head>
<body>
<div id="container">
<div class="loading-container">
<span class="loading">Loading...</span>
</div>
<div class="loading">Loading</span>
</div>
<script src="vendor.js"></script>
</body>
Expand Down