summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-08-30 22:15:34 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-08-30 22:15:34 +0300
commitb9ff0c79b49c24dfcfc8e3188c76a861b2035770 (patch)
tree6bc0d8286494e358b85e7013251578f6742d872b /app/assets
parent4a6596af274c01036aaf9f49a5b38cd678716873 (diff)
downloadgitlab-ce-b9ff0c79b49c24dfcfc8e3188c76a861b2035770.tar.gz
Changed filters to readable one. Styled some stuff
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/projects.js4
-rw-r--r--app/assets/stylesheets/common.scss4
-rw-r--r--app/assets/stylesheets/sections/projects.scss11
3 files changed, 16 insertions, 3 deletions
diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js
index 842726981d3..be1b75b90a7 100644
--- a/app/assets/javascripts/projects.js
+++ b/app/assets/javascripts/projects.js
@@ -7,8 +7,10 @@ function Projects() {
$('.new_project, .edit_project').live('ajax:before', function() {
$('.project_new_holder, .project_edit_holder').hide();
- $('.ajax_loader').show();
+ $('.save-project-loader').show();
});
$('form #project_default_branch').chosen();
+
+ disableButtonIfEmtpyField("#project_name", ".project-submit")
}
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index d07912f4520..aa27a280a18 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -165,11 +165,11 @@ span.update-author {
background-color: #999;
&.pushed {
- background-color: #3A87AD;
+ background-color: #4A97BD;
}
&.opened {
- background-color: #468847;
+ background-color: #469847;
}
&.closed {
diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss
index 3d5aa80b34e..721b569d446 100644
--- a/app/assets/stylesheets/sections/projects.scss
+++ b/app/assets/stylesheets/sections/projects.scss
@@ -79,3 +79,14 @@
border: 1px solid #BBB;
}
}
+
+.save-project-loader {
+ img {
+ margin-top:50px;
+ margin-bottom:50px;
+ }
+ h3 {
+ @extend .page_title;
+ }
+
+}