From fff332a196341906ddd8f7fb36dcca33572efea1 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 8 May 2014 15:29:12 +0100 Subject: [PATCH] updates to tabs --- .../static/wagtailadmin/scss/components/tabs.scss | 6 +++--- .../templates/wagtailadmin/styleguide/base.html | 2 +- wagtail/wagtailadmin/views/styleguide.py | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss index b0dec687d..7cd9a9397 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/tabs.scss @@ -39,16 +39,16 @@ color:$color-red !important; &:after{ - @include border-radius(50%); + @include border-radius(50px); @include box-shadow(1px 1px 2px rgba(0, 0, 0, 0.2)); position:absolute; right:-0.5em; top:-0.5em; z-index:5; - min-width:1em; + min-width:0.9em; color:white; background:$color-red; - border:2px solid darken($color-red,20%); + content:attr(data-count); padding:0 0.3em; line-height:1.4em; diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html index 9de469d3f..a7ad158d6 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html @@ -247,7 +247,7 @@
  • {% trans "Delete image" %}
  • - +

    TODO: Rich text

    TODO: page chooser

    TODO: image chooser

    TODO: document chooser

    diff --git a/wagtail/wagtailadmin/views/styleguide.py b/wagtail/wagtailadmin/views/styleguide.py index a53d884ef..68b194156 100644 --- a/wagtail/wagtailadmin/views/styleguide.py +++ b/wagtail/wagtailadmin/views/styleguide.py @@ -27,10 +27,8 @@ class ExampleForm(forms.Form): url = forms.URLField(required=True) email = forms.EmailField(max_length=254) date = forms.DateField() - rich_text = RichTextField() select = forms.ChoiceField(choices=CHOICES) boolean = forms.BooleanField(required=False) - page_chooser = forms.CharField(required=True, help_text="help text") @permission_required('wagtailadmin.access_admin') def index(request):