Skip to content
Snippets Groups Projects
Verified Commit 8c1d4146 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Include tw bootstrap manually. Fix hide class

parent a379bd00
No related branches found
No related tags found
No related merge requests found
Showing
with 105 additions and 28 deletions
Loading
@@ -9,7 +9,7 @@ $ ->
Loading
@@ -9,7 +9,7 @@ $ ->
toggleClass('icon-chevron-down'). toggleClass('icon-chevron-down').
toggleClass('icon-chevron-up') toggleClass('icon-chevron-up')
container = $(".js-toggle-visibility-container") container = $(".js-toggle-visibility-container")
container.toggleClass("gl-hide") container.toggleClass("hide")
e.preventDefault() e.preventDefault()
   
$("body").on "click", ".js-toggle-button", (e) -> $("body").on "click", ".js-toggle-button", (e) ->
Loading
Loading
Loading
@@ -14,9 +14,9 @@
Loading
@@ -14,9 +14,9 @@
@import "main/fonts.scss"; @import "main/fonts.scss";
   
/** /**
* Twitter bootstrap: * Customized Twitter bootstrap
*/ */
@import 'bootstrap'; @import 'gl_bootstrap';
   
/** /**
* Font icons * Font icons
Loading
Loading
Loading
@@ -127,10 +127,6 @@ pre.well-pre {
Loading
@@ -127,10 +127,6 @@ pre.well-pre {
background: #29b; background: #29b;
} }
   
.gl-hide {
display: none;
}
.breadcrumb > li + li:before { .breadcrumb > li + li:before {
content: "/"; content: "/";
padding: 0; padding: 0;
Loading
Loading
// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";
// Reset
@import "bootstrap/normalize";
@import "bootstrap/print";
// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/grid";
@import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";
// Components
@import "bootstrap/component-animations";
@import "bootstrap/glyphicons";
@import "bootstrap/dropdowns";
@import "bootstrap/button-groups";
@import "bootstrap/input-groups";
@import "bootstrap/navs";
@import "bootstrap/navbar";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/media";
@import "bootstrap/list-group";
@import "bootstrap/panels";
@import "bootstrap/wells";
@import "bootstrap/close";
// Components w/ JavaScript
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/carousel";
// Utility classes
.clearfix {
@include clearfix();
}
.center-block {
@include center-block();
}
.pull-right {
float: right !important;
}
.pull-left {
float: left !important;
}
.hide {
display: none;
}
.show {
display: block !important;
}
.invisible {
visibility: hidden;
}
.text-hide {
@include text-hide();
}
.hidden {
display: none !important;
visibility: hidden !important;
}
.affix {
position: fixed;
}
@import "bootstrap/responsive-utilities";
Loading
@@ -75,6 +75,7 @@
Loading
@@ -75,6 +75,7 @@
margin-top: 4px; margin-top: 4px;
margin-left: 0px; margin-left: 0px;
max-width: 200px; max-width: 200px;
float: none;
} }
   
p:last-child { p:last-child {
Loading
Loading
Loading
@@ -80,7 +80,6 @@ ul.notes {
Loading
@@ -80,7 +80,6 @@ ul.notes {
overflow: hidden; overflow: hidden;
display: block; display: block;
position:relative; position:relative;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
p { color: $style_color; } p { color: $style_color; }
   
.avatar { .avatar {
Loading
@@ -122,6 +121,7 @@ ul.notes {
Loading
@@ -122,6 +121,7 @@ ul.notes {
.file .notes_holder { .file .notes_holder {
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   
td { td {
border: 1px solid #ddd; border: 1px solid #ddd;
Loading
Loading
Loading
@@ -18,12 +18,12 @@
Loading
@@ -18,12 +18,12 @@
%div %div
= link_to '#', class: 'js-toggle-colors-link' do = link_to '#', class: 'js-toggle-colors-link' do
Customize colors Customize colors
.form-group.js-toggle-colors-container.gl-hide .form-group.js-toggle-colors-container.hide
= f.label :color, "Background Color" = f.label :color, "Background Color"
.col-sm-10 .col-sm-10
= f.text_field :color, placeholder: "#AA33EE" = f.text_field :color, placeholder: "#AA33EE"
.light Hex values as 3 double digit numbers, starting with a # sign. .light Hex values as 3 double digit numbers, starting with a # sign.
.form-group.js-toggle-colors-container.gl-hide .form-group.js-toggle-colors-container.hide
= f.label :font, "Font Color" = f.label :font, "Font Color"
.col-sm-10 .col-sm-10
= f.text_field :font, placeholder: "#224466" = f.text_field :font, placeholder: "#224466"
Loading
Loading
Loading
@@ -5,4 +5,4 @@
Loading
@@ -5,4 +5,4 @@
.content_list .content_list
- else - else
%p.nothing_here_message Projects activity will be displayed here %p.nothing_here_message Projects activity will be displayed here
.loading.gl-hide .loading.hide
Loading
@@ -11,7 +11,7 @@
Loading
@@ -11,7 +11,7 @@
.content_list .content_list
- else - else
%p.nothing_here_message Project activity will be displayed here %p.nothing_here_message Project activity will be displayed here
.loading.gl-hide .loading.hide
.side.col-md-4 .side.col-md-4
- if @group.description.present? - if @group.description.present?
.description-block .description-block
Loading
Loading
#modal-shortcuts.modal.gl-hide #modal-shortcuts.modal.hide
.modal-header .modal-header
%a.close{href: "#", "data-dismiss" => "modal"} × %a.close{href: "#", "data-dismiss" => "modal"} ×
%h3 Keyboard Shortcuts %h3 Keyboard Shortcuts
Loading
Loading
Loading
@@ -12,7 +12,7 @@
Loading
@@ -12,7 +12,7 @@
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li %li
%a %a
%div.gl-hide.turbolink-spinner %div.hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
Loading... Loading...
%li.hidden-sm %li.hidden-sm
Loading
Loading
Loading
@@ -15,7 +15,7 @@
Loading
@@ -15,7 +15,7 @@
%ul.nav %ul.nav
%li %li
%a %a
%div.gl-hide.turbolink-spinner %div.hide.turbolink-spinner
%i.icon-refresh.icon-spin %i.icon-refresh.icon-spin
Loading... Loading...
%li %li
Loading
Loading
Loading
@@ -7,4 +7,4 @@
Loading
@@ -7,4 +7,4 @@
= hidden_field_tag :search_code, true = hidden_field_tag :search_code, true
= hidden_field_tag :repository_ref, @ref = hidden_field_tag :repository_ref, @ref
= submit_tag 'Go' if ENV['RAILS_ENV'] == 'test' = submit_tag 'Go' if ENV['RAILS_ENV'] == 'test'
.search-autocomplete-json.gl-hide{:'data-autocomplete-opts' => search_autocomplete_source } .search-autocomplete-json.hide{:'data-autocomplete-opts' => search_autocomplete_source }
Loading
@@ -50,7 +50,7 @@
Loading
@@ -50,7 +50,7 @@
%div %div
= f.text_field :username, required: true, class: 'form-control' = f.text_field :username, required: true, class: 'form-control'
   
%span.loading-gif.gl-hide= image_tag "ajax_loader.gif" %span.loading-gif.hide= image_tag "ajax_loader.gif"
%p.light %p.light
= user_url(@user) = user_url(@user)
%div %div
Loading
Loading
Loading
@@ -43,7 +43,7 @@
Loading
@@ -43,7 +43,7 @@
%span.btn.btn-tiny %span.btn.btn-tiny
%i.icon-chevron-down %i.icon-chevron-down
%span Advanced notifications settings %span Advanced notifications settings
.js-toggle-visibility-container.gl-hide .js-toggle-visibility-container.hide
%hr %hr
%h4 Groups: %h4 Groups:
%ul.bordered-list %ul.bordered-list
Loading
Loading
%div#modal-remove-blob.modal.gl-hide %div#modal-remove-blob.modal.hide
.modal-header .modal-header
%a.close{href: "#", "data-dismiss" => "modal"} × %a.close{href: "#", "data-dismiss" => "modal"} ×
%h3.page-title Remove #{@blob.name} %h3.page-title Remove #{@blob.name}
Loading
Loading
Loading
@@ -47,7 +47,7 @@
Loading
@@ -47,7 +47,7 @@
- if @branches.any? - if @branches.any?
and in and in
= link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand") = link_to("#{pluralize(@branches.count, "other branch")}", "#", class: "js-details-expand")
%span.js-details-contain.gl-hide %span.js-details-contain.hide
= commit_branches_links(@project, @branches) = commit_branches_links(@project, @branches)
   
.commit-box .commit-box
Loading
Loading
Loading
@@ -11,7 +11,7 @@
Loading
@@ -11,7 +11,7 @@
.frame.deleted .frame.deleted
%a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))} %a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))}
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
%p.image-info.gl-hide %p.image-info.hide
%span.meta-filesize= "#{number_to_human_size old_file.size}" %span.meta-filesize= "#{number_to_human_size old_file.size}"
| |
%b W: %b W:
Loading
@@ -23,7 +23,7 @@
Loading
@@ -23,7 +23,7 @@
.frame.added .frame.added
%a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))} %a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
%p.image-info.gl-hide %p.image-info.hide
%span.meta-filesize= "#{number_to_human_size file.size}" %span.meta-filesize= "#{number_to_human_size file.size}"
| |
%b W: %b W:
Loading
@@ -32,7 +32,7 @@
Loading
@@ -32,7 +32,7 @@
%b H: %b H:
%span.meta-height %span.meta-height
   
%div.swipe.view.gl-hide %div.swipe.view.hide
.swipe-frame .swipe-frame
.frame.deleted .frame.deleted
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
Loading
@@ -43,7 +43,7 @@
Loading
@@ -43,7 +43,7 @@
%span.top-handle %span.top-handle
%span.bottom-handle %span.bottom-handle
   
%div.onion-skin.view.gl-hide %div.onion-skin.view.hide
.onion-skin-frame .onion-skin-frame
.frame.deleted .frame.deleted
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
Loading
@@ -56,7 +56,7 @@
Loading
@@ -56,7 +56,7 @@
.opaque .opaque
   
   
.view-modes.gl-hide .view-modes.hide
%ul.view-modes-menu %ul.view-modes-menu
%li.two-up{data: {mode: 'two-up'}} 2-up %li.two-up{data: {mode: 'two-up'}} 2-up
%li.swipe{data: {mode: 'swipe'}} Swipe %li.swipe{data: {mode: 'swipe'}} Swipe
Loading
Loading
Loading
@@ -5,5 +5,5 @@
Loading
@@ -5,5 +5,5 @@
:plain :plain
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}"); $(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.project-submit').enable(); $('.project-submit').enable();
$('.save-project-loader').gl-hide(); $('.save-project-loader').hide();
$('.project-edit-container').show(); $('.project-edit-container').show();
Loading
@@ -97,7 +97,7 @@
Loading
@@ -97,7 +97,7 @@
Show it to me Show it to me
%i.icon-chevron-down %i.icon-chevron-down
   
.js-toggle-visibility-container.gl-hide .js-toggle-visibility-container.hide
- if can? current_user, :archive_project, @project - if can? current_user, :archive_project, @project
.ui-box.ui-box-danger .ui-box.ui-box-danger
.title .title
Loading
@@ -182,7 +182,7 @@
Loading
@@ -182,7 +182,7 @@
- else - else
%p.nothing_here_message Only project owner can remove a project %p.nothing_here_message Only project owner can remove a project
   
.save-project-loader.gl-hide .save-project-loader.hide
%center %center
= image_tag "ajax_loader.gif" = image_tag "ajax_loader.gif"
%h3 Saving project. %h3 Saving project.
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment