Unverified Commit 8c1d4146 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Include tw bootstrap manually. Fix hide class


Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a3c86609d64c
......@@ -9,7 +9,7 @@ $ ->
toggleClass('icon-chevron-down').
toggleClass('icon-chevron-up')
container = $(".js-toggle-visibility-container")
container.toggleClass("gl-hide")
container.toggleClass("hide")
e.preventDefault()
$("body").on "click", ".js-toggle-button", (e) ->
......
......@@ -14,9 +14,9 @@
@import "main/fonts.scss";
/**
* Twitter bootstrap:
* Customized Twitter bootstrap
*/
@import 'bootstrap';
@import 'gl_bootstrap';
/**
* Font icons
......
......@@ -127,10 +127,6 @@ pre.well-pre {
background: #29b;
}
.gl-hide {
display: none;
}
.breadcrumb > li + li:before {
content: "/";
padding: 0;
......
// 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";
......@@ -75,6 +75,7 @@
margin-top: 4px;
margin-left: 0px;
max-width: 200px;
float: none;
}
p:last-child {
......
......@@ -80,7 +80,6 @@ ul.notes {
overflow: hidden;
display: block;
position:relative;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
p { color: $style_color; }
.avatar {
......@@ -122,6 +121,7 @@ ul.notes {
.file .notes_holder {
font-size: 13px;
line-height: 18px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
td {
border: 1px solid #ddd;
......
......@@ -18,12 +18,12 @@
%div
= link_to '#', class: 'js-toggle-colors-link' do
Customize colors
.form-group.js-toggle-colors-container.gl-hide
.form-group.js-toggle-colors-container.hide
= f.label :color, "Background Color"
.col-sm-10
= f.text_field :color, placeholder: "#AA33EE"
.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"
.col-sm-10
= f.text_field :font, placeholder: "#224466"
......
......@@ -5,4 +5,4 @@
.content_list
- else
%p.nothing_here_message Projects activity will be displayed here
.loading.gl-hide
.loading.hide
......@@ -11,7 +11,7 @@
.content_list
- else
%p.nothing_here_message Project activity will be displayed here
.loading.gl-hide
.loading.hide
.side.col-md-4
- if @group.description.present?
.description-block
......
#modal-shortcuts.modal.gl-hide
#modal-shortcuts.modal.hide
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
%h3 Keyboard Shortcuts
......
......@@ -12,7 +12,7 @@
%ul.nav.navbar-nav
%li
%a
%div.gl-hide.turbolink-spinner
%div.hide.turbolink-spinner
%i.icon-refresh.icon-spin
Loading...
%li.hidden-sm
......
......@@ -15,7 +15,7 @@
%ul.nav
%li
%a
%div.gl-hide.turbolink-spinner
%div.hide.turbolink-spinner
%i.icon-refresh.icon-spin
Loading...
%li
......
......@@ -7,4 +7,4 @@
= hidden_field_tag :search_code, true
= hidden_field_tag :repository_ref, @ref
= 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 }
......@@ -50,7 +50,7 @@
%div
= f.text_field :username, required: true, class: 'form-control'
&nbsp;
%span.loading-gif.gl-hide= image_tag "ajax_loader.gif"
%span.loading-gif.hide= image_tag "ajax_loader.gif"
%p.light
= user_url(@user)
%div
......
......@@ -43,7 +43,7 @@
%span.btn.btn-tiny
%i.icon-chevron-down
%span Advanced notifications settings
.js-toggle-visibility-container.gl-hide
.js-toggle-visibility-container.hide
%hr
%h4 Groups:
%ul.bordered-list
......
%div#modal-remove-blob.modal.gl-hide
%div#modal-remove-blob.modal.hide
.modal-header
%a.close{href: "#", "data-dismiss" => "modal"} ×
%h3.page-title Remove #{@blob.name}
......
......@@ -47,7 +47,7 @@
- if @branches.any?
and in
= 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-box
......
......@@ -11,7 +11,7 @@
.frame.deleted
%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)}"}
%p.image-info.gl-hide
%p.image-info.hide
%span.meta-filesize= "#{number_to_human_size old_file.size}"
|
%b W:
......@@ -23,7 +23,7 @@
.frame.added
%a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
%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}"
|
%b W:
......@@ -32,7 +32,7 @@
%b H:
%span.meta-height
%div.swipe.view.gl-hide
%div.swipe.view.hide
.swipe-frame
.frame.deleted
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
......@@ -43,7 +43,7 @@
%span.top-handle
%span.bottom-handle
%div.onion-skin.view.gl-hide
%div.onion-skin.view.hide
.onion-skin-frame
.frame.deleted
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
......@@ -56,7 +56,7 @@
.opaque
.view-modes.gl-hide
.view-modes.hide
%ul.view-modes-menu
%li.two-up{data: {mode: 'two-up'}} 2-up
%li.swipe{data: {mode: 'swipe'}} Swipe
......
......@@ -5,5 +5,5 @@
:plain
$(".project-edit-errors").html("#{escape_javascript(render('errors'))}");
$('.project-submit').enable();
$('.save-project-loader').gl-hide();
$('.save-project-loader').hide();
$('.project-edit-container').show();
......@@ -97,7 +97,7 @@
Show it to me
%i.icon-chevron-down
.js-toggle-visibility-container.gl-hide
.js-toggle-visibility-container.hide
- if can? current_user, :archive_project, @project
.ui-box.ui-box-danger
.title
......@@ -182,7 +182,7 @@
- else
%p.nothing_here_message Only project owner can remove a project
.save-project-loader.gl-hide
.save-project-loader.hide
%center
= image_tag "ajax_loader.gif"
%h3 Saving project.
......
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