Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / data / themes / widgets / panes.edc

diff --git a/data/themes/widgets/panes.edc b/data/themes/widgets/panes.edc
index 10423e8..83df9c4 100644 (file)
--- a/data/themes/widgets/panes.edc
+++ b/data/themes/widgets/panes.edc
@@ -6,6 +6,11 @@ group {
       image: "bt_hilight.png" COMP;
       image: "bt_shine.png" COMP;
       image: "bt_glow.png" COMP;
+<<<<<<< HEAD
+      image: "bt_dis_base.png" COMP;
+      image: "bt_dis_hilight.png" COMP;
+=======
+>>>>>>> remotes/origin/upstream
       image: "arrow_right.png" COMP;
       image: "arrow_left.png" COMP;
    }
@@ -101,7 +106,14 @@ group {
          }
          description { state: "disabled" 0.0;
             inherit:  "default" 0.0;
+<<<<<<< HEAD
+            image {
+               normal: "bt_dis_base.png";
+               border: 4 4 4 4;
+            }
+=======
             visible: 0;
+>>>>>>> remotes/origin/upstream
          }
       }
       part {          name: "over1";
@@ -117,7 +129,14 @@ group {
          }
          description { state: "disabled" 0.0;
             inherit:  "default" 0.0;
+<<<<<<< HEAD
+            image {
+               normal: "bt_dis_hilight.png";
+               border: 4 4 4 0;
+            }
+=======
             visible: 0;
+>>>>>>> remotes/origin/upstream
          }
       }
       part { name: "over2";
@@ -156,6 +175,8 @@ group {
             color: 255 255 255 255;
          }
       }
+<<<<<<< HEAD
+=======
       part { name:"bar_disabled";
          type: RECT;
          description { state:"default" 0.0;
@@ -169,6 +190,7 @@ group {
             visible: 1;
          }
       }
+>>>>>>> remotes/origin/upstream
 
       //Arrow
       part {
@@ -468,6 +490,8 @@ group {
             }
          }
       }
+<<<<<<< HEAD
+=======
       //fix the pane
       program {
          name: "panes_fixed";
@@ -488,6 +512,7 @@ group {
          target: "over1";
          target: "bar_disabled";
       }
+>>>>>>> remotes/origin/upstream
    }
 }
 
@@ -499,6 +524,11 @@ group {
       image: "bt_hilight.png" COMP;
       image: "bt_shine.png" COMP;
       image: "bt_glow.png" COMP;
+<<<<<<< HEAD
+      image: "bt_dis_base.png" COMP;
+      image: "bt_dis_hilight.png" COMP;
+=======
+>>>>>>> remotes/origin/upstream
       image: "arrow_up.png" COMP;
       image: "arrow_down.png" COMP;
    }
@@ -594,7 +624,14 @@ group {
          }
          description { state: "disabled" 0.0;
             inherit:  "default" 0.0;
+<<<<<<< HEAD
+            image {
+               normal: "bt_dis_base.png";
+               border: 4 4 4 4;
+            }
+=======
             visible: 0;
+>>>>>>> remotes/origin/upstream
          }
       }
       part {          name: "over1";
@@ -610,7 +647,14 @@ group {
          }
          description { state: "disabled" 0.0;
             inherit:  "default" 0.0;
+<<<<<<< HEAD
+            image {
+               normal: "bt_dis_hilight.png";
+               border: 4 4 4 0;
+            }
+=======
             visible: 0;
+>>>>>>> remotes/origin/upstream
          }
       }
       part { name: "over2";
@@ -649,6 +693,8 @@ group {
             color: 255 255 255 255;
          }
       }
+<<<<<<< HEAD
+=======
          part { name:"bar_disabled";
             type: RECT;
             description { state:"default" 0.0;
@@ -662,6 +708,7 @@ group {
                visible: 1;
             }
          }
+>>>>>>> remotes/origin/upstream
 
       //Arrow
       part {
@@ -826,6 +873,8 @@ group {
          target: "arrow_left";
          transition: DECELERATE 0.4;
       }
+<<<<<<< HEAD
+=======
       //fix the pane
       program {
          name:   "panes_fixed";
@@ -846,6 +895,7 @@ group {
          target: "over1";
          target: "bar_disabled";
       }
+>>>>>>> remotes/origin/upstream
    }
 }