CSS refactoring (flexbox, animations, skin variants)

settings.json.docker

@@ -95,6 +95,32 @@
    */
   "skinName": "${SKIN_NAME:colibris}",
 
+  /*
+   * Skin Variants
+   *
+   * Use the UI skin variants builder at /p/test#skinvariantsbuilder
+   *
+   * For the colibris skin only, you can choose how to render the three main
+   * containers:
+   * - toolbar (top menu with icons)
+   * - editor (containing the text of the pad)
+   * - background (area outside of editor, mostly visible when using page style)
+   *
+   * For each of the 3 containers you can choose 4 color combinations:
+   * super-light, light, dark, super-dark.
+   *
+   * For example, to make the toolbar dark, you will include "dark-toolbar" into
+   * skinVariants.
+   *
+   * You can provide multiple skin variants separated by spaces. Default
+   * skinVariant is "super-light-toolbar super-light-editor light-background".
+   *
+   * For the editor container, you can also make it full width by adding
+   * "full-width-editor" variant (by default editor is rendered as a page, with
+   * a max-width of 900px).
+   */
+  "skinVariants": "super-light-toolbar super-light-editor light-background",
+
   /*
    * IP and port which Etherpad should bind at.
    *

settings.json.template

@@ -86,6 +86,32 @@
    */
   "skinName": "colibris",
 
+  /*
+   * Skin Variants
+   *
+   * Use the UI skin variants builder at /p/test#skinvariantsbuilder
+   *
+   * For the colibris skin only, you can choose how to render the three main
+   * containers:
+   * - toolbar (top menu with icons)
+   * - editor (containing the text of the pad)
+   * - background (area outside of editor, mostly visible when using page style)
+   *
+   * For each of the 3 containers you can choose 4 color combinations:
+   * super-light, light, dark, super-dark.
+   *
+   * For example, to make the toolbar dark, you will include "dark-toolbar" into
+   * skinVariants.
+   *
+   * You can provide multiple skin variants separated by spaces. Default
+   * skinVariant is "super-light-toolbar super-light-editor light-background".
+   *
+   * For the editor container, you can also make it full width by adding
+   * "full-width-editor" variant (by default editor is rendered as a page, with
+   * a max-width of 900px).
+   */
+  "skinVariants": "super-light-toolbar super-light-editor light-background",
+
   /*
    * IP and port which Etherpad should bind at.
    *

src/locales/en.json

@@ -38,27 +38,6 @@
   "pad.settings.rtlcheck": "Read content from right to left?",
   "pad.settings.fontType": "Font type:",
   "pad.settings.fontType.normal": "Normal",
-  "pad.settings.fontType.opendyslexic": "Open Dyslexic",
-  "pad.settings.fontType.monospaced": "Monospace",
-  "pad.settings.fontType.montserrat": "Montserrat",
-  "pad.settings.fontType.comicsans": "Comic Sans",
-  "pad.settings.fontType.couriernew": "Courier New",
-  "pad.settings.fontType.georgia": "Georgia",
-  "pad.settings.fontType.impact": "Impact",
-  "pad.settings.fontType.lucida": "Lucida",
-  "pad.settings.fontType.lucidasans": "Lucida Sans",
-  "pad.settings.fontType.palatino": "Palatino",
-  "pad.settings.fontType.robotomono": "RobotoMono",
-  "pad.settings.fontType.tahoma": "Tahoma",
-  "pad.settings.fontType.timesnewroman": "Times New Roman",
-  "pad.settings.fontType.trebuchet": "Trebuchet",
-  "pad.settings.fontType.verdana": "Verdana",
-  "pad.settings.fontType.symbol": "Symbol",
-  "pad.settings.fontType.webdings": "Webdings",
-  "pad.settings.fontType.wingdings": "Wingdings",
-  "pad.settings.fontType.sansserif": "Sans Serif",
-  "pad.settings.fontType.serif": "Serif",
-  "pad.settings.globalView": "Global View",
   "pad.settings.language": "Language:",
 
   "pad.importExport.import_export": "Import/Export",

src/node/handler/PadMessageHandler.js

@@ -1065,6 +1065,7 @@ async function handleClientReady(client, message)
     // mile wide...
     var clientVars = {
       "skinName": settings.skinName,
+      "skinVariants": settings.skinVariants,
       "accountPrivs": {
           "maxRevisions": 100
       },

src/node/utils/Settings.js

@@ -62,6 +62,8 @@ exports.faviconTimeslider = "../../" + exports.favicon;
  */
 exports.skinName = null;
 
