1.6.6 - Style contrast fixes, minor fixes.

lainsce · Sep 18, 2018 · 9e97b90 · 9e97b90
1 parent 00983b0
commit 9e97b90
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 34 deletions.
diff --git a/data/com.github.lainsce.quilter.appdata.xml b/data/com.github.lainsce.quilter.appdata.xml
@@ -56,6 +56,14 @@
         <content_attribute id="money-gambling">none</content_attribute>
     </content_rating>
     <releases>
+      <release version="1.6.6" date="2018-09-21">
+        <description>
+           <p>Release: Stylish Readable Stories</p>
+           <ul>
+               <li>All text passes a contrast check to be readable now.</li>
+           </ul>
+        </description>
+     </release>
       <release version="1.6.2" date="2018-09-21">
         <description>
            <p>Release: Track Your Stuff Up</p>

diff --git a/data/schemes/quilter-sepia.xml b/data/schemes/quilter-sepia.xml
@@ -4,9 +4,9 @@
   <_description>Emphasis on focus.</_description>
 
   <style name="text"            foreground="#3b3228" background="#f0e8dd"/>
-  <style name="cursor"          foreground="#0cd2de"/>
+  <style name="cursor"          foreground="#07747B"/>
   <style name="current-line"    background="#c1a073"/>
-  <style name="selection"       foreground="#3b3228" background="#0cd2de"/>
+  <style name="selection"       foreground="#3b3228" background="#07747B"/>
   <style name="search-match"    foreground="#3b3228" background="#ded20c"/>
 
   <!-- Bold -->
@@ -16,8 +16,8 @@
   <style name="def:doc-comment-element" foreground="#c1a073" italic="true"/>
 
   <!-- Links -->
-  <style name="def:comment" foreground="#0cd2de"/>
-  <style name="def:underlined" foreground="#0cd2de"/>
+  <style name="def:comment" foreground="#07747B"/>
+  <style name="def:underlined" foreground="#07747B"/>
 
   <!-- Code -->
   <style name="def:identifier" foreground="#c1a073"/>
@@ -29,8 +29,8 @@
   <style name="def:preprocessor" foreground="#3b3228"/>
 
   <!-- Image marking in Links -->
-  <style name="def:shebang" foreground="#0cd2de"/>
-  <style name="def:constant" foreground="#0cd2de"/>
+  <style name="def:shebang" foreground="#07747B"/>
+  <style name="def:constant" foreground="#07747B"/>
 
   <!-- Backslash Escaping -->
   <style name="def:special-char" foreground="#c1a073"/>

diff --git a/data/schemes/quilter.xml b/data/schemes/quilter.xml
@@ -4,9 +4,9 @@
   <_description>Emphasis on focus.</_description>
 
   <style name="text"            foreground="#191919" background="#FAFAFA"/>
-  <style name="cursor"          foreground="#11BCED"/>
+  <style name="cursor"          foreground="#007D9E"/>
   <style name="current-line"    background="#eff0f1"/>
-  <style name="selection"       foreground="#EAEAEA" background="#11BCED"/>
+  <style name="selection"       foreground="#EAEAEA" background="#007D9E"/>
   <style name="search-match"    foreground="#191919" background="#EDBC11"/>
 
   <!-- Bold -->
@@ -16,8 +16,8 @@
   <style name="def:doc-comment-element" italic="true"/>
 
   <!-- Links -->
-  <style name="def:comment" foreground="#11BCED"/>
-  <style name="def:underlined" foreground="#11BCED"/>
+  <style name="def:comment" foreground="#007D9E"/>
+  <style name="def:underlined" foreground="#007D9E"/>
 
   <!-- Code -->
   <style name="def:identifier" background="#F0F0F0" foreground="#191919"/>
@@ -29,8 +29,8 @@
   <style name="def:preprocessor" foreground="#191919"/>
 
   <!-- Image marking in Links -->
-  <style name="def:shebang" foreground="#11BCED"/>
-  <style name="def:constant" foreground="#11BCED"/>
+  <style name="def:shebang" foreground="#007D9E"/>
+  <style name="def:constant" foreground="#007D9E"/>
 
   <!-- Backslash Escaping -->
   <style name="def:special-char" foreground="#B7B6B7"/>

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+com.github.lainsce.quilter (1.6.6) xenial; urgency=low
+
+  * Some styling fixes to pass WCAG AA.
+
+ -- Lains <[email protected]>  Fri, 21 Sep 2018 14:37:00 -0300
+
 com.github.lainsce.quilter (1.6.2) xenial; urgency=low
 
   * Button to track Chars/Words/Lines.

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 # Name our project
 project('com.github.lainsce.quilter', ['vala', 'c'],
-    version: '1.6.2'
+    version: '1.6.6'
 )
 
 # Import main lib files

