Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
DewGew authored Oct 19, 2018
2 parents ee96818 + 921f26c commit 2235510
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion css/dark_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body,
h1,
h2,
h2 span {
color: var(--main-text-color);
color: var(--main-text-color) !important;
}
.item #status,
.sub-tabs > li > a,
Expand Down
2 changes: 2 additions & 0 deletions custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -1734,4 +1734,6 @@ padding-bottom:1px;
flex-wrap: wrap;
font-size: 0.9em;
}
.container-fluid {
padding: 0 3em !important;
}
Binary file added images/air.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/air48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Machinon",
"description": "Machinon custom theme, simple and light",
"license": "GPL-2.0+",
"version":"1.3.0",
"version":"1.3.2",
"author": "Logic Energy",
"homepage": "https://www.logicenergy.com",
"wiki": "",
Expand Down

0 comments on commit 2235510

Please sign in to comment.