|
1 | 1 | (ns lambdaisland.ornament |
2 | 2 | "CSS-in-clj(s)" |
3 | | -<<<<<<< Updated upstream |
4 | 3 | #?@ |
5 | 4 | (:clj |
6 | 5 | [(:require |
|
20 | 19 | [meta-merge.core :as meta-merge])] |
21 | 20 | :cljs |
22 | 21 | [(:require [clojure.string :as str] [garden.util :as gu])])) |
23 | | -||||||| Stash base |
24 | | - (:require [clojure.string :as str] |
25 | | - [meta-merge.core :as meta-merge] |
26 | | - #?@(:clj [[clojure.walk :as walk] |
27 | | - [garden.compiler :as gc] |
28 | | - [garden.core :as garden] |
29 | | - [garden.color :as gcolor] |
30 | | - [garden.types :as gt] |
31 | | - [garden.stylesheet :as gs] |
32 | | - [girouette.version :as girouette-version] |
33 | | - [girouette.tw.core :as girouette] |
34 | | - [girouette.tw.preflight :as girouette-preflight] |
35 | | - [girouette.tw.typography :as girouette-typography] |
36 | | - [girouette.tw.color :as girouette-color] |
37 | | - [girouette.tw.default-api :as girouette-default]])) |
38 | | - #?(:cljs |
39 | | - (:require-macros [lambdaisland.ornament :refer [defstyled]]))) |
40 | | -======= |
41 | | - (:require [clojure.string :as str] |
42 | | - [meta-merge.core :as meta-merge] |
43 | | - #?@(:clj [[clojure.walk :as walk] |
44 | | - [garden.compiler :as gc] |
45 | | - [garden.core :as garden] |
46 | | - [garden.color :as gcolor] |
47 | | - [garden.types :as gt] |
48 | | - [garden.stylesheet :as gs] |
49 | | - [girouette.version :as girouette-version] |
50 | | - [girouette.tw.core :as girouette] |
51 | | - [girouette.tw.preflight :as girouette-preflight] |
52 | | - [girouette.tw.typography :as girouette-typography] |
53 | | - [girouette.tw.color :as girouette-color]])) |
54 | | - #?(:cljs |
55 | | - (:require-macros [lambdaisland.ornament :refer [defstyled]]))) |
56 | | ->>>>>>> Stashed changes |
57 | 22 |
|
58 | 23 | #?(:clj |
59 | 24 | (defonce ^{:doc "Registry of styled components |
|
800 | 765 | rules (process-rules |
801 | 766 | (eval `(do |
802 | 767 | (in-ns '~(ns-name *ns*)) |
803 | | - ~(cons 'list rules))))] |
| 768 | + ~(cons 'clojure.core/list rules))))] |
804 | 769 | (register! rules-registry varsym {:rules rules}) |
805 | 770 | (when-not (:ns &env) |
806 | 771 | `(def ~rules-name ~(render-docstring docstring rules) '~rules))))) |
|
1008 | 973 | (sort-by :index) |
1009 | 974 | (mapcat :rules) |
1010 | 975 | process-rules)) |
1011 | | - |
0 commit comments