Code

merge 2 prs together#15

Code

Open

srghma wants to merge 11 commits intoyesodweb:masteryesodweb/css-text:masterfrom srghma:mastersrghma/css-text:masterCopy head branch name to clipboard

+50-50

Commits

Commits on Jun 28, 2015

• Fixed the fixes to Arbitrary.

  Show description for af15e0d
  jgm

  committed
  af15e0d

  Copy full SHA for af15e0d

• Fixed NestedBlock parsing.

  Show description for 7c99a16
  jgm

  committed
  7c99a16

  Copy full SHA for 7c99a16

• Allow selectors starting with @ to directly contain attr lists.

  Show description for 83acf66
  jgm

  committed
  83acf66

  Copy full SHA for 83acf66

• Added some needed imports.

  jgm

  committed
  77b95f4

  Copy full SHA for 77b95f4

• More test improvements: make sure we test @font-face.

  jgm

  committed
  84225d4

  Copy full SHA for 84225d4

• Further simplifications and corrections to CSS parser.

  jgm

  committed
  92c6489

  Copy full SHA for 92c6489

• Use fmap instead of <$> in runtests.hs.

  Show description for 68ab318
  jgm

  committed
  68ab318

  Copy full SHA for 68ab318

Commits on Jul 1, 2019

• Fix: parse blocks after nested blocks.

  Show description for a4b5df8
  

  Dmytro S

  committed
  a4b5df8

  Copy full SHA for a4b5df8

Commits on Aug 19, 2020

• Merge branch 'jgm/master'

  srghma

  committed
  92bd2e7

  Copy full SHA for 92bd2e7

• Merge remote-tracking branch 'EarlGray/master'

  srghma

  committed
  2576afb

  Copy full SHA for 2576afb

• feat: stack -> update

  srghma

  committed
  9d31916

  Copy full SHA for 9d31916