Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-01-11 11:35:21 +0400
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>2012-01-11 18:37:34 +0400
commitc8b955a44b1897394d6dda349af2f183a820cc28 (patch)
tree25d5abec97ad186b8f2847443de493b02de19cf9 /app/assets
parentc66bc99fb7d22d005cf0de687b9535f8bef52e23 (diff)
lil restyle
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/add_new.pngbin0 -> 288 bytes
-rw-r--r--app/assets/javascripts/tree.js6
-rw-r--r--app/assets/stylesheets/projects.css.scss33
3 files changed, 36 insertions, 3 deletions
diff --git a/app/assets/images/add_new.png b/app/assets/images/add_new.png
new file mode 100644
index 00000000000..12fa22c88c9
--- /dev/null
+++ b/app/assets/images/add_new.png
Binary files differ
diff --git a/app/assets/javascripts/tree.js b/app/assets/javascripts/tree.js
index bde543f0b86..2e9bcc82a2b 100644
--- a/app/assets/javascripts/tree.js
+++ b/app/assets/javascripts/tree.js
@@ -5,7 +5,7 @@
var Tree = {
init:
function() {
- (new Image).src = "/assets/ajax-loader-tree.gif";
+ (new Image).src = "ajax-loader-facebook.gif";
$('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live("click", function() {
history.pushState({ path: this.path }, '', this.href)
@@ -20,8 +20,8 @@ var Tree = {
});
$('#tree-slider td.tree-item-file-name a, #tree-breadcrumbs a').live({
- "ajax:beforeSend": function() { $('h2.icon').addClass("loading") },
- "ajax:complete": function() { $('h2.icon').removeClass("loading")}
+ "ajax:beforeSend": function() { $('.tree_progress').addClass("loading"); },
+ "ajax:complete": function() { $('.tree_progress').removeClass("loading"); }
});
}
}
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 0b43f55789d..22e8f994265 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -693,3 +693,36 @@ a.project-update.titled {
top: 0;
}
}
+
+.add_new {
+ float:right;
+ padding: 5px 12px;
+ border: 1px solid #CCC;
+
+ &:hover {
+ background:#eee;
+ }
+
+ &:active {
+ background:#ddd;
+ }
+}
+
+.tree_progress {
+ float:left;
+ width:16px;
+ height:16px;
+ margin:6px;
+ &.loading {
+ background-position: 0px 0px;
+ background: url("ajax-loader-facebook.gif") no-repeat;
+ }
+}
+
+#tree-breadcrumbs {
+ h2 {
+ margin:0;
+ margin-bottom:20px;
+ float:left;
+ }
+}