Skip to content

Light grey theme #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 17 commits into from
Closed

Light grey theme #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e19c63b
Light grey theme
narcolepticinsomniac Jul 19, 2018
102782b
Light grey theme
narcolepticinsomniac Jul 19, 2018
a017035
Light grey theme
narcolepticinsomniac Jul 19, 2018
b2a74a4
Light grey theme
narcolepticinsomniac Jul 19, 2018
6c9da3e
Light grey theme
narcolepticinsomniac Jul 19, 2018
a3f35fb
Light grey theme
narcolepticinsomniac Jul 19, 2018
88fab41
Light grey theme
narcolepticinsomniac Jul 19, 2018
1f038ab
No effing spaces
narcolepticinsomniac Jul 19, 2018
d2aa924
No effing spaces
narcolepticinsomniac Jul 19, 2018
1f9b6eb
Fix fake button wrapping
narcolepticinsomniac Jul 19, 2018
7d60a5b
Fix-fake button wrapping
narcolepticinsomniac Jul 19, 2018
8ddd8fe
Dim buttons a bit
narcolepticinsomniac Jul 19, 2018
32ae853
applies-to margin/padding
narcolepticinsomniac Jul 19, 2018
fb07f2e
Only alter default CM other than outline
narcolepticinsomniac Jul 19, 2018
e9435c5
Color tweak
narcolepticinsomniac Jul 19, 2018
3ec0367
Color tweak
narcolepticinsomniac Jul 19, 2018
dc27af1
Color tweak
narcolepticinsomniac Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions edit/applies-to-line-widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function createAppliesToLineWidget(cm) {
}
};

actualStyle = $create('style');

fromLine = 0;
toLine = cm.doc.size;

Expand All @@ -145,7 +145,6 @@ function createAppliesToLineWidget(cm) {
cm.off('change', onChange);
cm.off('optionChange', onOptionChange);
chrome.runtime.onMessage.removeListener(onRuntimeMessage);
actualStyle.remove();
}

function onChange(cm, event) {
Expand Down Expand Up @@ -246,32 +245,6 @@ function createAppliesToLineWidget(cm) {

const border = fore.replace(/[\d.]+(?=\))/, MIN_LUMA_DIFF / 2);
const borderStyleForced = `1px ${hasBorder ? color.gutter.style.borderRightStyle : 'solid'} ${border}`;

actualStyle.textContent = `
.applies-to {
background-color: ${color.gutter.bg};
border-top: ${borderStyleForced};
border-bottom: ${borderStyleForced};
}
.applies-to label {
color: ${fore};
}
.applies-to input,
.applies-to button,
.applies-to select {
background: rgba(255, 255, 255, ${
Math.max(MIN_LUMA, Math.pow(Math.max(0, color.gutter.bgLuma - MIN_LUMA * 2), 2)).toFixed(2)
});
border: ${borderStyleForced};
transition: none;
color: ${fore};
}
.applies-to .svg-icon.select-arrow {
fill: ${fore};
transition: none;
}
`;
document.documentElement.appendChild(actualStyle);
}

function doUpdate() {
Expand Down
80 changes: 62 additions & 18 deletions edit/edit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,35 @@
body {
margin: 0;
font: 12px arial,sans-serif;
color: hsl(0, 0%, 20%);
background-color: hsl(0, 0%, 86%);
}

.CodeMirror {
outline-style: solid !important;
outline-color: transparent!important;
outline-width: 1px !important;
outline-offset: -1px !important;
transition: outline-color .25s;
}

.CodeMirror-focused {
outline-color: hsl(180, 100%, 34%)!important;
}

.CodeMirror.cm-s-default {
background: hsl(0, 0%, 92%);
border: 1px solid hsl(0, 0%, 72%);
box-shadow: 0 0 0 1px hsla(0, 0%, 100%, .4);
}

.CodeMirror.cm-s-default .CodeMirror-gutters {
background-color: hsl(0, 0%, 90%) !important;
border-right: 1px solid hsl(0, 0%, 80%) !important;
}

.CodeMirror.cm-s-default .CodeMirror-activeline-background {
background: hsl(180, 22%, 88%) !important;
}

#global-progress {
Expand Down Expand Up @@ -41,6 +70,11 @@ label {
position: relative;
}

.applies-to label:hover,
label.code-label:hover {
color: hsl(0, 0%, 30%);
}

/************ header ************/
#header {
width: 280px;
Expand All @@ -49,13 +83,13 @@ label {
position: fixed;
top: 0;
padding: 1rem;
border-right: 1px dashed #AAA;
-webkit-box-shadow: 0 0 3rem -1.2rem black;
box-shadow: 0 0 3rem -1.2rem black;
box-sizing: border-box;
z-index: 10;
display: flex;
flex-direction: column;
background-color: hsl(0, 0%, 88%);
border-right: 1px solid hsl(0, 0%, 80%);
box-shadow: inset -1px 0 0 0 hsla(0, 0%, 100%, .4), 0 0 50px -18px #000;
}
#header h1 {
margin-top: 0;
Expand Down Expand Up @@ -161,15 +195,11 @@ label {
width: 14px;
height: 16px;
}
.svg-icon:hover,
.svg-icon.info,
.svg-icon.settings {
fill: #666;
.svg-icon {
fill: hsl(0, 0%, 56%);
}
.svg-icon,
.svg-icon.info:hover,
.svg-icon.settings:hover {
fill: #000;
.svg-icon:hover {
fill: hsl(0, 0%, 10%);
}
#options span .svg-icon {
margin-top: -3px; /* inline info and config icons */
Expand All @@ -188,17 +218,23 @@ input:invalid {
cursor: pointer;
margin-top: .5rem;
margin-bottom: .5rem;
transition: .25s color;
}

#header summary:hover {
color: #000;
}

#header summary h2 {
display: inline-block;
border-bottom: 1px dotted transparent;
margin-top: .1em;
margin-bottom: .1em;
transition: .25s border-color;
}

#header summary:hover h2 {
border-color: #bbb;
border-color: #000;
}

