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

Commit

Permalink
improvement(theme): adds consistent color throughout theme & updates … (
Browse files Browse the repository at this point in the history
  • Loading branch information
2xAA authored May 17, 2020
1 parent fd026d8 commit e02945c
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 22 deletions.
14 changes: 8 additions & 6 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,20 @@ export default {
--fontSize: 14px;
--foreground-color-rgb: 255, 255, 255;
--foreground-color-a: 1;
--background-color: #141416;
--foreground-color-2: rgba(var(--foreground-color-rgb), 0.2);
--foreground-color-3: rgba(var(--foreground-color-rgb), 0.1);
--background-color: #000;
--foreground-color-2: rgba(var(--foreground-color-rgb), 0.4);
--foreground-color-3: rgba(var(--foreground-color-rgb), 0.2);
--columnGap: calc(var(--lineHeight));
--focus-color-rgb: 241, 196, 16;
--focus-color-a: 1;
--focus-color: rgba(var(--focus-color-rgb), var(--focus-color-a));
}
*::-webkit-scrollbar {
width: 14px;
height: 14px;
background-color: var(--foreground-color-3); /* or add it to the track */
background-color: var(--foreground-color-3);
}
*::-webkit-scrollbar-thumb {
Expand Down Expand Up @@ -294,8 +298,6 @@ body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
"Helvetica Neue", "微軟雅黑", "Microsoft YaHei", "微軟正黑體",
"Microsoft JhengHei", Verdana, Arial, sans-serif !important;
/* font-family: "IBM Plex Mono"; */
}
.hscreen {
Expand Down
32 changes: 25 additions & 7 deletions src/components/ActiveModule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,12 @@ export default {

<style scoped>
.has-link {
border: 1px solid rgba(255, 217, 0, 0.3);
border: 1px solid var(--focus-color);
}
.focused {
background-color: rgba(0, 0, 0, 0.3);
background-color: var(--foreground-color-3);
color: var(--background-color);
}
.padded-grid {
Expand Down Expand Up @@ -258,12 +259,29 @@ input[type="checkbox"] {
}
.handle {
vertical-align: middle;
width: 16px;
height: 16px;
border: 1px solid;
border-radius: 50%;
position: relative;
cursor: -webkit-grab;
height: 100%;
}
.handle::before,
.handle::after {
content: "";
right: 15%;
height: 11%;
left: 15%;
position: absolute;
border-top: 2px solid;
border-bottom: 2px solid;
}
.handle::before {
top: 16%;
}
.handle::after {
bottom: 21%;
}
</style>

Expand Down
4 changes: 2 additions & 2 deletions src/components/Control.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ export default {

<style scoped>
.has-link {
border: 1px solid rgba(255, 217, 0, 0.3);
border: 1px solid var(--focus-color);
}
.focused {
background-color: rgba(0, 0, 0, 0.3);
background-color: var(--foreground-color-2);
}
label {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Gallery.vue
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ grid.fluid {
}
div.gallery {
color: #fff;
color: var(--foreground-color);
display: flex;
flex-direction: column;
Expand Down
12 changes: 7 additions & 5 deletions src/components/Group.vue
Original file line number Diff line number Diff line change
Expand Up @@ -289,25 +289,27 @@ section.group-controls {
}
.focused div.group-title {
background-color: rgba(255, 138, 101, 0.6);
background-color: var(--foreground-color-3);
color: var(--foreground-color);
}
div.group-title {
padding: var(--baseline);
width: 100%;
background-color: rgba(255, 255, 255, 0.6);
background-color: var(--foreground-color-3);
color: var(--foreground-color-2);
box-sizing: border-box;
}
.focused div.group-modules {
background-color: rgba(191, 54, 12, 0.6);
background-color: var(--foreground-color-2);
}
div.group-modules {
display: flex;
overflow-x: auto;
min-height: 174px;
background-color: rgba(90, 90, 90, 0.6);
background-color: var(--foreground-color-3);
}
div.group-module {
Expand All @@ -330,7 +332,7 @@ div.group-module:not(:last-child)::after {
}
div.group-module-container {
background-color: rgba(90, 90, 90, 0.6);
background-color: var(--foreground-color-3);
width: 300px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/css/golden-layout_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

.lm_splitter:hover,
.lm_splitter.lm_dragging {
background: #bbbbbb;
background: var(--focus-color);
opacity: 1;
}

Expand Down

0 comments on commit e02945c

Please sign in to comment.