+exports.skinVariants = "super-light-toolbar super-light-editor light-background";
+
 /**
  * The IP ep-lite should listen to
  */

src/static/css/iframe_editor.css

@@ -1,46 +1,62 @@
-/* These CSS rules are included in both the outer and inner ACE iframe.
-   Also see inner.css, included only in the inner one.
+/*
+  These CSS rules are included in both the outer and inner ACE iframe (pad editor)
 */
 
 @import url('./lists_and_indents.css');
 
-html { cursor: text; } /* in Safari, produces text cursor for whole doc (inc. below body) */
-span { cursor: auto; }
+html.inner-editor {
+  height: auto !important;
+  background-color: transparent !important;
+}
+#outerdocbody {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  min-height: 100vh; /* take at least full height */
+}
+#outerdocbody iframe {
+  flex: 1 auto;
+  display: flex;
+}
+#outerdocbody #sidediv {
+  order: -1; /* display it on the first row positionning, i.e. on the left */
+}
 
-::selection {
-  background: #acf;
+/* ACE-PAD Container (i.e. where the text is displayed) */
+#innerdocbody {
+  padding: 10px;
+  overflow: hidden;
+  background-color: white;
 }
-::-moz-selection {
-  background: #acf;
+#innerdocbody, #sidediv {
+  padding-top: 10px; /* Both must have same top padding, so line number are aligned with the rows */
+  padding-bottom: 10px; /* some space when we scroll to the bottom */
 }
 
-a {
-  cursor: pointer !important;
-  white-space:pre-wrap;
+/* --------------------- */
+/* -- BROWSER SUPPORT -- */
+/* --------------------- */
+
+body.mozilla, body.safari {
+  display: table-cell; /* cause "body" area (e.g. where clicks are heard) to grow horizontally with text */
+}
+.safari div {
+  padding-right: 1px; /* prevents the caret from disappearing on the longest line of the doc */
 }
+span { line-height: 125%; }
+
+
+/* -------------- */
+/* -- WRAPPING -- */
+/* -------------- */
 
 body {
-  margin: 0;
   white-space: nowrap;
   word-wrap: normal;
 }
-
-#outerdocbody {
-  background-color: #fff;
-}
-body.grayedout { background-color: #eee !important }
-
-#innerdocbody {
-  font-size: 12px; /* overridden by body.style */
-  font-family:Arial, sans-serif; /* overridden by body.style */
-  line-height: 16px; /* overridden by body.style */
-  background-color: white;
-  color: black;
-}
-
 body.doesWrap {
+  display: block !important;
   /* white-space: pre-wrap; */
-
   /*
     Must be pre-wrap to keep trailing spaces. Otherwise you get a zombie caret,
     walking around your screen (see #1766).
@@ -53,86 +69,41 @@ body.doesWrap {
   */
   word-wrap: break-word; /* fix for issue #1648 - firefox not wrapping long lines (without spaces) correctly */
 }
-
 .noprewrap{
   white-space: normal;
 }
