diff options
| author | Devine Lu Linvega <aliceffekt@gmail.com> | 2018-09-15 09:38:10 +1200 |
|---|---|---|
| committer | Devine Lu Linvega <aliceffekt@gmail.com> | 2018-09-15 09:38:10 +1200 |
| commit | 5941d10541a0fcfaaab11fc19c9f6ab5df554131 (patch) | |
| tree | 9bd12e8fb03ba39275261cd3194ef0bdf20f4ad2 | |
| parent | 4d5b9b40abbde37012701306b0824dfd7262ee72 (diff) | |
Migrated marble
| -rw-r--r-- | benchmark/index.html | 2 | ||||
| -rw-r--r-- | benchmark/links/main.css | 5 | ||||
| -rw-r--r-- | themes/TODO/marble.svg | 12 | ||||
| -rw-r--r-- | themes/TODO/snow.svg | 12 | ||||
| -rw-r--r-- | themes/TODO/tape.svg | 12 | ||||
| -rw-r--r-- | themes/marble.svg | 13 | ||||
| -rw-r--r-- | themes/snow.svg | 13 | ||||
| -rw-r--r-- | themes/tape.svg | 13 |
8 files changed, 42 insertions, 40 deletions
diff --git a/benchmark/index.html b/benchmark/index.html index b3af953..2627bb7 100644 --- a/benchmark/index.html +++ b/benchmark/index.html @@ -41,7 +41,7 @@ html += `<b>f_inv</b> b_inv <i>${theme.active.f_inv}</i>\n` count += 1 } - el.innerHTML = html+`\n<i>${count} conflicts</i>`; + el.innerHTML = count > 0 ? html+`\n<i>${count} conflicts</i>` : ''; } </script> </body> diff --git a/benchmark/links/main.css b/benchmark/links/main.css index e5fb109..dd5cbf7 100644 --- a/benchmark/links/main.css +++ b/benchmark/links/main.css @@ -1,7 +1,6 @@ body { font-size:14px; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; padding:30px; transition: background-color 500ms;} table { margin-bottom:30px; } -table tr th { padding:5px; text-align: left; font-weight: bold; } -table tr td { padding:5px; transition: background-color 250ms, color 250ms; } +table tr td { padding:5px 10px; transition: background-color 250ms, color 250ms; font-weight: bold; font-size:12px; } -#print { font-family: courier; font-size:12px; } +#print { font-family: courier; font-size:12px; padding:5px 10px; } #print b { font-weight: bold }
\ No newline at end of file diff --git a/themes/TODO/marble.svg b/themes/TODO/marble.svg deleted file mode 100644 index 9f8da87..0000000 --- a/themes/TODO/marble.svg +++ /dev/null @@ -1,12 +0,0 @@ - - <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1"> - <rect width='96' height='64' id='background' fill='#FBFBF2'></rect> - <circle cx='24' cy='24' r='8' id='f_high' fill='#847577'></circle> - <circle cx='40' cy='24' r='8' id='f_med' fill='#A6A2A2'></circle> - <circle cx='56' cy='24' r='8' id='f_low' fill='#A6A2A2'></circle> - <circle cx='72' cy='24' r='8' id='f_inv' fill='#FFFCF9'></circle> - <circle cx='24' cy='40' r='8' id='b_high' fill='#CFD2CD'></circle> - <circle cx='40' cy='40' r='8' id='b_med' fill='#676164'></circle> - <circle cx='56' cy='40' r='8' id='b_low' fill='#A6A2A2'></circle> - <circle cx='72' cy='40' r='8' id='b_inv' fill='#FFF'></circle> - </svg>
\ No newline at end of file diff --git a/themes/TODO/snow.svg b/themes/TODO/snow.svg deleted file mode 100644 index 46c3ba0..0000000 --- a/themes/TODO/snow.svg +++ /dev/null @@ -1,12 +0,0 @@ - - <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1"> - <rect width='96' height='64' id='background' fill='#eeefee'></rect> - <circle cx='24' cy='24' r='8' id='f_high' fill='#545454'></circle> - <circle cx='40' cy='24' r='8' id='f_med' fill='#545454'></circle> - <circle cx='56' cy='24' r='8' id='f_low' fill='#fbfbfb'></circle> - <circle cx='72' cy='24' r='8' id='f_inv' fill='#545454'></circle> - <circle cx='24' cy='40' r='8' id='b_high' fill='#fbfbfb'></circle> - <circle cx='40' cy='40' r='8' id='b_med' fill='#545454'></circle> - <circle cx='56' cy='40' r='8' id='b_low' fill='#f5f5f5'></circle> - <circle cx='72' cy='40' r='8' id='b_inv' fill='#ed2c3e'></circle> - </svg>
\ No newline at end of file diff --git a/themes/TODO/tape.svg b/themes/TODO/tape.svg deleted file mode 100644 index cfcd255..0000000 --- a/themes/TODO/tape.svg +++ /dev/null @@ -1,12 +0,0 @@ - - <svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1"> - <rect width='96' height='64' id='background' fill='#dad7cd'></rect> - <circle cx='24' cy='24' r='8' id='f_high' fill='#43423e'></circle> - <circle cx='40' cy='24' r='8' id='f_med' fill='#43423e'></circle> - <circle cx='56' cy='24' r='8' id='f_low' fill='#e5e3dc'></circle> - <circle cx='72' cy='24' r='8' id='f_inv' fill='#43423e'></circle> - <circle cx='24' cy='40' r='8' id='b_high' fill='#e5e3dc'></circle> - <circle cx='40' cy='40' r='8' id='b_med' fill='#43423e'></circle> - <circle cx='56' cy='40' r='8' id='b_low' fill='#e5e3dc'></circle> - <circle cx='72' cy='40' r='8' id='b_inv' fill='#eb3f48'></circle> - </svg>
\ No newline at end of file diff --git a/themes/marble.svg b/themes/marble.svg new file mode 100644 index 0000000..d2a9208 --- /dev/null +++ b/themes/marble.svg @@ -0,0 +1,13 @@ +<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1"> + <rect width='96' height='64' id='background' fill='#FBFBF2'></rect> + <!-- Foreground --> + <circle cx='24' cy='24' r='8' id='f_high' fill='#3a3738'></circle> + <circle cx='40' cy='24' r='8' id='f_med' fill='#847577'></circle> + <circle cx='56' cy='24' r='8' id='f_low' fill='#bdb8b8'></circle> + <circle cx='72' cy='24' r='8' id='f_inv' fill='#A6A2A2'></circle> + <!-- Background --> + <circle cx='24' cy='40' r='8' id='b_high' fill='#676164'></circle> + <circle cx='40' cy='40' r='8' id='b_med' fill='#A6A2A2'></circle> + <circle cx='56' cy='40' r='8' id='b_low' fill='#CFD2CD'></circle> + <circle cx='72' cy='40' r='8' id='b_inv' fill='#676164'></circle> +</svg>
\ No newline at end of file diff --git a/themes/snow.svg b/themes/snow.svg new file mode 100644 index 0000000..e40c05d --- /dev/null +++ b/themes/snow.svg @@ -0,0 +1,13 @@ +<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1"> + <rect width='96' height='64' id='background' fill='#eeefee'></rect> + <!-- Foreground --> + <circle cx='24' cy='24' r='8' id='f_high' fill='#545454'></circle> + <circle cx='40' cy='24' r='8' id='f_med' fill='#545454'></circle> + <circle cx='56' cy='24' r='8' id='f_low' fill='#fbfbfb'></circle> + <circle cx='72' cy='24' r='8' id='f_inv' fill='#545454'></circle> + <!-- Background --> + <circle cx='24' cy='40' r='8' id='b_high' fill='#fbfbfb'></circle> + <circle cx='40' cy='40' r='8' id='b_med' fill='#545454'></circle> + <circle cx='56' cy='40' r='8' id='b_low' fill='#f5f5f5'></circle> + <circle cx='72' cy='40' r='8' id='b_inv' fill='#ed2c3e'></circle> +</svg>
\ No newline at end of file diff --git a/themes/tape.svg b/themes/tape.svg new file mode 100644 index 0000000..c6ae89d --- /dev/null +++ b/themes/tape.svg @@ -0,0 +1,13 @@ +<svg width="96px" height="64px" xmlns="http://www.w3.org/2000/svg" baseProfile="full" version="1.1"> + <rect width='96' height='64' id='background' fill='#dad7cd'></rect> + <!-- Foreground --> + <circle cx='24' cy='24' r='8' id='f_high' fill='#43423e'></circle> + <circle cx='40' cy='24' r='8' id='f_med' fill='#43423e'></circle> + <circle cx='56' cy='24' r='8' id='f_low' fill='#e5e3dc'></circle> + <circle cx='72' cy='24' r='8' id='f_inv' fill='#43423e'></circle> + <!-- Background --> + <circle cx='24' cy='40' r='8' id='b_high' fill='#e5e3dc'></circle> + <circle cx='40' cy='40' r='8' id='b_med' fill='#43423e'></circle> + <circle cx='56' cy='40' r='8' id='b_low' fill='#e5e3dc'></circle> + <circle cx='72' cy='40' r='8' id='b_inv' fill='#eb3f48'></circle> +</svg>
\ No newline at end of file |