diff --git a/src/Styles/quilter.vala b/src/Styles/quilter.vala
@@ -26,10 +26,13 @@ public class Quilter.Styles.quilter {
   public const string css="""
     html {
       font-size: 16px;
+      width: 100%;
+      margin: 0 auto;
     }
 
     p {
       font-size: 18px;
+      width: 100%;
       color: #191919;
     }
 
@@ -117,10 +120,6 @@ public class Quilter.Styles.quilter {
       line-height: 1.4rem;
       margin-left: 80px;
       margin-right: 80px;
-      align-content: center;
-      align-items: center;
-      align-self: center;
-      display: inline-block;
       text-align: left;
     }
 
@@ -157,7 +156,7 @@ public class Quilter.Styles.quilter {
     a:hover,
     a:focus,
     a:active {
-      color: #3daee9;
+      color: #007D9E;
     }
 
     code{
@@ -185,7 +184,7 @@ public class Quilter.Styles.quilter {
       margin-left: .8rem;
       text-align: left;
     }
-    
+
     blockquote > p {
       color: inherit;
       margin-top: 20px;
@@ -201,7 +200,7 @@ public class Quilter.Styles.quilter {
     ul>li {
       font-size: 18px;
     }
-  
+
     ul, ol {
       margin-left: -40px;
     }

diff --git a/src/Styles/quilterdark.vala b/src/Styles/quilterdark.vala
@@ -26,10 +26,13 @@ public class Quilter.Styles.quilterdark {
   public const string css="""
     html {
       font-size: 16px;
+      width: 100%;
+      margin: 0 auto;
     }
 
     p {
       font-size: 18px;
+      width: 100%;
       color: #C3C3C1;
     }
 
@@ -117,10 +120,6 @@ public class Quilter.Styles.quilterdark {
       line-height: 1.4rem;
       margin-left: 80px;
       margin-right: 80px;
-      align-content: center;
-      align-items: center;
-      align-self: center;
-      display: inline-block;
       text-align: left;
     }
 
@@ -185,7 +184,7 @@ public class Quilter.Styles.quilterdark {
       margin-left: .8rem;
       text-align: left;
     }
-    
+
     blockquote > p {
       color: inherit;
       margin-top: 20px;
@@ -201,7 +200,7 @@ public class Quilter.Styles.quilterdark {
     ul>li {
       font-size: 18px;
     }
-  
+
     ul, ol {
       margin-left: -40px;
     }

diff --git a/src/Styles/quiltersepia.vala b/src/Styles/quiltersepia.vala
@@ -26,10 +26,13 @@ public class Quilter.Styles.quiltersepia {
   public const string css="""
     html {
       font-size: 16px;
+      width: 100%;
+      margin: 0 auto;
     }
 
     p {
       font-size: 18px;
+      width: 100%;
       color: #3b3228;
     }
 
@@ -116,10 +119,6 @@ public class Quilter.Styles.quiltersepia {
       line-height: 1.4rem;
       margin-left: 80px;
       margin-right: 80px;
-      align-content: center;
-      align-items: center;
-      align-self: center;
-      display: inline-block;
       text-align: left;
     }
 
@@ -156,7 +155,7 @@ public class Quilter.Styles.quiltersepia {
     a:hover,
     a:focus,
     a:active {
-      color: #1d99f3;
+      color: #07747B;
     }
 
     code{
@@ -184,7 +183,7 @@ public class Quilter.Styles.quiltersepia {
       margin-left: .8rem;
       text-align: left;
     }
-    
+
     blockquote > p {
       color: inherit;
       margin-top: 20px;
@@ -200,7 +199,7 @@ public class Quilter.Styles.quiltersepia {
     ul>li {
       font-size: 18px;
     }
-  
+
     ul, ol {
       margin-left: -40px;
     }

diff --git a/src/Widgets/StatusBar.vala b/src/Widgets/StatusBar.vala
@@ -77,7 +77,7 @@ namespace Quilter {
             track_type_menu_pop.add (track_type_grid);
 
             track_type_menu = new Gtk.MenuButton ();
-            track_type_menu.tooltip_text = _("Set Preview Font");
+            track_type_menu.tooltip_text = _("Set Tracking Type");
             track_type_menu.popover = track_type_menu_pop;
             track_type_menu.label = "";