Commit 19435b9a authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'delete-more-page-specific-css' into 'master'

Delete more page specific css

* Moves emojis and icons into `framework`
* Comments out unused bootstrap imports (we can remove them entirely later)

See merge request !7961
parents 4e68b881 18489218
...@@ -44,3 +44,6 @@ ...@@ -44,3 +44,6 @@
@import "framework/awards.scss"; @import "framework/awards.scss";
@import "framework/images.scss"; @import "framework/images.scss";
@import "framework/broadcast-messages"; @import "framework/broadcast-messages";
@import "framework/emojis.scss";
@import "framework/icons.scss";
@import "framework/snippets.scss";
.emoji-0023-20E3 { background-position: 0 0px; } .emoji-0023-20E3 { background-position: 0 0; }
.emoji-002A-20E3 { background-position: -20px 0; } .emoji-002A-20E3 { background-position: -20px 0; }
.emoji-0030-20E3 { background-position: 0 -20px; } .emoji-0030-20E3 { background-position: 0 -20px; }
.emoji-0031-20E3 { background-position: -20px -20px; } .emoji-0031-20E3 { background-position: -20px -20px; }
......
...@@ -22,16 +22,6 @@ ...@@ -22,16 +22,6 @@
.snippet-file-content { .snippet-file-content {
border-radius: 3px; border-radius: 3px;
margin-bottom: $gl-padding;
.btn-clipboard {
@extend .btn;
}
}
.project-snippets .awards {
border-bottom: 1px solid $white-normal;
padding-bottom: $gl-padding;
} }
.snippet-header { .snippet-header {
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
@import "bootstrap/labels"; @import "bootstrap/labels";
@import "bootstrap/badges"; @import "bootstrap/badges";
@import "bootstrap/alerts"; @import "bootstrap/alerts";
@import "bootstrap/progress-bars"; // @import "bootstrap/progress-bars";
@import "bootstrap/list-group"; @import "bootstrap/list-group";
@import "bootstrap/wells"; // @import "bootstrap/wells";
@import "bootstrap/close"; @import "bootstrap/close";
@import "bootstrap/panels"; @import "bootstrap/panels";
......
.explore-title {
text-align: center;
h3 {
font-weight: normal;
font-size: 30px;
}
}
...@@ -10,19 +10,7 @@ ...@@ -10,19 +10,7 @@
position: relative; position: relative;
top: 1px; top: 1px;
> .fa { .fa {
font-size: 18px; font-size: 18px;
} }
} }
.ns-part {
color: $gl-text-green;
}
.ns-watch {
color: $gl-success;
}
.ns-mute {
color: $gl-danger;
}
.explore-title .explore-title.text-center
%h3 %h2
Explore GitLab Explore GitLab
%p.lead %p.lead
Discover projects, groups and snippets. Share your projects with others Discover projects, groups and snippets. Share your projects with others
......
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
= blob_icon 0, @snippet.file_name = blob_icon 0, @snippet.file_name
= @snippet.file_name = @snippet.file_name
.file-actions .file-actions
= clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']") = clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']", class: "btn btn-sm")
= link_to 'Raw', raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank" = link_to 'Raw', raw_namespace_project_snippet_path(@project.namespace, @project, @snippet), class: "btn btn-sm", target: "_blank"
= render 'shared/snippets/blob' = render 'shared/snippets/blob'
= render 'award_emoji/awards_block', awardable: @snippet, inline: true .row-content-block.top-block.content-component-block
= render 'award_emoji/awards_block', awardable: @snippet, inline: true
%div#notes= render "projects/notes/notes_with_form" %div#notes= render "projects/notes/notes_with_form"
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
= blob_icon 0, @snippet.file_name = blob_icon 0, @snippet.file_name
= @snippet.file_name = @snippet.file_name
.file-actions .file-actions
= clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']") = clipboard_button(clipboard_target: ".blob-content[data-blob-id='#{@snippet.id}']", class: "btn btn-sm")
= link_to 'Raw', raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank" = link_to 'Raw', raw_snippet_path(@snippet), class: "btn btn-sm", target: "_blank"
= link_to 'Download', download_snippet_path(@snippet), class: "btn btn-sm" = link_to 'Download', download_snippet_path(@snippet), class: "btn btn-sm"
= render 'shared/snippets/blob' = render 'shared/snippets/blob'
= render 'award_emoji/awards_block', awardable: @snippet, inline: true = render 'award_emoji/awards_block', awardable: @snippet, inline: true
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment