diff --git a/package-lock.json b/package-lock.json index a84d662..be5ff4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,6 @@ "name": "geoproject", "version": "0.0.0", "dependencies": { - "@melloware/coloris": "^0.25.0", "highlight.js": "^11.11.1", "pagedjs": "^0.4.3", "pinia": "^3.0.4", @@ -533,12 +532,6 @@ "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "license": "MIT" }, - "node_modules/@melloware/coloris": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/@melloware/coloris/-/coloris-0.25.0.tgz", - "integrity": "sha512-RBWVFLjWbup7GRkOXb9g3+ZtR9AevFtJinrRz2cYPLjZ3TCkNRGMWuNbmQWbZ5cF3VU7aQDZwUsYgIY/bGrh2g==", - "license": "MIT" - }, "node_modules/@rolldown/pluginutils": { "version": "1.0.0-beta.50", "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.50.tgz", diff --git a/package.json b/package.json index 1b82269..03d6604 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "preview": "vite preview" }, "dependencies": { - "@melloware/coloris": "^0.25.0", "highlight.js": "^11.11.1", "pagedjs": "^0.4.3", "pinia": "^3.0.4", diff --git a/public/assets/css/editor-ui.css b/public/assets/css/editor-ui.css new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/public/assets/css/editor-ui.css @@ -0,0 +1 @@ + diff --git a/public/assets/css/src/_print-styles.scss b/public/assets/css/print-styles.css similarity index 100% rename from public/assets/css/src/_print-styles.scss rename to public/assets/css/print-styles.css diff --git a/public/assets/css/src/_buttons.scss b/public/assets/css/src/_buttons.scss deleted file mode 100644 index 970b909..0000000 --- a/public/assets/css/src/_buttons.scss +++ /dev/null @@ -1,21 +0,0 @@ -button { - cursor: pointer; - - border: 1px solid var(--color-browngray-300); - color: var(--color-browngray-300); - border-radius: var(--border-radius); - padding: 0.1rem 0.3rem; - - &.active { - border: 1px solid #000; - color: #000; - } - - &.tab { - &.active { - background-color: #000; - color: #fff; - border: none; - } - } -} diff --git a/public/assets/css/src/_forms.scss b/public/assets/css/src/_forms.scss deleted file mode 100644 index 34ce9ce..0000000 --- a/public/assets/css/src/_forms.scss +++ /dev/null @@ -1,72 +0,0 @@ -select, -input[type="text"], -input[type="number"] { - background-color: var(--color-browngray-300); -} - -.field--view-only { - opacity: 0.3; -} - -.settings-section { - h2 { - border-bottom: 1px solid #000; - } - .settings-subsection:not(:last-child) { - border-bottom: 1px solid var(--color-browngray-050); - } - - .settings-subsection { - padding: 0.5rem 0; - - .field { - display: flex; - label { - width: 50%; - } - - .input-with-unit { - display: flex; - } - - .input-with-color { - .clr-field { - display: flex; - button { - position: absolute; - transform: none; - height: 1rem; - top: auto; - right: auto; - cursor: pointer; - } - - input { - padding-left: 2.5rem; - } - } - } - } - - &.margins { - display: flex; - flex-wrap: wrap; - h3 { - width: 100%; - } - .field { - width: 50%; - - label { - width: 50%; - } - - .input-with-unit { - input { - width: 50%; - } - } - } - } - } -} diff --git a/public/assets/css/src/_reset.scss b/public/assets/css/src/_reset.scss deleted file mode 100644 index ed3fb95..0000000 --- a/public/assets/css/src/_reset.scss +++ /dev/null @@ -1,27 +0,0 @@ -body, -html { - padding: 0; - margin: 0; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; -} - -input, -select { - border: none; - outline: none; - - border-radius: var(--border-radius); -} - -button { - background-color: transparent; - border: none; -} diff --git a/public/assets/css/src/_text.scss b/public/assets/css/src/_text.scss deleted file mode 100644 index 6c537a3..0000000 --- a/public/assets/css/src/_text.scss +++ /dev/null @@ -1,15 +0,0 @@ -body, -h1, -h2, -h3, -h4, -h5, -h6, -p, -a, -input, -select, -figcaption, -label { - font-family: sans-serif; -} diff --git a/public/assets/css/src/_variables.scss b/public/assets/css/src/_variables.scss deleted file mode 100644 index b9a0427..0000000 --- a/public/assets/css/src/_variables.scss +++ /dev/null @@ -1,8 +0,0 @@ -:root { - --color-panel-bg: #e8e6e5; - --color-browngray-050: #f5f3f0; - --color-browngray-200: #d0c4ba; - --color-browngray-300: #b5a9a1; - - --border-radius: 0.2rem; -} diff --git a/public/assets/css/style.css b/public/assets/css/style.css deleted file mode 100644 index 4f98705..0000000 --- a/public/assets/css/style.css +++ /dev/null @@ -1,145 +0,0 @@ -body, -html { - padding: 0; - margin: 0; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; -} - -input, -select { - border: none; - outline: none; - border-radius: var(--border-radius); -} - -button { - background-color: transparent; - border: none; -} - -:root { - --color-panel-bg: #e8e6e5; - --color-browngray-050: #f5f3f0; - --color-browngray-200: #d0c4ba; - --color-browngray-300: #b5a9a1; - --border-radius: 0.2rem; -} - -body, -h1, -h2, -h3, -h4, -h5, -h6, -p, -a, -input, -select, -figcaption, -label { - font-family: sans-serif; -} - -/* PagedJS print styles */ -@page { - size: A4; - margin: 20mm 15mm 26mm 15mm; -} -h2 { - -moz-column-break-before: page; - break-before: page; -} - -@page { - @bottom-center { - content: string(title); - } -} -.chapter > h2 { - string-set: title content(text); -} - -select, -input[type=text], -input[type=number] { - background-color: var(--color-browngray-300); -} - -.field--view-only { - opacity: 0.3; -} - -.settings-section h2 { - border-bottom: 1px solid #000; -} -.settings-section .settings-subsection:not(:last-child) { - border-bottom: 1px solid var(--color-browngray-050); -} -.settings-section .settings-subsection { - padding: 0.5rem 0; -} -.settings-section .settings-subsection .field { - display: flex; -} -.settings-section .settings-subsection .field label { - width: 50%; -} -.settings-section .settings-subsection .field .input-with-unit { - display: flex; -} -.settings-section .settings-subsection .field .input-with-color .clr-field { - display: flex; -} -.settings-section .settings-subsection .field .input-with-color .clr-field button { - position: absolute; - transform: none; - height: 1rem; - top: auto; - right: auto; - cursor: pointer; -} -.settings-section .settings-subsection .field .input-with-color .clr-field input { - padding-left: 2.5rem; -} -.settings-section .settings-subsection.margins { - display: flex; - flex-wrap: wrap; -} -.settings-section .settings-subsection.margins h3 { - width: 100%; -} -.settings-section .settings-subsection.margins .field { - width: 50%; -} -.settings-section .settings-subsection.margins .field label { - width: 50%; -} -.settings-section .settings-subsection.margins .field .input-with-unit input { - width: 50%; -} - -button { - cursor: pointer; - border: 1px solid var(--color-browngray-300); - color: var(--color-browngray-300); - border-radius: var(--border-radius); - padding: 0.1rem 0.3rem; -} -button.active { - border: 1px solid #000; - color: #000; -} -button.tab.active { - background-color: #000; - color: #fff; - border: none; -}/*# sourceMappingURL=style.css.map */ \ No newline at end of file diff --git a/public/assets/css/style.css.map b/public/assets/css/style.css.map deleted file mode 100644 index 3fafa0d..0000000 --- a/public/assets/css/style.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["src/_reset.scss","style.css","src/_variables.scss","src/_text.scss","src/_print-styles.scss","src/_forms.scss","src/_buttons.scss"],"names":[],"mappings":"AAAA;;EAEE,UAAA;EACA,SAAA;ACCF;;ADEA;;;;;;EAME,SAAA;ACCF;;ADEA;;EAEE,YAAA;EACA,aAAA;EAEA,mCAAA;ACAF;;ADGA;EACE,6BAAA;EACA,YAAA;ACAF;;ACzBA;EACE,yBAAA;EACA,8BAAA;EACA,8BAAA;EACA,8BAAA;EAEA,uBAAA;AD2BF;;AEjCA;;;;;;;;;;;;;EAaE,uBAAA;AFoCF;;AGjDA,yBAAA;AACA;EACE,QAAA;EACA,2BAAA;AHoDF;AGlDA;EACE,8BAAA;OAAA,kBAAA;AHoDF;;AGjDA;EACE;IACE,sBAAA;EHoDF;AACF;AGlDA;EACE,+BAAA;AHoDF;;AInEA;;;EAGE,4CAAA;AJsEF;;AInEA;EACE,YAAA;AJsEF;;AIlEE;EACE,6BAAA;AJqEJ;AInEE;EACE,mDAAA;AJqEJ;AIlEE;EACE,iBAAA;AJoEJ;AIlEI;EACE,aAAA;AJoEN;AInEM;EACE,UAAA;AJqER;AIlEM;EACE,aAAA;AJoER;AIhEQ;EACE,aAAA;AJkEV;AIjEU;EACE,kBAAA;EACA,eAAA;EACA,YAAA;EACA,SAAA;EACA,WAAA;EACA,eAAA;AJmEZ;AIhEU;EACE,oBAAA;AJkEZ;AI5DI;EACE,aAAA;EACA,eAAA;AJ8DN;AI7DM;EACE,WAAA;AJ+DR;AI7DM;EACE,UAAA;AJ+DR;AI7DQ;EACE,UAAA;AJ+DV;AI3DU;EACE,UAAA;AJ6DZ;;AK9HA;EACE,eAAA;EAEA,4CAAA;EACA,iCAAA;EACA,mCAAA;EACA,sBAAA;ALgIF;AK9HE;EACE,sBAAA;EACA,WAAA;ALgIJ;AK5HI;EACE,sBAAA;EACA,WAAA;EACA,YAAA;AL8HN","file":"style.css"} \ No newline at end of file diff --git a/public/assets/css/style.scss b/public/assets/css/style.scss deleted file mode 100644 index 3b96e2f..0000000 --- a/public/assets/css/style.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import "src/_reset.scss"; -@import "src/_variables.scss"; -@import "src/_text.scss"; -@import "src/_print-styles.scss"; -@import "src/_forms.scss"; -@import "src/_buttons.scss"; diff --git a/public/site/snippets/header.php b/public/site/snippets/header.php index 75fd430..8326578 100644 --- a/public/site/snippets/header.php +++ b/public/site/snippets/header.php @@ -8,8 +8,8 @@ isHomePage() != true, $page->title() . ' - ') . $site->title() ?> - - + + diff --git a/src/App.vue b/src/App.vue index 89efbfc..b5d616a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,7 @@ @@ -76,6 +71,8 @@ onMounted(() => renderPreview(true)); + + @@ -83,8 +80,8 @@ onMounted(() => renderPreview(true)); #preview-frame { position: fixed; top: 0; - left: 0; - width: 100vw; + left: 250px; + width: calc(100% - 600px); height: 100vh; border: none; } diff --git a/src/components/StylesheetViewer.vue b/src/components/StylesheetViewer.vue index 012f251..5782ddc 100644 --- a/src/components/StylesheetViewer.vue +++ b/src/components/StylesheetViewer.vue @@ -1,5 +1,5 @@ - diff --git a/src/components/editor/PageSettings.vue b/src/components/editor/PageSettings.vue index 09630f2..2bd7f21 100644 --- a/src/components/editor/PageSettings.vue +++ b/src/components/editor/PageSettings.vue @@ -2,49 +2,43 @@

Réglage des pages

-
-
- - -
+
+ +
-
-
- - - -
- -
- - - -
+
+ +
-
+
+ + +
+ +

Marges

-
+
-
+
-
+
-
+
-
-
- -
- - +
+ +
+ +
+ +
-
-
- - -
+
+ +
-
-
- - -
+
+ + +
-
- - -
+
+ +
diff --git a/src/components/editor/TextSettings.vue b/src/components/editor/TextSettings.vue index 451b682..a72a39f 100644 --- a/src/components/editor/TextSettings.vue +++ b/src/components/editor/TextSettings.vue @@ -2,8 +2,8 @@

Réglage du texte

- Ces réglages s'appliquent à l'ensemble des éléments du document. Vous - pouvez modifier ensuite les éléments indépendamment. + Ces réglages s'appliquent à l'ensemble des éléments du document. + Vous pouvez modifier ensuite les éléments indépendamment.

@@ -17,7 +17,11 @@
- +
@@ -80,7 +84,7 @@
-
+
- + -
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/src/style.css b/src/style.css index 699de50..e25f678 100644 --- a/src/style.css +++ b/src/style.css @@ -1 +1,2 @@ -@import url('/assets/css/style.css'); +@import url('/assets/css/pagedjs-interface.css'); +@import url('/assets/css/editor-ui.css');