Skip to content

Commit

Permalink
Merge pull request #1 from typerror/develop
Browse files Browse the repository at this point in the history
v0.2-alpha
  • Loading branch information
andreazangheri authored Oct 19, 2018
2 parents 7eba680 + 894a411 commit 1d98702
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (fs.existsSync(path.join(res, 'app/index.html'))) {

let html = fs.readFileSync(html_file_path, "utf8");

const link_to_inject = ' <link href="https://cdn.jsdelivr.net/gh/typerror/kactus-dark-fusion@v0.1-alpha/kactus--dark-fusion.css" rel="stylesheet">';
const link_to_inject = ' <link href="https://cdn.jsdelivr.net/gh/typerror/kactus-dark-fusion@v0.2-alpha/kactus--dark-fusion.css" rel="stylesheet">';
html = html
.replace(/<link[^>]+(cdn|custom-theme)[^>]+>/, '') // remove existing custom stylesheet if there is one
.replace('</head>', `\n${link_to_inject}</head>`); // add stylesheet
Expand Down
15 changes: 7 additions & 8 deletions kactus--dark-fusion.css
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@
--easing-ease-out-quint: cubic-bezier(0.23, 1, 0.32, 1); */
}


input,
textarea,
select {
Expand Down Expand Up @@ -288,13 +287,13 @@ body.platform-win32 .select-component select {
background-color: var(--background-color); /* The little square between H and V scrollbars */
}

body.platform-darwin #desktop-app-title-bar {
height: var(--darwin-title-bar-height);
background: linear-gradient(to bottom, #2f3542 0%, #2f3542 100%);
border-bottom: 1px solid #292e3a; /* Removing bottom border will eliminate the bottom title-bar border */
#kactus-app-title-bar {
height: var(--title-bar-height);
background: linear-gradient(to bottom, #2f3542 0%, #2f3542 100%);
border-bottom: 1px solid #292e3a;
}

#desktop-app-toolbar {
#kactus-app-toolbar {
border-bottom: 1px solid #292e3a;
}

Expand All @@ -307,7 +306,7 @@ body.platform-darwin #desktop-app-title-bar {
* With border-right it won't line up between the button and the foldout (by a pixel),
* and an inset box-shadow will get covered up. Create an inset border with a psuedo element.
*/
#desktop-app-toolbar .foldout::after {
#kactus-app-toolbar .foldout::after {
content: "";
position: absolute;
right: 0;
Expand All @@ -319,7 +318,7 @@ body.platform-darwin #desktop-app-title-bar {
* The foldout can be wider than the button, so we want a non-rectangular border.
* First create a line between the foldout and the toolbar.
*/
#desktop-app-toolbar .foldout::before
#kactus-app-toolbar .foldout::before
{
content: "";
position: absolute;
Expand Down

0 comments on commit 1d98702

Please sign in to comment.