Code

Annotations redesign#27

Code

Closed

jessp wants to merge 32 commits intomasterskomputer/oligrapher:masterfrom annotations-revampskomputer/oligrapher:annotations-revampCopy head branch name to clipboard

Commits

Commits on Apr 27, 2016

• Changed save to absolute position so doesn't interfere with annotations in mobile layout

  jessp

  committed
  c04e531

  Copy full SHA for c04e531

• Restyled classes and added 100% height to container divs so that we can set annotations height to 100%

  jessp

  committed
  d51deb4

  Copy full SHA for d51deb4

• Altered CSS so height of svg is no longer contingent on windowsize at load

  jessp

  committed
  b3fea00

  Copy full SHA for b3fea00

• undid a dumb change I did for testing

  jessp

  committed
  9d00fce

  Copy full SHA for 9d00fce

• Moved 'New Annotation' button to form so only list will be scrollable

  jessp

  committed
  7af956f

  Copy full SHA for 7af956f

Commits on Apr 28, 2016

• Changed to flexbox -- will revert to alternative or use shim depending on desired browser support

  jessp

  committed
  ce07fef

  Copy full SHA for ce07fef

Commits on Apr 29, 2016

• minor changes

  jessp

  committed
  4c1c4f2

  Copy full SHA for 4c1c4f2

Commits on May 1, 2016

• Still broken, but less so

  jessp

  committed
  f43f3b9

  Copy full SHA for f43f3b9

Commits on May 2, 2016

• Drag and drop no longer broken but ugly, other changes in progress.

  jessp

  committed
  2b34b79

  Copy full SHA for 2b34b79

Commits on May 3, 2016

• Slowly making changes

  jessp

  committed
  d517fdd

  Copy full SHA for d517fdd

• Drag and drop seems to be working though may rework the codde

  jessp

  committed
  b50f05d

  Copy full SHA for b50f05d

• Figuring out how to move editing functions directly into annotation list

  jessp

  committed
  5949c07

  Copy full SHA for 5949c07

• comparing to master

  jessp

  committed
  9d676d5

  Copy full SHA for 9d676d5

• Modied annotation lis to have annotation body and to 'show' properly

  jessp

  committed
  ef33a85

  Copy full SHA for ef33a85

Commits on May 4, 2016

• updated styling

  jessp

  committed
  2c836f2

  Copy full SHA for 2c836f2

Commits on May 5, 2016

• Working on functions + removed no longer user toggleEditor function

  jessp

  committed
  51119c7

  Copy full SHA for 51119c7

• figuring out redux

  jessp

  committed
  ffac399

  Copy full SHA for ffac399

Commits on May 6, 2016

• Working on redux functions

  jessp

  committed
  1750b05

  Copy full SHA for 1750b05

Commits on May 10, 2016

• toggling edit annotations mode seems to work

  jessp

  committed
  5bdaae5

  Copy full SHA for 5bdaae5

Commits on May 11, 2016

• lied, still was much to to

  jessp

  committed
  d92eb40

  Copy full SHA for d92eb40

Commits on May 12, 2016

• fixed some issues with toggling between annotation mode and edit mode

  jessp

  committed
  cb463b5

  Copy full SHA for cb463b5

Commits on May 17, 2016

• continuing annotations revamp

  jessp

  committed
  6931b64

  Copy full SHA for 6931b64

Commits on May 19, 2016

• added new annotations, reworking margins

  jessp

  committed
  7ba3a47

  Copy full SHA for 7ba3a47

• margins edited, tests to come

  jessp

  committed
  5e25b8f

  Copy full SHA for 5e25b8f

• reverted from flexbox layout to keep button positioning the same

  jessp

  committed
  33c152f

  Copy full SHA for 33c152f

Commits on May 23, 2016

• fixed bug where clicking nodes turned off editing styles

  jessp

  committed
  f2971db

  Copy full SHA for f2971db

Commits on May 24, 2016

• Integrating medium editor, updated medium editor and anchor seems buggy

  jessp

  committed
  8e3ae8b

  Copy full SHA for 8e3ae8b

• seems like anchor editor is broken in master branch as well. removing option until library is fixed

  jessp

  committed
  b454a93

  Copy full SHA for b454a93

• changing highlights based on edit mode

  jessp

  committed
  d7f37e5

  Copy full SHA for d7f37e5

• colour of node highlight changes based on mode, made tweaks based on if its in editor mode or pres mmode, changed some node status styles

  jessp

  committed
  76d2712

  Copy full SHA for 76d2712

• removed GraphAnnotationForm.jsx as capabilities implemented in GraphAnnotaionListItem.jsx

  jessp

  committed
  c953104

  Copy full SHA for c953104

• removed references to GraphAnnotationForm.jsx and styles

  jessp

  committed
  ab8db50

  Copy full SHA for ab8db50