Skip to content

Commit

Permalink
Merge pull request #20 from datasci4health/development
Browse files Browse the repository at this point in the history
Adjusts in the Style
  • Loading branch information
santanche authored May 17, 2019
2 parents 7778f0b + dca2b3d commit 43546a3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/adonisjs/public/infra/basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Basic {
}

themeStyleResolver(theme) {
return "/themes/" + theme + "/css/theme.css";
return "../themes/" + theme + "/css/theme.css";
}

replaceStyle(targetDocument, oldCSS, newTheme) {
Expand Down
21 changes: 14 additions & 7 deletions src/adonisjs/public/themes/minimal/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@

body {
font-family: "Trebuchet MS", Helvetica, sans-serif;
font-size: 14pt;
font-size: 3vh;
margin-left: 10px;
margin-right: 10px;
}

.sty-std-border {
.styt-std-border {
border: 1px solid gray;
border-radius: 5px;
margin: 5px;
Expand All @@ -14,13 +16,15 @@ body {
/* picture-up-left
*****************/

.tsty-pul-main {
width: 100%;
.styt-pul-main {
width: 98%;
height: 100%;
font-size: 5vh;
font-size: 3vh;
margin-left: 1%;
margin-right: 1%;
}

.tsty-pul-main img {
.styt-pul-main img {
width: 50%;
height: 50%;
object-fit: contain;
Expand All @@ -34,7 +38,10 @@ body {

.styn-note {
background-color: White;
margin: 10px;
padding: 10px;
border-radius: 1px;
box-shadow: 0px 0px 0px 20px rgba(0,0,0,0.5);
margin: 15px;
}

.styn-control-button {
Expand Down
2 changes: 1 addition & 1 deletion src/adonisjs/public/themes/minimal/knot.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{knot}
<div class="styt-pul-main">{knot}</div>
4 changes: 2 additions & 2 deletions src/adonisjs/public/themes/minimal/note.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="sty-std-border styn-note">
<div class="styn-note">
<div class="styn-control-button">
<dcc-trigger action="knot/</navigate" label="Previous Knot" image="../themes/minimal/images/icon-back.svg"></dcc-trigger>
</div>

<div class="tsty-pul-main">{knot}</div>
<div class="styt-pul-main">{knot}</div>
</div>
2 changes: 1 addition & 1 deletion src/adonisjs/public/themes/minimal/picture_up_left.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="tsty-pul-main">{knot}</div>
<div class="styt-pul-main">{knot}</div>

0 comments on commit 43546a3

Please sign in to comment.