Move image assets to corresponding component

FredrikNoren · Jun 23, 2014 · 4f1d00e · 4f1d00e
1 parent f171939
commit 4f1d00e
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 34 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -154,8 +154,12 @@ module.exports = function(grunt) {
     // Embed images in css
     imageEmbed: {
       default: {
-        src: [ "public/css/styles.css" ],
-        dest: "public/css/styles.css",
+        files: {
+          "public/css/styles.css": [ "public/css/styles.css" ],
+          "components/graph/graph.css": ["components/graph/graph.css"],
+          "components/header/header.css": ["components/header/header.css"],
+          "components/staging/staging.css": ["components/staging/staging.css"],
+        },
         options: {
           deleteAfterEncoding: false
         }

diff --git a/assets/client/images/branchIcon.png b/assets/client/images/branchIcon.png
diff --git a/assets/client/images/logBoxHoverArrowRight.png b/assets/client/images/logBoxHoverArrowRight.png
diff --git a/assets/client/images/panelArrowRight.png b/assets/client/images/panelArrowRight.png
diff --git a/assets/client/images/remoteIcon.png b/assets/client/images/remoteIcon.png
diff --git a/assets/client/images/repositoryBackgroundArrowUp.png b/assets/client/images/repositoryBackgroundArrowUp.png
diff --git a/assets/client/images/shadowArrowRight.png b/assets/client/images/shadowArrowRight.png
diff --git a/assets/client/images/stagingArrowDown.png b/assets/client/images/stagingArrowDown.png
diff --git a/assets/client/images/tagIcon.png b/assets/client/images/tagIcon.png
diff --git a/components/graph/graph.less b/components/graph/graph.less
@@ -32,7 +32,7 @@
               display: block;
             }
             .arrow {
-              background: url('../images/logBoxHoverArrowRight.png');
+              background: url('images/logBoxHoverArrowRight.png');
             }
           }
         }
@@ -41,21 +41,28 @@
         z-index: 3;
       }
 
-      .logEntryBox > .panel-body {
-        position: relative;
-
-        padding: 10px;
-        margin-bottom: 0px;
-        width: @log-width-small;
-        min-height: 85px;
+      .logEntryBox {
         .arrowRight {
           position: absolute;
           right: 0px;
           top: 5px;
           .shadow {
             display: none;
+            background: url('images/shadowArrowRight.png');
+          }
+          .arrow {
+            background: url('images/panelArrowRight.png');
           }
         }
+      }
+
+      .logEntryBox > .panel-body {
+        position: relative;
+
+        padding: 10px;
+        margin-bottom: 0px;
+        width: @log-width-small;
+        min-height: 85px;
 
         .gravatar {
           display: none;
@@ -205,6 +212,28 @@
     }
   }
 
+
+  .remote-icon {
+    background: url('images/remoteIcon.png');
+    width: 12px;
+    height: 10px;
+    display: inline-block;
+  }
+
+  .branch-icon {
+    background: url('images/branchIcon.png');
+    width: 9px;
+    height: 10px;
+    display: inline-block;
+  }
+
+  .tag-icon {
+    background: url('images/tagIcon.png');
+    width: 5px;
+    height: 10px;
+    display: inline-block;
+  }
+
 }
 
 

diff --git a/components/graph/images/branchIcon.png b/components/graph/images/branchIcon.png
diff --git a/components/graph/images/logBoxHoverArrowRight.png b/components/graph/images/logBoxHoverArrowRight.png
diff --git a/components/graph/images/panelArrowRight.png b/components/graph/images/panelArrowRight.png
diff --git a/components/graph/images/remoteIcon.png b/components/graph/images/remoteIcon.png
diff --git a/components/graph/images/shadowArrowRight.png b/components/graph/images/shadowArrowRight.png
diff --git a/components/graph/images/tagIcon.png b/components/graph/images/tagIcon.png
diff --git a/components/header/header.less b/components/header/header.less
@@ -65,7 +65,7 @@
     position: absolute;
     bottom: 0px;
     left: 300px;
-    background: url('../images/repositoryBackgroundArrowUp.png');
+    background: url('repositoryBackgroundArrowUp.png');
     width: 30px;
     height: 15px;
   }

diff --git a/components/header/repositoryBackgroundArrowUp.png b/components/header/repositoryBackgroundArrowUp.png
diff --git a/components/staging/staging.less b/components/staging/staging.less
@@ -13,7 +13,7 @@
     left: (@log-width-small + 45px);
     bottom: 0px;
     .arrow {
-      background: url('../images/stagingArrowDown.png');
+      background: url('stagingArrowDown.png');
     }
   }
 

diff --git a/components/staging/stagingArrowDown.png b/components/staging/stagingArrowDown.png
diff --git a/public/less/generic.less b/public/less/generic.less
@@ -142,13 +142,11 @@ a.disabled {
 		position: absolute;
 		left: 5px;
 		top: 5px;
-		background: url('../images/shadowArrowRight.png');
 	}
 	.arrow {
 		position: absolute;
 		left: 0px;
 		top: 0px;
-		background: url('../images/panelArrowRight.png');
 	}
 }
 

diff --git a/public/less/styles.less b/public/less/styles.less
@@ -32,26 +32,6 @@
 
 
 
-.remote-icon {
-	background: url('../images/remoteIcon.png');
-	width: 12px;
-	height: 10px;
-	display: inline-block;
-}
-
-.branch-icon {
-	background: url('../images/branchIcon.png');
-	width: 9px;
-	height: 10px;
-	display: inline-block;
-}
-
-.tag-icon {
-	background: url('../images/tagIcon.png');
-	width: 5px;
-	height: 10px;
-	display: inline-block;
-}
 
 .ui-autocomplete {
 	background: rgba(200, 210, 230, 1);