Skip to content

Commit

Permalink
*
Browse files Browse the repository at this point in the history
  • Loading branch information
Lains committed Apr 13, 2020
1 parent 0d6a48b commit d837428
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 43 deletions.
Binary file modified data/images/shot-dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/shot-sepia.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/images/shot.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions data/schemes/quilter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
<_description>Emphasis on focus.</_description>

<style name="text" foreground="#333" background="#F7F7F7"/>
<style name="cursor" foreground="#B1D2F7"/>
<style name="cursor" foreground="#0EBAFB"/>
<style name="current-line" background="#eff0f1"/>
<style name="selection" foreground="#EEE" background="#0073c5"/>
<style name="selection" foreground="#333" background="#0EBAFB"/>
<style name="search-match" foreground="#333" background="#EEAA00"/>

<!-- Bold -->
<style name="def:statement" bold="true"/>

<!-- Italic -->
<style name="def:doc-comment-element" italic="true"/>
<style name="def:doc-comment-element" foreground="#555" italic="true"/>

<!-- Links -->
<style name="def:comment" foreground="#0073c5"/>
<style name="def:underlined" foreground="#0073c5"/>
<style name="def:comment" foreground="#0EBAFB"/>
<style name="def:underlined" foreground="#0EBAFB"/>

<!-- Code -->
<style name="def:identifier" background="#F2F0F2" foreground="#333"/>
Expand All @@ -29,8 +29,8 @@
<style name="def:preprocessor" foreground="#333"/>

<!-- Image marking in Links -->
<style name="def:shebang" foreground="#0073c5"/>
<style name="def:constant" foreground="#0073c5"/>
<style name="def:shebang" foreground="#0EBAFB"/>
<style name="def:constant" foreground="#0EBAFB"/>

<!-- Backslash Escaping -->
<style name="def:special-char" foreground="#B7B6B7"/>
Expand Down
23 changes: 13 additions & 10 deletions data/styles/app-main-stylesheet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,6 @@ actionbar,
margin: 0px;
}

.quilter-sidebar list,
.quilter-sidebar treeview.view {
border: 1px solid transparent;
}

.quilter-sidebar button.radio {
border-radius: 0;
}
Expand Down Expand Up @@ -199,11 +194,18 @@ actionbar,
}

.quilter-sidebar-box {
border-radius: 0 8px 8px 0;
margin: 3px;
border-radius: 0;
margin-left: 0;
margin-bottom: 0;
border: 1px solid transparent;
border: 0px solid alpha (#000, 0);
border-top: 1px solid alpha (#000, 0);
border-left: 5px solid @colorPrimary;
}

.quilter-sidebar-box:active,
.quilter-sidebar-box:focus,
.quilter-sidebar-box:selected {
border-top: 1px solid alpha (#000, 0.25);
}

.quilter-sidebar-box > grid > label {
Expand Down Expand Up @@ -253,11 +255,12 @@ actionbar,
}

.dark-switcher .radio:checked {
background-image: linear-gradient(0deg, #1f1f1f, #2f2f2f);
background-color: #0f0f0f;
background-image: none;
box-shadow: none;
}

.dark-switcher .radio:not(checked) {
background-color: #0f0f0f;
background-image: linear-gradient(0deg, #121212, #242424);
box-shadow: none;
}
17 changes: 9 additions & 8 deletions data/styles/app-stylesheet-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,26 @@ actionbar,
background-color: alpha (@accentColor, 0.35);
}

.quilter-sidebar-box {
background: shade (@colorPrimary, 1.6);
}

.quilter-sidebar-box:hover {
background: shade (@colorPrimary, 1.3);
color: @textColorPrimary;
border-left: 5px solid shade (@colorPrimary, 0.95);
color: @textColorPrimary;
background: shade (@colorPrimary, 1.2);
}

.quilter-sidebar-box:active,
.quilter-sidebar-box:focus,
.quilter-sidebar-box:selected {
background: alpha (@accentColor, 0.12);
border-left: 5px solid alpha (@accentColor, 0.5);
}

.quilter-sidebar-box:active:hover,
.quilter-sidebar-box:focus:hover,
.quilter-sidebar-box:selected:hover {
background: alpha (@accentColor, 0.22);
}

.quilter-sidebar-box:selected {
color: alpha(@accentColor, 0.88);
border-left: 5px solid alpha (@accentColor, 0.7);
}

.osd {
Expand Down
17 changes: 9 additions & 8 deletions data/styles/app-stylesheet-sepia.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,26 @@ actionbar,
background-color: alpha (@accentColor, 0.35);
}

.quilter-sidebar-box {
background: alpha (shade (@colorPrimary, 1.1), 0.5);
}

.quilter-sidebar-box:hover {
background: shade (@colorPrimary, 0.95);
color: @textColorPrimary;
border-left: 5px solid shade (@colorPrimary, 0.95);
color: @textColorPrimary;
background: shade (@colorPrimary, 0.95);
}

.quilter-sidebar-box:active,
.quilter-sidebar-box:focus,
.quilter-sidebar-box:selected {
background: alpha (@accentColor, 0.12);
border-left: 5px solid alpha (@accentColor, 0.5);
}

.quilter-sidebar-box:active:hover,
.quilter-sidebar-box:focus:hover,
.quilter-sidebar-box:selected:hover {
background: alpha (@accentColor, 0.22);
}

.quilter-sidebar-box:selected {
color: @accentColor;
border-left: 5px solid alpha (@accentColor, 0.7);
}

.osd {
Expand Down
19 changes: 10 additions & 9 deletions data/styles/app-stylesheet.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@define-color colorPrimary #F7F7F7;
@define-color textColorPrimary #333;
@define-color accentColor #B1D2F7;
@define-color accentColor #0EBAFB;

window {
background: @colorPrimary;
Expand Down Expand Up @@ -52,25 +52,26 @@ actionbar,
background-color: alpha (@accentColor, 0.35);
}

.quilter-sidebar-box {
background: shade (@colorPrimary, 1.2);
}

.quilter-sidebar-box:hover {
background: shade (@colorPrimary, 0.95);
color: @textColorPrimary;
border-left: 5px solid shade (@colorPrimary, 0.95);
color: @textColorPrimary;
background: shade (@colorPrimary, 0.95);
}

.quilter-sidebar-box:active,
.quilter-sidebar-box:focus,
.quilter-sidebar-box:selected {
background: alpha (@accentColor, 0.12);
border-left: 5px solid alpha (@accentColor, 0.5);
}

.quilter-sidebar-box:active:hover,
.quilter-sidebar-box:focus:hover,
.quilter-sidebar-box:selected:hover {
background: alpha (@accentColor, 0.22);
}

.quilter-sidebar-box:selected {
color: @accentColor;
border-left: 5px solid alpha (@accentColor, 0.7);
}

.osd {
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/Highlighter.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class Quilter.Highlighter : Plugins.Plugin {
build = build + """<span style="background-color:#00897B; color:#FFF; border: 3px solid #00897b;">%s</span>""".printf(subline);
return build;
} else {
build = build + """<span style="background-color:#B1D2F7; color:#FFF; border: 3px solid #0073c5;">%s</span>""".printf(subline);
build = build + """<span style="background-color:#0EBAFB; color:#FFF; border: 3px solid #0EBAFB;">%s</span>""".printf(subline);
return build;
}
}
Expand Down

0 comments on commit d837428

Please sign in to comment.