Merge branch 'master' into wayland_colorpick

README.md

@@ -78,7 +78,7 @@ ninja && sudo ninja install
 ## 🤔 Questions
 
 If you want to ask any questions about the project, join us on our public Matrix channel at 
-[#akiraux:matrix.org](https://matrix.to/#/!kpfeTRbpocQrOFCFnJ:matrix.org) or on IRC at #akiraux on Freenode.
+[#akiraux:matrix.org](https://matrix.to/#/#akiraux:matrix.org) or on IRC at #akiraux on LiberaChat.
 
 We also have a dedicated Discord channel available to any [Patreon](https://www.patreon.com/akiraux) supporters where we offer more direct support, and we're open to discussing new features and implementations.
 

data/css/layout.css

@@ -30,6 +30,16 @@
   padding: 8px 5px;
 }
 
+.color-grid flowboxchild {
+    background-color: transparent;
+}
+
+.color-picker label {
+    font-size: 9pt;
+    font-weight: bold;
+    color: @fg_color;
+}
+
 .popover-toggler {
     padding: 3px;
     margin: 3px;

data/css/option-panel.css

@@ -28,14 +28,21 @@
                       linear-gradient(to bottom, black 50%, white 50%);
     background-blend-mode: normal, difference, normal;
     background-size: 8px 8px;
-    border-radius: 3px 0 0 3px;
+}
+
+.selected-color-container {
+    border-radius: 4px 0 0 4px;
 }
 
 button.selected-color {
     border-radius: 3px 0 0 3px;
     border: 1px solid;
 }
 
+.saved-color-button {
+    border-radius: 4px;
+}
+
 /* spin button */
 .sidebar-l spinbutton.horizontal button.down,
 .sidebar-l spinbutton.horizontal button.up {

data/schemas/com.github.akiraux.akira.gschema.xml.in

@@ -107,6 +107,7 @@
             <summary>Default Border Width.</summary>
             <description>The default width of the border for a newly created shape.</description>
         </key>
+
         <key name="border-color" type="s">
             <default>'#AAAAAA'</default>
             <summary>Default Border Color.</summary>
@@ -178,5 +179,11 @@
             <summary>The alpha setting for exporting PNG images.</summary>
             <description>The alpha setting for exporting PNG images in the export dialog.</description>
         </key>
+
+        <key name="global-colors" type="as">
+            <default>[]</default>
+            <summary>The list of global colors</summary>
+            <description>Keep track of the colors saved by the user and available in every document file.</description>
+        </key>
     </schema>
 </schemalist>