Skip to content

Commit

Permalink
Fix merge mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
@peterychuang
peterychuang committed Apr 19, 2018
1 parent f3c29cb commit d44c0a0
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 32 deletions.
4 changes: 0 additions & 4 deletions src/chrome/chrome-theme/theme_frame.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions src/gnome-shell/assets/checkbox.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 0 additions & 12 deletions src/metacity-1/metacity-theme-2-light.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
<constant name="C_highlight_alt" value="blend/gtk:bg[NORMAL]/#FFFFFF/0.4"/>

<constant name="C_title_focused" value="gtk:fg[NORMAL]"/>
<<<<<<< HEAD
<constant name="C_title_unfocused" value="blend/#EEEEE/gtk:fg[NORMAL]/0.75"/>
=======
<constant name="C_title_unfocused" value="blend/#E0E0E0/gtk:fg[NORMAL]/0.7"/>
>>>>>>> upstream/master
<constant name="C_title_alt_focused" value="gtk:fg[NORMAL]"/>
<constant name="C_title_alt_unfocused" value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.7"/>

Expand Down Expand Up @@ -357,11 +353,7 @@

<draw_ops name="appmenu_icon_focused">
<icon
<<<<<<< HEAD
x="(width-D_appmenu_icon_size)/2" y="(height-D_appmenu_icon_size)/2"
=======
x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2"
>>>>>>> upstream/master
width="D_appmenu_icon_size" height="D_appmenu_icon_size"/>
</draw_ops>

Expand All @@ -379,11 +371,7 @@

<draw_ops name="appmenu_icon_unfocused">
<icon
<<<<<<< HEAD
x="(width-D_appmenu_icon_size)/2" y="(height-D_appmenu_icon_size)/2"
=======
x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2"
>>>>>>> upstream/master
width="D_appmenu_icon_size" height="D_appmenu_icon_size"
alpha="0.7"/>
</draw_ops>
Expand Down
12 changes: 0 additions & 12 deletions src/metacity-1/metacity-theme-3-light.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@
<constant name="C_highlight_alt" value="blend/gtk:custom(theme_bg_color,gtk:bg[NORMAL])/#FFFFFF/0.4"/>

<constant name="C_title_focused" value="gtk:custom(theme_fg_color,gtk:fg[NORMAL])"/>
<<<<<<< HEAD
<constant name="C_title_unfocused" value="blend/#EEEEEE/gtk:custom(theme_fg_color,gtk:fg[NORMAL])/0.75"/>
=======
<constant name="C_title_unfocused" value="blend/#E0E0E0/gtk:custom(theme_fg_color,gtk:fg[NORMAL])/0.7"/>
>>>>>>> upstream/master
<constant name="C_title_alt_focused" value="gtk:custom(theme_fg_color,gtk:fg[NORMAL])"/>
<constant name="C_title_alt_unfocused" value="blend/gtk:custom(theme_bg_color,gtk:bg[NORMAL])/gtk:custom(theme_fg_color,gtk:fg[NORMAL])/0.7"/>

Expand Down Expand Up @@ -377,11 +373,7 @@

<draw_ops name="appmenu_icon_focused">
<icon
<<<<<<< HEAD
x="(width-D_appmenu_icon_size)/2" y="(height-D_appmenu_icon_size)/2"
=======
x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2"
>>>>>>> upstream/master
width="D_appmenu_icon_size" height="D_appmenu_icon_size"/>
</draw_ops>

Expand All @@ -399,11 +391,7 @@

<draw_ops name="appmenu_icon_unfocused">
<icon
<<<<<<< HEAD
x="(width-D_appmenu_icon_size)/2" y="(height-D_appmenu_icon_size)/2"
=======
x="(width - D_appmenu_icon_size) / 2" y="(height - D_appmenu_icon_size) / 2"
>>>>>>> upstream/master
width="D_appmenu_icon_size" height="D_appmenu_icon_size"
alpha="0.7"/>
</draw_ops>
Expand Down

0 comments on commit d44c0a0

Please sign in to comment.