From 27889478d234df521143f29093bcd3ccfb58a606 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Thu, 8 May 2014 15:13:19 +0100 Subject: [PATCH] tweaks and change to space indenting --- .../wagtailadmin/scss/layouts/styleguide.scss | 148 +++++++++--------- .../wagtailadmin/styleguide/base.html | 2 +- 2 files changed, 78 insertions(+), 72 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss index 18c40d2d8..3d4cf5e5f 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/styleguide.scss @@ -2,87 +2,93 @@ @import "../mixins.scss"; @import "../grid.scss"; - - section{ - border-top:1px solid $color-grey-3; - margin-top:2em; - padding:0 0 2em 0; + border-top:1px solid $color-grey-3; + margin-top:2em; + padding:0 0 2em 0; - > h2:first-child{ - margin:0; - font-size:1em; - background:$color-grey-4; - padding:1em; - margin-bottom:1em; - } + > h2:first-child{ + margin:0; + font-size:1em; + background:$color-grey-4; + padding:1em; + margin-bottom:1em; + } } #palette{ - @include clearfix(); + @include clearfix(); - ul{ - @include clearfix(); - @include unlist(); - } + ul{ + @include clearfix(); + @include unlist(); + } - li{ - float:left; - width:100px; - height:100px; - padding:10px; - color:black; - } + li{ + float:left; + width:100px; + height:100px; + padding:10px; + color:black; + } - .color-teal{ - background-color:$color-teal; - } - .color-teal-darker{ - background-color:$color-teal-darker; - } - .color-teal-dark{ - background-color:$color-teal-dark; - } - .color-red{ - background-color:$color-red; - } - .color-orange{ - background-color:$color-orange; - } - .color-green{ - background-color:$color-green; - } - .color-grey-1{ - background-color:$color-grey-1; - } - .color-grey-1-1{ - background-color:$color-grey-1-1; - } - .color-grey-2{ - background-color:$color-grey-2; - } - .color-grey-3{ - background-color:$color-grey-3; - } - .color-grey-4{ - background-color:$color-grey-4; - } - .color-grey-5{ - background-color:$color-grey-5; - } + .color-teal{ + background-color:$color-teal; + } + .color-teal-darker{ + background-color:$color-teal-darker; + } + .color-teal-dark{ + background-color:$color-teal-dark; + } + .color-red{ + background-color:$color-red; + } + .color-orange{ + background-color:$color-orange; + } + .color-green{ + background-color:$color-green; + } + .color-grey-1{ + background-color:$color-grey-1; + } + .color-grey-1-1{ + background-color:$color-grey-1-1; + } + .color-grey-2{ + background-color:$color-grey-2; + } + .color-grey-3{ + background-color:$color-grey-3; + } + .color-grey-4{ + background-color:$color-grey-4; + } + .color-grey-5{ + background-color:$color-grey-5; + } } #icons{ - :before, :after{ - font-size:2em; - } - ul{ - -webkit-column-count:3; /* Chrome, Safari, Opera */ - -moz-column-count:3; /* Firefox */ - column-count:3; - } - li{ - margin-bottom:1em; - } + :before, :after{ + font-size:2em; + } + ul{ + -webkit-column-count:3; /* Chrome, Safari, Opera */ + -moz-column-count:3; /* Firefox */ + column-count:3; + } + li{ + margin-bottom:1em; + } + .spinner{ + position:relative; + } + .icon-spinner:after{ + color:red; + position:absolute; + + } } \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html index acb90f138..9de469d3f 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/styleguide/base.html @@ -365,7 +365,7 @@
  • order-down
  • order-up
  • bin
  • -
  • spinner
  • +
  • spinner
    spinner
  • pick
  • redirect
  • view