Mucho refinement

This commit is contained in:
Sam Hewitt 2015-04-24 19:01:59 -04:00
parent db18590f1e
commit 31b78c4d9d
22 changed files with 67 additions and 60 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 416 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

After

Width:  |  Height:  |  Size: 543 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 758 B

After

Width:  |  Height:  |  Size: 869 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

After

Width:  |  Height:  |  Size: 368 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 486 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 513 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 391 B

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 506 B

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 478 B

After

Width:  |  Height:  |  Size: 505 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 758 B

After

Width:  |  Height:  |  Size: 869 B

View File

@ -95,9 +95,9 @@
* Trough Colors * * Trough Colors *
*****************/ *****************/
@define-color trough_background @base; @define-color trough_background shade(@background, 0.9);
@define-color backdrop_trough_background @backdrop_base; @define-color backdrop_trough_background shade(@trough_background, 0.95);
@define-color insensitive_trough_background @insensitive_base; @define-color insensitive_trough_background shade(@trough_background, 1.05);
@define-color trough_border shade(@border, 1.02); @define-color trough_border shade(@border, 1.02);
@define-color backdrop_trough_border shade(@backdrop_border, 1.2); @define-color backdrop_trough_border shade(@backdrop_border, 1.2);

View File

@ -39,6 +39,7 @@ GtkComboBox .separator {
background: none; background: none;
border: none; border: none;
color: inherit; color: inherit;
-GtkComboBox-arrow-scaling: 1;
} }
/****************** /******************

View File

@ -32,14 +32,14 @@
background-color: @base; background-color: @base;
color: @text; color: @text;
border: 1px solid @border; border: 1px solid @border;
box-shadow:inset 0 0 0 1px alpha(#000, 0.05), box-shadow:inset 0 -1px 0 1px alpha(#000, 0.05),
inset 0 1px 0 0 alpha(#000, 0.02); inset 0 1px 0 0 alpha(#000, 0.02);
} }
.entry:focus { .entry:focus {
background-color: @base; background-color: @base;
color: @text; color: @text;
border: 1px solid @selection; border: 1px solid shade(@selection, 0.8);
box-shadow:inset 0 0 0 1px alpha(@selection, 0.4), box-shadow:inset 0 0 0 1px alpha(@selection, 0.4),
inset 0 1px 0 0 alpha(@selection, 0.1); inset 0 1px 0 0 alpha(@selection, 0.1);
} }
@ -64,6 +64,11 @@
background-color: @selection; background-color: @selection;
} }
.entry:selected:backdrop {
color: @base;
background-color: @selection;
}
.entry:backdrop { .entry:backdrop {
background-color: @backdrop_background; background-color: @backdrop_background;
color: @backdrop_text; color: @backdrop_text;
@ -77,12 +82,6 @@
box-shadow: none; box-shadow: none;
} }
.entry:selected:backdrop {
color: @backdrop_selected_foreground;
background-color: @backdrop_selected_background;
box-shadow: none;
}
.entry.image { .entry.image {
color: @insensitive_text; color: @insensitive_text;
} }

View File

@ -329,7 +329,8 @@
.header-bar .button GtkArrow, .header-bar .button GtkArrow,
.header-bar .button GtkArrow:active, .header-bar .button GtkArrow:active,
.header-bar .button GtkArrow:focus, .header-bar .button GtkArrow:focus,
.header-bar .button GtkArrow:hover { .header-bar .button GtkArrow:hover {
-GtkComboBox-arrow-scaling: 1;
color: @header_text; color: @header_text;
} }

View File

@ -18,10 +18,21 @@
*/ */
@define-color progressbar_background @progress_color; @define-color progressbar_background @progress_color;
@define-color progressbar_border shade(@progressbar_background, 0.7);
@define-color backdrop_progressbar_background shade(@progressbar_background, 1.2); @define-color backdrop_progressbar_background shade(@progressbar_background, 1.2);
@define-color insensitive_progressbar_background shade(@insensitive_background, 0.85); @define-color insensitive_progressbar_background shade(@insensitive_background, 0.85);
@define-color progressbar_border shade(@progressbar_background, 0.7);
@define-color backdrop_progressbar_border shade(@progressbar_border, 1.3);
@define-color insensitive_progressbar_border shade(@insensitive_border, 0.85);
@define-color progressbar_trough_background @base;
@define-color backdrop_progressbar_trough_background shade(@progressbar_trough_background, 1.2);
@define-color insensitive_progressbar_trough_background shade(@insensitive_background, 0.85);
@define-color progressbar_trough_border shade(@progressbar_trough_background, 0.8);
@define-color backdrop_progressbar_trough_border shade(@progressbar_trough_border, 1.05);
@define-color insensitive_progressbar_trough_border shade(@insensitive_border, 0.85);
/**************** /****************
* Progress bar * * Progress bar *
@ -48,45 +59,46 @@ GtkProgressBar.progressbar:active {
GtkProgressBar.progressbar:backdrop, GtkProgressBar.progressbar:backdrop,
GtkProgressBar.progressbar:active:backdrop { GtkProgressBar.progressbar:active:backdrop {
border-color: @progressbar_border; border-color: @backdrop_progressbar_border;
color: @backdrop_text; color: @backdrop_text;
background-color: @backdrop_progressbar_background; background-color: @backdrop_progressbar_background;
box-shadow: none;
} }
GtkProgressBar.trough { GtkProgressBar.trough {
border-color: @trough_border; border-color: @progressbar_trough_border;
background-color: @trough_background; background-color: @progressbar_trough_background;
} }
GtkProgressBar.trough:backdrop { GtkProgressBar.trough:backdrop {
border-color: @backdrop_trough_border; border-color: @backdrop_progressbar_trough_border;
background-color: @backdrop_trough_background; background-color: @backdrop_progressbar_trough_background;
} }
GtkProgressBar.trough:insensitive { GtkProgressBar.trough:insensitive {
border-color: @insensitive_trough_border; border-color: @insensitive_progressbar_trough_border;
background-color: @insensitive_trough_background; background-color: @insensitive_progressbar_trough_background;
} }
.trough, .trough,
.trough.vertical { .trough.vertical {
padding: 0; padding: 0;
border: 1px solid @trough_border; border: 1px solid @progressbar_trough_border;
background-color: @trough_background; background-color: @progressbar_trough_background;
} }
.trough:insensitive, .trough:insensitive,
.trough.vertical:insensitive { .trough.vertical:insensitive {
background-image:none; background-image:none;
background-color:@insensitive_trough_background; background-color:@insensitive_progressbar_trough_background;
border: 1px solid @insensitive_rough_border; border: 1px solid @insensitive_rough_border;
} }
.trough:backdrop, .trough:backdrop,
.trough.vertical:backdrop { .trough.vertical:backdrop {
padding: 0; padding: 0;
border: 1px solid @backdrop_trough_border; border: 1px solid @backdrop_progressbar_trough_border;
background-color: @backdrop_trough_background; background-color: @backdrop_progressbar_trough_background;
} }
@ -137,6 +149,7 @@ GtkProgressBar.trough:insensitive {
padding: 0; padding: 0;
color: alpha(#000,0.5); color: alpha(#000,0.5);
background-color: @backdrop_progressbar_background; background-color: @backdrop_progressbar_background;
box-shadow: none;
} }
.trough row, .trough row,
@ -151,7 +164,7 @@ GtkProgressBar.trough:insensitive {
border-radius: 4px; border-radius: 4px;
padding: 0; padding: 0;
color: alpha(#000,0.5); color: alpha(#000,0.5);
background-color: @trough_background; background-color: @progressbar_trough_background;
} }
@ -167,7 +180,7 @@ GtkProgressBar.trough:insensitive {
border-radius: 4px; border-radius: 4px;
padding: 0; padding: 0;
color: alpha(#000,0.5); color: alpha(#000,0.5);
background-color: @insensitive_trough_background; background-color: @insensitive_progressbar_trough_background;
} }
.trough row:backdrop, .trough row:backdrop,
@ -182,5 +195,5 @@ GtkProgressBar.trough:insensitive {
border-radius: 4px; border-radius: 4px;
padding: 0; padding: 0;
color: alpha(#000,0.5); color: alpha(#000,0.5);
background-color: @backdrop_trough_background; background-color: @backdrop_progressbar_trough_background;
} }

View File

@ -18,8 +18,8 @@
@define-color scale_background @progress_color; @define-color scale_background @progress_color;
@define-color scale_border shade(@scale_background, 0.7); @define-color scale_border shade(@scale_background, 0.7);
@define-color backdrop_scale_background shade(@scale_background, 1.2); @define-color backdrop_scale_background shade(@scale_background, 0.95);
@define-color insensitive_scale_background shade(@insensitive_background, 0.8); @define-color insensitive_scale_background shade(@scale_background, 1.2);
/********** /**********
* Scales * * Scales *

View File

@ -16,10 +16,6 @@
* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/. * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
*/ */
/* Trough colors */
@define-color trough_border shade(@background, 0.7);
@define-color backdrop_trough_border shade(@trough_border, 1.1);
/* Slider colors */ /* Slider colors */
@define-color slider_border @trough_border; @define-color slider_border @trough_border;
@define-color backdrop_slider_border @backdrop_trough_border; @define-color backdrop_slider_border @backdrop_trough_border;
@ -27,9 +23,9 @@
/************* /*************
* GtkSwitch * * GtkSwitch *
************* *************/
GtkSwitch {
border-radius: 1em; /*GtkSwitch {
font: condensed; font: condensed;
} }
@ -78,9 +74,6 @@ GtkSwitch.slider:backdrop {
background-color: @backdrop_slider_border; background-color: @backdrop_slider_border;
}*/ }*/
/*************
* GtkSwitch *
*************/
GtkSwitch { GtkSwitch {
font: 1; font: 1;

View File

@ -45,8 +45,8 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="1" inkscape:zoom="1"
inkscape:cx="100.00004" inkscape:cx="-57.99996"
inkscape:cy="100.00006" inkscape:cy="97.50006"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@ -55,9 +55,9 @@
fit-margin-right="0" fit-margin-right="0"
fit-margin-bottom="0" fit-margin-bottom="0"
inkscape:window-width="1301" inkscape:window-width="1301"
inkscape:window-height="744" inkscape:window-height="740"
inkscape:window-x="65" inkscape:window-x="65"
inkscape:window-y="24" inkscape:window-y="28"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata5479"> id="metadata5479">
@ -67,7 +67,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -83,6 +83,6 @@
height="172" height="172"
x="991.14288" x="991.14288"
y="1083.505" y="1083.505"
ry="32" /> ry="16" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -36,8 +36,8 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="1" inkscape:zoom="1"
inkscape:cx="59.082644" inkscape:cx="-96.917356"
inkscape:cy="41.704107" inkscape:cy="37.204107"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@ -46,9 +46,9 @@
fit-margin-right="0" fit-margin-right="0"
fit-margin-bottom="0" fit-margin-bottom="0"
inkscape:window-width="1301" inkscape:window-width="1301"
inkscape:window-height="744" inkscape:window-height="740"
inkscape:window-x="65" inkscape:window-x="65"
inkscape:window-y="24" inkscape:window-y="28"
inkscape:window-maximized="1" inkscape:window-maximized="1"
borderlayer="false"> borderlayer="false">
<inkscape:grid <inkscape:grid
@ -63,7 +63,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -79,6 +79,6 @@
height="48" height="48"
x="1538.8572" x="1538.8572"
y="125.50504" y="125.50504"
ry="8" /> ry="4" />
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -34,15 +34,15 @@
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="1" inkscape:zoom="1"
inkscape:cx="350.88113" inkscape:cx="317.35554"
inkscape:cy="56.461941" inkscape:cy="104.32826"
inkscape:current-layer="layer2" inkscape:current-layer="layer2"
showgrid="false" showgrid="false"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:showpageshadow="false" inkscape:showpageshadow="false"
inkscape:window-width="1366" inkscape:window-width="1366"
inkscape:window-height="713" inkscape:window-height="710"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="28" inkscape:window-y="28"
width="400px" width="400px"
@ -3341,9 +3341,9 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path5218" id="path5218"
d="m 335,180 -5,5 -8,0 c 0,0 -1,0 -1,-1 l 0,-8 c 0,-1 1,-1 1,-1 l 8,0 z" d="m 335,180 -5,5 -8,0 c 0,0 -1,0 -1,-1 l 0,-8 c 0,-1 1,-1 1,-1 l 8,0 z"
style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" /> style="display:inline;opacity:1;fill:#f4f4f4;fill-opacity:1;stroke:none;enable-background:new" />
<path <path
style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" style="display:inline;opacity:1;fill:#f4f4f4;fill-opacity:1;stroke:none;enable-background:new"
d="m 291,180 5,5 8,0 c 0,0 1,0 1,-1 l 0,-8 c 0,-1 -1,-1 -1,-1 l -8,0 z" d="m 291,180 5,5 8,0 c 0,0 1,0 1,-1 l 0,-8 c 0,-1 -1,-1 -1,-1 l -8,0 z"
id="path5220" id="path5220"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
@ -3353,9 +3353,9 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path5222" id="path5222"
d="m 268,173 -5,5 0,8 c 0,0 0,1 1,1 l 8,0 c 1,0 1,-1 1,-1 l 0,-8 z" d="m 268,173 -5,5 0,8 c 0,0 0,1 1,1 l 8,0 c 1,0 1,-1 1,-1 l 0,-8 z"
style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" /> style="display:inline;opacity:1;fill:#f4f4f4;fill-opacity:1;stroke:none;enable-background:new" />
<path <path
style="display:inline;opacity:1;fill:#d8d8d8;fill-opacity:1;stroke:none;enable-background:new" style="display:inline;opacity:1;fill:#f4f4f4;fill-opacity:1;stroke:none;enable-background:new"
d="m 238,187 -5,-5 0,-8 c 0,0 0,-1 1,-1 l 8,0 c 1,0 1,1 1,1 l 0,8 z" d="m 238,187 -5,-5 0,-8 c 0,0 0,-1 1,-1 l 8,0 c 1,0 1,1 1,1 l 0,8 z"
id="path5224" id="path5224"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
@ -3365,7 +3365,7 @@
cy="182" cy="182"
cx="358" cx="358"
id="circle4829-6" id="circle4829-6"
style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#d8d8d8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#f4f4f4;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
</g> </g>
<g <g
style="fill:#f3f3f3;fill-opacity:1;stroke:#cccccc;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" style="fill:#f3f3f3;fill-opacity:1;stroke:#cccccc;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"

Before

Width:  |  Height:  |  Size: 225 KiB

After

Width:  |  Height:  |  Size: 225 KiB