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:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/admin.js.coffee2
-rw-r--r--app/assets/stylesheets/gitlab_bootstrap/files.scss6
-rw-r--r--app/assets/stylesheets/sections/snippets.scss4
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee
index da0077ea77b..f75008e2b60 100644
--- a/app/assets/javascripts/admin.js.coffee
+++ b/app/assets/javascripts/admin.js.coffee
@@ -14,7 +14,7 @@ class Admin
$('.log-bottom').click (e) ->
e.preventDefault()
- visible_log = $(".file_content:visible")
+ visible_log = $(".file-content:visible")
visible_log.animate({ scrollTop: visible_log.find('ol').height() }, "fast")
modal = $('.change-owner-holder')
diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss
index 4d42bf4532c..ec03fd0d844 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/files.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss
@@ -2,12 +2,12 @@
* File content holder
*
*/
-.file_holder {
+.file-holder {
border: 1px solid #BBB;
margin-bottom: 1em;
@include solid-shade;
- .file_title {
+ .file-title {
border-bottom: 1px solid #bbb;
@include bg-dark-gray-gradient;
margin: 0;
@@ -33,7 +33,7 @@
}
}
}
- .file_content {
+ .file-content {
background: #fff;
font-size: 11px;
diff --git a/app/assets/stylesheets/sections/snippets.scss b/app/assets/stylesheets/sections/snippets.scss
index 3944814fc3e..feeca655cb1 100644
--- a/app/assets/stylesheets/sections/snippets.scss
+++ b/app/assets/stylesheets/sections/snippets.scss
@@ -1,5 +1,5 @@
-.snippet.file_holder {
- .file_title {
+.snippet.file-holder {
+ .file-title {
.snippet-file-name {
position: relative;
top: -4px;