Merge branch 'master' into master

This commit is contained in:
Lospec
2020-03-07 17:52:45 -05:00
committed by GitHub
4 changed files with 96 additions and 72 deletions

View File

@ -138,7 +138,7 @@ svg {
float: left;
height: 100%;
}
li button {
li button, li a {
color: color(menu, foreground);
height: 100%;
padding: 17px;
@ -167,15 +167,21 @@ svg {
padding-bottom: 2px;
li {
width: 100%;
button {
button, a {
width: 100%;
text-align: left;
padding: 8px 32px 8px 16px;
font-size: 1em;
&:hover {
background-color: color(menu, background, hover);
color: color(menu, foreground, hover);
}
}
a {
display: block;
text-decoration: none;
box-sizing: border-box;
}
}
}
.disabled {
@ -226,7 +232,7 @@ svg {
li {
width: 48px;
flex-basis: 48px;
&:not(.noshrink) {
flex-grow: 1;
}
@ -234,7 +240,7 @@ svg {
flex-grow: 0;
flex-shrink: 0;
}
}
}
}
//added when the color is a duplicate of another
@ -327,7 +333,7 @@ svg {
#add-color-button {
background: color(base);
path {
fill: #6f6873;
}
@ -498,7 +504,7 @@ svg {
border-bottom: dotted 1px color(base, foreground, text);
}
}
.close-button {
width: 32px;
height: 32px;
@ -522,7 +528,7 @@ svg {
}
}
}
button.default {
float: right;
background: color(button);
@ -536,7 +542,7 @@ svg {
background: color(button, background, hover);
}
}
input {
background: color(indent);
border: none;
@ -547,7 +553,7 @@ svg {
width: 60px;
text-align: center;
}
.dropdown-button {
background: color(button) url('/pixel-editor/dropdown-arrow.png') right center no-repeat;
border: none;
@ -565,7 +571,7 @@ svg {
border-radius: 4px 4px 0 0;
}
}
.dropdown-menu {
background: color(button);
border: none;
@ -581,7 +587,7 @@ svg {
&.selected {
display: block;
}
button {
background: color(button);
border: none;
@ -707,7 +713,7 @@ svg {
position: relative;
width: 100%;
height: 100%;
div {
width: 400px;
background-color: color(base);
@ -718,7 +724,7 @@ svg {
position: absolute;
top: 50%;
left: 50%;
margin: -120px 0 0 -220px;
}
}