mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Drop redundant color color-grey-1-1

pull/4808/head
Coen van der Kamp 2018-09-22 22:23:09 +02:00 zatwierdzone przez Matt Westcott
rodzic 0970c760df
commit b001d0f127
4 zmienionych plików z 1 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
docs/_static/css/custom.css vendored
Wyświetl plik

@ -1,7 +1,7 @@
body.wy-body-for-nav {
font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica, Arial, sans-serif;
line-height: 1.5em;
color: #333; /*$color-grey-1-1*/
color: #333;
background-color: #e6e6e6; /*$color-grey-4*/
}

1
wagtail/admin/static_src/wagtailadmin/scss/_variables.scss
Wyświetl plik

@ -40,7 +40,6 @@ $color-black: #000;
// darker to lighter
$color-grey-1: darken($color-white, 80);
$color-grey-1-1: darken($color-white, 74.9);
$color-grey-2: darken($color-white, 60);
$color-grey-3: darken($color-white, 14.9);

8
wagtail/contrib/styleguide/static_src/wagtailstyleguide/scss/styleguide.scss
Wyświetl plik

@ -77,10 +77,6 @@ section {
color: $color-teal-dark;
}
.color-grey-1-1-text {
color: $color-grey-1-1;
}
.color-grey-2-text {
color: $color-grey-2;
}
@ -153,10 +149,6 @@ section {
background-color: $color-grey-1;
}
.color-grey-1-1 {
background-color: $color-grey-1-1;
}
.color-grey-2 {
background-color: $color-grey-2;
}

13
wagtail/contrib/styleguide/templates/wagtailstyleguide/base.html
Wyświetl plik

@ -90,7 +90,6 @@
<li class="color-salmon-light"><span class="color-red-text">color-red on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-black-text">color-black on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-grey-1-text">color-grey-1 on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-grey-1-1-text">color-grey-1-1 on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-grey-2-text">color-grey-2 on color-salmon-light</span></li>
</ul>
<ul class="contrast">
@ -124,13 +123,11 @@
<li class="color-grey-3"><span class="color-teal-dark-text">color-teal-dark on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-black-text">color-black on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-grey-1-text">color-grey-1 on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-grey-1-1-text">color-grey-1-1 on color-grey-3</span></li>
</ul>
<ul class="contrast">
<li class="color-grey-4"><span class="color-teal-dark-text">color-teal-dark on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-black-text">color-black on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-grey-1-text">color-grey-1 on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-grey-1-1-text">color-grey-1-1 on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-grey-2-text">color-grey-2 on color-grey-4</span></li>
</ul>
<ul class="contrast">
@ -138,7 +135,6 @@
<li class="color-grey-5"><span class="color-red-text">color-red on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-black-text">color-black on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-grey-1-text">color-grey-1 on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-grey-1-1-text">color-grey-1-1 on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-grey-2-text">color-grey-2 on color-grey-5</span></li>
</ul>
<ul class="contrast">
@ -147,7 +143,6 @@
<li class="color-red"><span class="color-grey-5-text">color-grey-5 on color-red</span></li>
<li class="color-orange"><span class="color-black-text">color-black on color-orange</span></li>
<li class="color-orange"><span class="color-grey-1-text">color-grey-1 on color-orange</span></li>
<li class="color-orange"><span class="color-grey-1-1-text">color-grey-1-1 on color-orange</span></li>
<li class="color-green"><span class="color-black-text">color-black on color-green</span></li>
<li class="color-blue"><span class="color-black-text">color-black on color-blue</span></li>
<li class="color-blue"><span class="color-grey-1-text">color-grey-1 on color-blue</span></li>
@ -159,7 +154,6 @@
<ul class="contrast contrast-large">
<li class="color-teal"><span class="color-black-text">color-black on color-teal</span></li>
<li class="color-teal"><span class="color-grey-1-text">color-grey-1 on color-teal</span></li>
<li class="color-teal"><span class="color-grey-1-1-text">color-grey-1-1 on color-teal</span></li>
<li class="color-teal-darker"><span class="color-salmon-light-text">color-salmon-light on color-teal-darker</span></li>
<li class="color-teal-darker"><span class="color-white-text">color-white on color-teal-darker</span></li>
<li class="color-teal-darker"><span class="color-black-text">color-black on color-teal-darker</span></li>
@ -176,14 +170,12 @@
<ul class="contrast contrast-large">
<li class="color-salmon"><span class="color-black-text">color-black on color-salmon</span></li>
<li class="color-salmon"><span class="color-grey-1-text">color-grey-1 on color-salmon</span></li>
<li class="color-salmon"><span class="color-grey-1-1-text">color-grey-1-1 on color-salmon</span></li>
<li class="color-salmon-light"><span class="color-teal-darker-text">color-teal-darker on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-teal-dark-text">color-teal-dark on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-red-text">color-red on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-green-text">color-green on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-black-text">color-black on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-grey-1-text">color-grey-1 on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-grey-1-1-text">color-grey-1-1 on color-salmon-light</span></li>
<li class="color-salmon-light"><span class="color-grey-2-text">color-grey-2 on color-salmon-light</span></li>
</ul>
<ul class="contrast contrast-large">
@ -225,7 +217,6 @@
<li class="color-grey-3"><span class="color-red-text">color-red on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-black-text">color-black on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-grey-1-text">color-grey-1 on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-grey-1-1-text">color-grey-1-1 on color-grey-3</span></li>
<li class="color-grey-3"><span class="color-grey-2-text">color-grey-2 on color-grey-3</span></li>
</ul>
<ul class="contrast contrast-large">
@ -235,7 +226,6 @@
<li class="color-grey-4"><span class="color-green-text">color-green on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-black-text">color-black on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-grey-1-text">color-grey-1 on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-grey-1-1-text">color-grey-1-1 on color-grey-4</span></li>
<li class="color-grey-4"><span class="color-grey-2-text">color-grey-2 on color-grey-4</span></li>
</ul>
<ul class="contrast contrast-large">
@ -245,7 +235,6 @@
<li class="color-grey-5"><span class="color-green-text">color-green on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-black-text">color-black on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-grey-1-text">color-grey-1 on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-grey-1-1-text">color-grey-1-1 on color-grey-5</span></li>
<li class="color-grey-5"><span class="color-grey-2-text">color-grey-2 on color-grey-5</span></li>
</ul>
<ul class="contrast contrast-large">
@ -261,7 +250,6 @@
<li class="color-orange"><span class="color-teal-dark-text">color-teal-dark on color-orange</span></li>
<li class="color-orange"><span class="color-black-text">color-black on color-orange</span></li>
<li class="color-orange"><span class="color-grey-1-text">color-grey-1 on color-orange</span></li>
<li class="color-orange"><span class="color-grey-1-1-text">color-grey-1-1 on color-orange</span></li>
</ul>
<ul class="contrast contrast-large">
<li class="color-green"><span class="color-white-text">color-white on color-green</span></li>
@ -275,7 +263,6 @@
<li class="color-blue"><span class="color-teal-dark-text">color-teal-dark on color-blue</span></li>
<li class="color-blue"><span class="color-black-text">color-black on color-blue</span></li>
<li class="color-blue"><span class="color-grey-1-text">color-grey-1 on color-blue</span></li>
<li class="color-blue"><span class="color-grey-1-1-text">color-grey-1-1 on color-blue</span></li>
</ul>
</section>