#header summary svg {
Expand Down Expand Up @@ -273,6 +309,7 @@ input:invalid {
}
#sections > div:not(:first-of-type) {
border-top: 2px solid hsl(0, 0%, 80%);
box-shadow: 0 -1px 0 0 hsla(0, 0%, 100%, .4), inset 0 1px 0 0 hsla(0, 0%, 100%, .4);
}
#sections > div:only-of-type .remove-section {
display: none;
Expand Down Expand Up @@ -392,7 +429,7 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
padding: 0;
height: 22px;
align-items: center;
margin: 0 .2em 0 0;
margin: 0 .35rem 0 0;
white-space: nowrap;
}
.applies-to ul {
Expand All @@ -410,6 +447,7 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
.applies-to li.applies-to-everything {
align-items: unset;
line-height: 22px;
padding-left: 12px;
}
.applies-to li > input {
min-height: 1.4rem;
Expand Down Expand Up @@ -444,14 +482,13 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
.add-applies-to .svg-icon,
.remove-applies-to .svg-icon {
pointer-events: none;
fill: hsl(0, 0%, 60%);
fill: hsl(0, 0%, 66%);
height: 12px;
width: 12px;
}
.add-applies-to:hover .svg-icon,
.remove-applies-to:hover .svg-icon {
pointer-events: none;
fill: hsl(0, 0%, 0%);
fill: hsl(0, 0%, 10%);
}
.test-regexp {
display: none;
Expand Down Expand Up @@ -526,7 +563,7 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
max-width: 50vw;
position: fixed;
display: none;
background-color: white;
background-color: hsl(0, 0%, 92%);
box-shadow: 3px 3px 30px rgba(0, 0, 0, 0.5);
padding: 0.5rem;
z-index: 99;
Expand All @@ -536,6 +573,7 @@ body[data-match-highlight="selection"] .CodeMirror-selection-highlight-scrollbar
max-width: 100%;
}
#help-popup.big {
background-color: hsl(0, 0%, 90%);
box-shadow: rgba(0, 0, 0, 0.45) 0px 0px 0px 100000px !important;
left: calc(280px - 3rem);
}
Expand Down Expand Up @@ -767,6 +805,10 @@ html:not(.usercss) .usercss-only,
margin: 1em 0;
padding: .75rem .75rem .25rem;
padding-right: calc(1em + 20px);
background-color: hsl(0, 0%, 88%);
border-top: 1px solid hsl(0, 0%, 80%);
border-bottom: 1px solid hsl(0, 0%, 80%);
box-shadow: inset 0 1px 0 0 hsla(0, 0%, 100%, .4), inset 0 -1px 0 0 hsla(0, 0%, 100%, .4);
}

.CodeMirror-linewidget .applies-to li {
Expand Down Expand Up @@ -797,7 +839,9 @@ html:not(.usercss) .usercss-only,
width: unset;
position: inherit;
border-right: none;
border-bottom: 1px dashed #AAA;
background-color: hsl(0, 0%, 90%);
border-bottom: 1px solid hsl(0, 0%, 80%);
box-shadow: inset 0 0 0 1px hsla(0, 0%, 100%, .4), 0 0 50px -18px #000;
padding: 0;
}
#actions {
Expand Down
Loading