nautilus: add conflict-row styling

7 files changed, 81 insertions, 0 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index c59e6e0..c446c34 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -3164,6 +3164,17 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   animation: needs_attention_keyframes 3s ease-in-out;
   animation-iteration-count: 3; }
 
+.conflict-row.activatable, .conflict-row.activatable:active {
+  color: white;
+  background-color: #FC4138; }
+
+.conflict-row.activatable:hover {
+  background-color: #fd716a; }
+
+.conflict-row.activatable:selected {
+  color: #ffffff;
+  background-color: #5294e2; }
+
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0; }
 
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 7bdc8c6..365d8f7 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -3163,6 +3163,17 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   animation: needs_attention_keyframes 3s ease-in-out;
   animation-iteration-count: 3; }
 
+.conflict-row.activatable, .conflict-row.activatable:active {
+  color: white;
+  background-color: #FC4138; }
+
+.conflict-row.activatable:hover {
+  background-color: #fd716a; }
+
+.conflict-row.activatable:selected {
+  color: #ffffff;
+  background-color: #5294e2; }
+
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 99c421a..0cef74f 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -3164,6 +3164,17 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   animation: needs_attention_keyframes 3s ease-in-out;
   animation-iteration-count: 3; }
 
+.conflict-row.activatable, .conflict-row.activatable:active {
+  color: white;
+  background-color: #FC4138; }
+
+.conflict-row.activatable:hover {
+  background-color: #fd716a; }
+
+.conflict-row.activatable:selected {
+  color: #ffffff;
+  background-color: #5294e2; }
+
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 71cad90..9b866b2 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -3163,6 +3163,17 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   animation: needs_attention_keyframes 3s ease-in-out;
   animation-iteration-count: 3; }
 
+.conflict-row.activatable, .conflict-row.activatable:active {
+  color: white;
+  background-color: #FC4138; }
+
+.conflict-row.activatable:hover {
+  background-color: #fd716a; }
+
+.conflict-row.activatable:selected {
+  color: #ffffff;
+  background-color: #5294e2; }
+
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0; }
 
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index f1c3ac7..8ce70b6 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -3167,6 +3167,17 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   animation: needs_attention_keyframes 3s ease-in-out;
   animation-iteration-count: 3; }
 
+.conflict-row.activatable, .conflict-row.activatable:active {
+  color: white;
+  background-color: #FC4138; }
+
+.conflict-row.activatable:hover {
+  background-color: #fd716a; }
+
+.conflict-row.activatable:selected {
+  color: #ffffff;
+  background-color: #5294e2; }
+
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0; }
 
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 45e43cd..387b24b 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -3167,6 +3167,17 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   animation: needs_attention_keyframes 3s ease-in-out;
   animation-iteration-count: 3; }
 
+.conflict-row.activatable, .conflict-row.activatable:active {
+  color: white;
+  background-color: #FC4138; }
+
+.conflict-row.activatable:hover {
+  background-color: #fd716a; }
+
+.conflict-row.activatable:selected {
+  color: #ffffff;
+  background-color: #5294e2; }
+
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0; }
 
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index de316cd..c6cb1dd 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -104,6 +104,21 @@ $disk_space_free: darken($bg_color, 3%);
   animation-iteration-count: 3;
 }
 
+// Batch renaming dialog
+.conflict-row.activatable {
+  &, &:active {
+    color: $error_fg_color;
+    background-color: $error_color;
+  }
+
+  &:hover { background-color: lighten($error_color, 10%); }
+
+  &:selected {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+  }
+}
+
 //
 // Nemo
 //