From e550363c67b16f551a9151547138f7a8a9abec06 Mon Sep 17 00:00:00 2001 From: scott1702 Date: Thu, 24 Mar 2016 12:32:38 +1300 Subject: [PATCH] - Add GridfieldActionsComponent - Add ability to set desired relative width on gridfield cells --- admin/font/icon-reference.html | 58 +++++++++++++----- admin/font/silverstripe.eot | Bin 11372 -> 11604 bytes admin/font/silverstripe.svg | 8 ++- admin/font/silverstripe.ttf | Bin 11188 -> 11420 bytes admin/font/silverstripe.woff | Bin 8696 -> 8852 bytes .../src/components/action/README.md | 6 +- .../javascript/src/components/action/index.js | 11 ++-- .../src/components/action/styles.scss | 2 + .../form-builder/tests/form-builder-test.js | 5 -- .../components/grid-field-action/README.md | 13 ++++ .../src/components/grid-field-action/index.js | 28 +++++++++ .../components/grid-field-action/styles.scss | 20 ++++++ .../tests/grid-field-action.js | 5 ++ .../src/components/grid-field-cell/README.md | 4 ++ .../src/components/grid-field-cell/index.js | 22 ++++++- .../components/grid-field-cell/styles.scss | 14 +++++ .../grid-field-header-cell/README.md | 3 + .../grid-field-header-cell/index.js | 22 ++++++- .../grid-field-header-cell/styles.scss | 15 +++++ .../src/mocks/silverstripe-component.js | 15 +++++ .../src/sections/campaign-admin/styles.scss | 3 + .../src/sections/grid-field/index.js | 53 +++++++++++++--- .../src/state/schema/tests/reducer-test.js | 56 ++--------------- admin/javascript/src/styles/main.scss | 1 + admin/scss/_fonts.scss | 20 +++--- 25 files changed, 287 insertions(+), 97 deletions(-) create mode 100644 admin/javascript/src/components/grid-field-action/README.md create mode 100644 admin/javascript/src/components/grid-field-action/index.js create mode 100644 admin/javascript/src/components/grid-field-action/styles.scss create mode 100644 admin/javascript/src/components/grid-field-action/tests/grid-field-action.js create mode 100644 admin/javascript/src/mocks/silverstripe-component.js diff --git a/admin/font/icon-reference.html b/admin/font/icon-reference.html index dc0268306..1cfe19460 100644 --- a/admin/font/icon-reference.html +++ b/admin/font/icon-reference.html @@ -125,9 +125,6 @@ .font-icon-logout:before { content: "z"; } -.font-icon-cancel:before { - content: "D"; -} .font-icon-cancel-circled:before { content: "Q"; } @@ -155,9 +152,6 @@ .font-icon-cog:before { content: "Y"; } -.font-icon-rocket:before { - content: "Z"; -} .font-icon-install:before { content: "a"; } @@ -197,6 +191,18 @@ .font-icon-right-open-big:before { content: "\38"; } +.font-icon-dot-3:before { + content: "\39"; +} +.font-icon-save:before { + content: "\21"; +} +.font-icon-rocket:before { + content: "\5a"; +} +.font-icon-cancel:before { + content: "\44"; +} html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:inherit;font-size:100%;vertical-align:baseline} body{line-height:1;color:#000;background:#fff} @@ -339,10 +345,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
-
  • -
    - -
  • @@ -379,10 +381,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
  • -
  • -
    - -
  • @@ -435,6 +433,22 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
  • +
  • +
    + +
  • +
  • +
    + +
  • +
  • +
    + +
  • +
  • +
    + +
  • Character mapping