1
0
mirror of https://github.com/horst3180/arc-theme.git synced 2024-10-27 19:04:02 +00:00

Merge branch 'master' into dark_variant

This commit is contained in:
Horst3180 2015-06-10 09:28:54 +02:00
commit 5b43e892e8
12 changed files with 27 additions and 56 deletions

View File

@ -25,8 +25,7 @@ $panel-corner-radius: 0px;
// Globals
//
$font-size: 9;
//$font-family: Cantarell, Sans-Serif;
$font-family: Futura Bk bt, Sans-Serif;
$font-family: Cantarell, Sans-Serif;
$_bubble_bg_color: opacify($osd_bg_color,0.25);
$_bubble_fg_color: $osd_fg_color;
$_bubble_borders_color: transparentize($osd_fg_color,0.8);

View File

@ -17,7 +17,7 @@
* Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*/
stage {
font-family: Futura Bk bt, Sans-Serif;
font-family: Cantarell, Sans-Serif;
font-size: 9pt;
color: #5c616c; }

View File

@ -565,12 +565,12 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="11.313708"
inkscape:cx="478.52624"
inkscape:cy="293.00874"
inkscape:zoom="1"
inkscape:cx="275.83757"
inkscape:cy="331.30343"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
showgrid="false"
showborder="false"
inkscape:window-width="1366"
inkscape:window-height="720"
@ -5403,5 +5403,14 @@
id="rect6168-6"
style="opacity:1;fill:#d7d8dd;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
</g>
<rect
transform="matrix(0,1,-1,0,0,0)"
y="-287.5"
x="-205.13783"
height="4"
width="4.0000124"
id="focus-line"
style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cfd6e6;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.67346936"
inkscape:label="#rect6176-4-2" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 230 KiB

After

Width:  |  Height:  |  Size: 231 KiB

View File

@ -118,3 +118,4 @@ tab-right-active
inline-toolbar
toolbar
menubar
focus-line

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

View File

@ -471,7 +471,7 @@ style "default" {
image {
function = FOCUS
file = "assets/null.png"
file = "assets/focus-line.png"
border = { 1, 1, 1, 1 }
stretch = TRUE
}
@ -970,7 +970,6 @@ style "menubar_item" {
stretch = TRUE
}
}
}
style "button" {
@ -1014,47 +1013,6 @@ style "button" {
}
}
#style "button_nohilight" {
#
# xthickness = 4
# ythickness = 4
#
# engine "pixmap" {
#
# image {
# function = BOX
# state = NORMAL
# file = "Buttons/button-default-nohilight.png"
# border = { 4, 4, 4, 4 }
# stretch = TRUE
# }
#
# image {
# function = BOX
# state = PRELIGHT
# file = "Buttons/button-prelight-nohilight.png"
# border = { 4, 4, 4, 4 }
# stretch = TRUE
# }
#
# image {
# function = BOX
# state = ACTIVE
# file = "Buttons/button-pressed-nohilight.png"
# border = { 4, 4, 4, 4 }
# stretch = TRUE
# }
#
# image {
# function = BOX
# state = INSENSITIVE
# file = "Buttons/button-insensitive-nohilight.png"
# border = { 4, 4, 4, 4 }
# stretch = TRUE
# }
# }
#}
style "checkbutton" {
fg[PRELIGHT] = @text_color
@ -2531,10 +2489,8 @@ widget_class "*<GtkComboBox>*<GtkSeparator>" style "combo
widget_class "*HandleBox" style "toolbar"
widget_class "*<GtkTreeView>*<GtkButton>*" style "treeview_header"
widget_class "*<GtkFileChooserDefault>*<GtkToolbar>" style "inline_toolbar"
#widget_class "*<GtkFileChooserDefault>*<GtkToolbar>*<GtkButton>" style "button_nohilight"
widget_class "*<GtkComboBoxEntry>*<GtkEntry>" style "combobox_entry"
widget_class "*<GtkComboBoxEntry>*<GtkButton>" style "combobox_entry_button"
#widget_class "*<GtkInfoBar>*<GtkButton>" style "button_nohilight"
widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>" style "notebook_viewport"
# Entries in notebooks draw with notebook's base color, but not if there's

View File

@ -82,6 +82,7 @@ NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
.nautilus-desktop.nautilus-canvas-item {
color: $selected_fg_color;
text-shadow: 1px 1px transparentize(black, 0.4);
&:active { color: $fg_color; }
&:selected { color: $selected_fg_color; }

View File

@ -2414,7 +2414,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
border-radius: 2px; }
.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
color: #ffffff; }
color: #ffffff;
text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
.nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
color: #5c616c; }
.nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {

View File

@ -2414,7 +2414,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
border-radius: 2px; }
.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
color: #ffffff; }
color: #ffffff;
text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
.nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
color: #5c616c; }
.nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {

View File

@ -82,6 +82,7 @@ NautilusCanvasViewContainer.view .entry { border-radius: 3px; }
.nautilus-desktop.nautilus-canvas-item {
color: $selected_fg_color;
text-shadow: 1px 1px transparentize(black, 0.4);
&:active { color: $fg_color; }
&:selected { color: $selected_fg_color; }

View File

@ -2325,7 +2325,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
border-radius: 2px; }
.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
color: #ffffff; }
color: #ffffff;
text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
.nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
color: #5c616c; }
.nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {

View File

@ -2325,7 +2325,8 @@ NautilusCanvasViewContainer.view .entry, NemoIconViewContainer .entry {
border-radius: 2px; }
.nautilus-desktop.nautilus-canvas-item, .nemo-desktop.nemo-canvas-item {
color: #ffffff; }
color: #ffffff;
text-shadow: 1px 1px rgba(0, 0, 0, 0.6); }
.nautilus-desktop.nautilus-canvas-item:active, .nemo-desktop.nemo-canvas-item:active {
color: #5c616c; }
.nautilus-desktop.nautilus-canvas-item:selected, .nemo-desktop.nemo-canvas-item:selected {