aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/css/box.nim (renamed from src/layout/box.nim)2
-rw-r--r--src/css/cascade.nim2
-rw-r--r--src/css/cssvalues.nim2
-rw-r--r--src/css/layout.nim (renamed from src/layout/engine.nim)4
-rw-r--r--src/css/lunit.nim (renamed from src/layout/layoutunit.nim)0
-rw-r--r--src/css/render.nim (renamed from src/layout/renderdocument.nim)6
-rw-r--r--src/local/container.nim2
-rw-r--r--src/local/pager.nim4
-rw-r--r--src/server/buffer.nim2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/layout/box.nim b/src/css/box.nim
index af61b88a..a40cd4af 100644
--- a/src/layout/box.nim
+++ b/src/css/box.nim
@@ -1,7 +1,7 @@
import css/cssvalues
+import css/lunit
import css/stylednode
import types/bitmap
-import layout/layoutunit
type
DimensionType* = enum
diff --git a/src/css/cascade.nim b/src/css/cascade.nim
index 5f2c7472..4d8f86c8 100644
--- a/src/css/cascade.nim
+++ b/src/css/cascade.nim
@@ -5,6 +5,7 @@ import std/tables
import chame/tags
import css/cssparser
import css/cssvalues
+import css/lunit
import css/match
import css/mediaquery
import css/selectorparser
@@ -14,7 +15,6 @@ import html/catom
import html/dom
import html/enums
import js/jscolor
-import layout/layoutunit
import types/color
import types/opt
diff --git a/src/css/cssvalues.nim b/src/css/cssvalues.nim
index bfe65804..1715511c 100644
--- a/src/css/cssvalues.nim
+++ b/src/css/cssvalues.nim
@@ -5,9 +5,9 @@ import std/strutils
import std/tables
import css/cssparser
+import css/lunit
import css/selectorparser
import types/bitmap
-import layout/layoutunit
import types/color
import types/opt
import types/winattrs
diff --git a/src/layout/engine.nim b/src/css/layout.nim
index 5962556b..e535b2b7 100644
--- a/src/layout/engine.nim
+++ b/src/css/layout.nim
@@ -2,10 +2,10 @@ import std/algorithm
import std/math
import css/cssvalues
+import css/lunit
import css/stylednode
+import css/box
import types/bitmap
-import layout/box
-import layout/layoutunit
import types/winattrs
import utils/luwrap
import utils/strwidth
diff --git a/src/layout/layoutunit.nim b/src/css/lunit.nim
index 1b526fb7..1b526fb7 100644
--- a/src/layout/layoutunit.nim
+++ b/src/css/lunit.nim
diff --git a/src/layout/renderdocument.nim b/src/css/render.nim
index cc6de9f7..6db0a9de 100644
--- a/src/layout/renderdocument.nim
+++ b/src/css/render.nim
@@ -1,10 +1,10 @@
import std/algorithm
+import css/box
import css/cssvalues
+import css/layout
+import css/lunit
import css/stylednode
-import layout/box
-import layout/engine
-import layout/layoutunit
import types/bitmap
import types/cell
import types/color
diff --git a/src/local/container.nim b/src/local/container.nim
index a4138634..527c4975 100644
--- a/src/local/container.nim
+++ b/src/local/container.nim
@@ -7,9 +7,9 @@ import std/tables
import chagashi/charset
import config/config
import config/mimetypes
+import css/render
import io/dynstream
import io/promise
-import layout/renderdocument
import loader/headers
import loader/loaderiface
import loader/request
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 0e54cd02..b5b84b27 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -10,20 +10,20 @@ import chagashi/charset
import config/chapath
import config/config
import config/mailcap
+import css/render
import io/bufreader
import io/dynstream
import io/poll
import io/promise
import io/tempfile
-import loader/urlfilter
import js/console
import js/timeout
-import layout/renderdocument
import loader/connecterror
import loader/headers
import loader/loaderiface
import loader/request
import loader/response
+import loader/urlfilter
import local/container
import local/lineedit
import local/select
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index 246e0c64..ec4b38f4 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -14,6 +14,7 @@ import config/config
import css/cascade
import css/cssparser
import css/cssvalues
+import css/render
import css/sheet
import css/stylednode
import html/catom
@@ -30,7 +31,6 @@ import io/poll
import io/promise
import js/console
import js/timeout
-import layout/renderdocument
import loader/headers
import loader/loaderiface
import loader/request