Skip to content

G
gitlab-ce
Commit ad2f5c85 authored by Clement Ho's avatar Clement Ho
Browse files
Options

Remove bootstrap-sass gem

parent e801adbc
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 401 deletions
Gemfile
View file @ ad2f5c85
...@@ -254,7 +254,6 @@ gem 'sass-rails', '~> 5.0.6' ...@@ -254,7 +254,6 @@ gem 'sass-rails', '~> 5.0.6'
gem 'uglifier', '~> 2.7.2' gem 'uglifier', '~> 2.7.2'
gem 'addressable', '~> 2.5.2' gem 'addressable', '~> 2.5.2'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7' gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2' gem 'gon', '~> 6.2'
......
app/assets/stylesheets/framework/tw_bootstrap.scss deleted 100644 → 0
View file @ e801adbc
/*
* Twitter bootstrap with GitLab customizations/additions
*
*/
// 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/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/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/list-group";
@import "bootstrap/wells";
@import "bootstrap/close";
@import "bootstrap/panels";
// Components w/ JavaScript
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
// Utility classes
.clearfix {
@include clearfix();
}
.mx-auto {
@include center-block();
}
.float-right {
float: right !important;
}
.float-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;
}
/*
* Fix <summary> elements on firefox
* See https://github.com/necolas/normalize.css/issues/640
* and https://github.com/twbs/bootstrap/issues/21060
*
*/
summary {
display: list-item;
}
@import "bootstrap/responsive-utilities";
// Labels
.badge.badge-pill {
padding: 4px 5px;
font-size: 12px;
font-style: normal;
font-weight: $gl-font-weight-normal;
display: inline-block;
&.badge.badge-pill-gray {
background-color: $label-gray-bg;
color: $gl-text-color;
text-shadow: none;
}
&.badge.badge-pill-inverse {
background-color: $label-inverse-bg;
}
}
/**
* fix to keep tooltips position in top navigation bar
*
*/
.navbar .nav > li {
position: relative;
white-space: nowrap;
}
/**
* Add some extra stuff to panels
*
*/
.card {
box-shadow: none;
.card-body {
form,
pre {
margin: 0;
}
.form-actions {
margin: -15px;
margin-top: 18px;
}
}
.card-footer {
.pagination {
margin: 0;
}
.btn {
min-width: 124px;
}
.btn-clipboard {
min-width: 0;
}
}
&.card-small {
.card-heading {
padding: 6px 15px;
font-size: 13px;
font-weight: $gl-font-weight-normal;
a {
color: $panel-heading-link-color;
}
}
}
&.card-without-border {
border: 0;
}
&.card-without-margin {
margin: 0;
}
}
.card-succes .card-heading,
.card-info .card-heading,
.card-danger .card-heading,
.card-warning .card-heading,
.card-primary .card-heading,
.alert {
a:not(.btn) {
@extend .alert-link;
color: $white-light;
text-decoration: underline;
}
}
// Prevent datetimes on tooltips to break into two lines
.local-timeago {
white-space: nowrap;
}
app/assets/stylesheets/framework/tw_bootstrap_variables.scss deleted 100644 → 0
View file @ e801adbc
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.3):
// For all variables see https://github.com/twbs/bootstrap-sass/blob/master/templates/project/_bootstrap-variables.sass
//
// Variables
// --------------------------------------------------
//== Colors
//
//## Gray and brand colors for use across Bootstrap.
// $gray-base: #000
// $gray-darker: lighten($gray-base, 13.5%) // #222
// $gray-dark: lighten($gray-base, 20%) // #333
// $gray: lighten($gray-base, 33.5%) // #555
// $gray-light: lighten($gray-base, 46.7%) // #777
// $gray-lighter: lighten($gray-base, 93.5%) // #eee
$brand-primary: $gl-primary;
$brand-success: $gl-success;
$brand-info: $gl-info;
$brand-warning: $gl-warning;
$brand-danger: $gl-danger;
$border-radius-base: 3px !default;
$border-radius-large: 3px !default;
$border-radius-small: 3px !default;
//== Scaffolding
//
$text-color: $gl-text-color;
$link-color: $gl-link-color;
$link-hover-color: $gl-link-hover-color;
//== Typography
//
//## Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: $regular_font;
$font-family-monospace: $monospace_font;
$font-size-base: $gl-font-size;
//== Components
//
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
$padding-base-vertical: $gl-vert-padding;
$padding-base-horizontal: $gl-padding;
$component-active-color: $white-light;
$component-active-bg: $brand-info;
//== Forms
//
//##
$input-color: $text-color;
$input-border: $border-color;
$input-border-focus: $focus-border-color;
$legend-color: $text-color;
//== Pagination
//
//##
$pagination-color: $gl-text-color;
$pagination-bg: $white-light;
$pagination-border: $border-color;
$pagination-hover-color: $gl-text-color;
$pagination-hover-bg: $row-hover;
$pagination-hover-border: $border-color;
$pagination-active-color: $white-light;
$pagination-active-bg: $gl-link-color;
$pagination-active-border: $gl-link-color;
$pagination-disabled-color: #cdcdcd;
$pagination-disabled-bg: $gray-light;
$pagination-disabled-border: $border-color;
//== Form states and alerts
//
//## Define colors for form feedback states and, by default, alerts.
$state-success-text: $white-light;
$state-success-bg: $brand-success;
$state-success-border: $brand-success;
$state-info-text: $white-light;
$state-info-bg: $brand-info;
$state-info-border: $brand-info;
$state-warning-text: $white-light;
$state-warning-bg: $brand-warning;
$state-warning-border: $brand-warning;
$state-danger-text: $white-light;
$state-danger-bg: $brand-danger;
$state-danger-border: $brand-danger;
//== Alerts
//
//## Define alert colors, border radius, and padding.
$alert-border-radius: 0;
//== Panels
//
//##
$panel-border-radius: 2px;
$panel-default-text: $text-color;
$panel-default-border: $border-color;
$panel-default-heading-bg: $gray-light;
$panel-footer-bg: $gray-light;
$panel-inner-border: $border-color;
$badge-bg: $badge-bg;
$badge-color: $badge-color;
//== Wells
//
//##
$well-bg: $gray-light;
$well-border: #eee;
//== Code
//
//##
$code-color: $red-600;
$code-bg: lighten($red-100, 2%);
$kbd-color: $white-light;
$kbd-bg: #333;
//== Buttons
//
//##
$btn-default-color: $gl-text-color;
$btn-default-bg: $white-light;
$btn-default-border: #e7e9ed;
//== Nav
//
//##
$nav-link-padding: 13px $gl-padding;
//== Code
//
//##
$pre-bg: $gray-light !default;
$pre-color: $gl-text-color !default;
$pre-border-color: $border-color;
$table-bg-accent: $gray-light;
$zindex-popover: 900;
//== Modals
//
//##
//** Padding applied to the modal body
$modal-inner-padding: $gl-padding;
//** Padding applied to the modal title
$modal-title-padding: $gl-padding;
//** Modal title line-height
// $modal-title-line-height: $line-height-base
//** Background color of modal content area
$modal-content-bg: $gray-light;
$modal-body-bg: $white-light;
//** Modal content border color
// $modal-content-border-color: rgba(0,0,0,.2)
//** Modal content border color **for IE8**
// $modal-content-fallback-border-color: #999
//** Modal backdrop background color
// $modal-backdrop-bg: #000
//** Modal backdrop opacity
// $modal-backdrop-opacity: .5
//** Modal header border color
// $modal-header-border-color: #e5e5e5
//** Modal footer border color
// $modal-footer-border-color: $modal-header-border-color
$modal-lg: 860px;
$modal-md: 540px;
// $modal-sm: 300px
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7