-
-body.doesWrap:not(.noprewrap) > div{
+body.doesWrap:not(.noprewrap) > div {
   /* Related to #1766 */
   white-space: pre-wrap;
 }
 
-#innerdocbody {
-  padding-top: 1px; /* important for some reason? */
-  padding-right: 10px;
-  padding-bottom: 8px;
-  padding-left: 1px /* prevents characters from looking chopped off in FF3 -- Removed because it added too much whitespace */;
-  overflow: hidden;
-  /* blank 1x1 gif, so that IE8 doesn't consider the body transparent */
-  background-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==);
-}
+
+/* ------------------------------------------ */
+/* -- SIDEDIV (line number, text author..) -- */
+/* ------------------------------------------ */
 
 #sidediv {
   font-size: 11px;
   font-family: monospace;
-  line-height: 16px; /* overridden by sideDiv.style */
-  padding-top: 8px; /* EDIT_BODY_PADDING_TOP */
-  padding-right: 3px; /* LINE_NUMBER_PADDING_RIGHT - 1 */
-  position: absolute;
-  width: 20px; /* MIN_LINEDIV_WIDTH */
-  top: 0;
-  left: 0;
-  cursor: default;
-  color: white;
+  padding-right: 5px;
+  padding-left: 12px;
+  background-color: transparent;
+  border-right: 1px solid #ccc;
 }
-
 #sidedivinner {
   text-align: right;
+  opacity: .9;
 }
-
-.sidedivdelayed { /* class set after sizes are set */
-  background-color: #eee;
-  color: #888 !important;
-  border-right: 1px solid #ccc;
-}
-.sidedivhidden {
-  display: none;
-}
-
-#outerdocbody iframe {
-  display: block; /* codemirror says it suppresses bugs */
-  position: relative;
-  left: 32px; /* MIN_LINEDIV_WIDTH + LINE_NUMBER_PADDING_RIGHT + EDIT_BODY_PADDING_LEFT */
-  top: 7px; /* EDIT_BODY_PADDING_TOP - 1*/
-  border: 0;
-  width: 1px; /* changed programmatically */
-  height: 1px; /* changed programmatically */
-}
-
-#outerdocbody .hotrect {
-  border: 1px solid #999;
-  position: absolute;
-}
-
-/* cause "body" area (e.g. where clicks are heard) to grow horizontally with text */
-body.mozilla, body.safari {
-  display: table-cell;
+#sidediv:not(.sidedivdelayed) { /* before sidediv get initialized, hide text */
+  color: transparent;
 }
-
-body.doesWrap {
-  display: block !important;
+#sidediv.sidedivhidden {
+  /* Do not use display: none to hide the sidediv, otherwise the parent container does not
+       get its height properly calculated by flexboxes */
+  visibility: hidden;
+  width: 0;
+  padding: 0;
 }
-
-.safari div {
-  /* prevents the caret from disappearing on the longest line of the doc */
-  padding-right: 1px;
-}
-
-p {
-  margin: 0;
-}
-
 #linemetricsdiv {
   position: absolute;
   left: -1000px;
@@ -142,11 +113,33 @@ p {
   font-size: 12px; /* overridden by lineMetricsDiv.style */
   font-family: monospace; /* overridden by lineMetricsDiv.style */
 }
+@media (max-width: 720px) {
+  #sidediv {
+    /* Do not use display: none to hide the sidediv, otherwise the parent container does not
+       get its height properly calculated by flexboxes */
+    visibility: hidden;
+    width: 0;
+    padding: 0;
+  }
+}
 
-/* Stops super long lines without being spaces such as aaaaaaaaaaaaaa*100 breaking the editor
-   Commented out because it stops IE from being able to render the document, crazy IE bug is crazy. */
-/*
-.ace-line{
-  overflow:hidden;
+
+
+
+/* ----------- */
+/* -- OTHER -- */
+/* ----------- */
+
+::selection {
+  background: #acf;
 }
-*/
+::-moz-selection {
+  background: #acf;
+}
+#innerdocbody a {
+  cursor: pointer !important;
+  white-space:pre-wrap;
+}
+body.grayedout {
+  background-color: #eee !important
+}