Project

General

Profile

« Previous | Next » 

Revision bf4a13d3

Added by Walden Raines over 10 years ago

Fixes #3811 updating to bootstrap 3

View differences:

app/assets/stylesheets/bootstrap_and_overrides.scss
/*
=require twitter-bootstrap-static/bootstrap
=require twitter-bootstrap-static/sprites
*/
@import "mixin";
@import "colors";
@font-face {
font-family: 'Overpass';
src: local("Overpass"),
font-url('overpass_regular-web.eot?#iefix') format("eot"),
font-url('overpass_regular-web.woff') format("woff"),
font-url('overpass_regular-web.ttf') format("truetype"),
font-url('overpass_regular-web.svg#webfontLTZe4IYH') format("svg");
font-weight: normal;
font-style: normal;
$navbar-default-bg: $primary_color;
@import "twitter/bootstrap";
.dropdown-menu {
@include border_radius(0, 0, 6px, 6px);
}
// Necessary because bootstrap3 nav dropdown does not have top arrow
.nav li .dropdown-menu:after {
content: '';
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid #ffffff;
position: absolute;
top: -6px;
left: 10px;
}
.navbar .navbar-right > li > .dropdown-menu:after,
.navbar .nav > li > .dropdown-menu.pull-right:after {
left: auto;
right: 13px;
}
// Necessary because bootstrap3 does not support dropdown sub menus.
.dropdown-submenu {
position:relative;
}
@font-face {
font-family: 'Overpass';
src: local("Overpass Bold"),
local("OverpassBold"),
font-url('overpass_bold-web.eot?#iefix') format("eot"),
font-url('overpass_bold-web.woff') format("woff"),
font-url('overpass_bold-web.ttf') format("truetype"),
font-url('overpass_bold-web.svg#webfontzAU82Ltw') format("svg");
font-weight: bold;
font-style: normal;
.dropdown-submenu > .dropdown-menu {
top:0;
left:100%;
margin-top:-6px;
margin-left:-1px;
}
table .span0{
float:none;width:20px;margin-left:0;
.dropdown-submenu:hover > .dropdown-menu {
display:block;
}
.table th{
color: #777777;
background: rgba(0, 0, 0, 0.08);
& a {
text-decoration: none;
color: #777777;
}
.dropdown-submenu > a:after {
display:block;content:" ";
float:right;
width:0;
height:0;
border-color:transparent;
border-style:solid;
border-width:5px 0 5px 5px;
border-left-color:#cccccc;
margin-top:5px;
margin-right:-10px;
}
h1, h2, h3{line-height: 32px;}
.btn a {text-decoration: none; color: #333333;}
.dropdown-submenu:hover > a:after {
border-left-color:#ffffff;
}
.navbar.navbar-inverse .navbar-inner{
border-bottom: none;
border-top: 1px solid $border_color;
@include linear-gradient($primary_gradient_start, $primary_gradient_end);
color: #ffffff;
a {
font-family: Overpass, sans-serif, sans;
font-size: 14px;
}
.dropdown-submenu.pull-left {
float:none;
}
.navbar-inverse .brand, .navbar-inverse .nav>li>a {
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
.dropdown-submenu.pull-left > .dropdown-menu {
left:-100%;
margin-left:10px;
}
.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
// Bootstrap 3 no longer has icon-color classes
.icon-white {
color: white;
}
.navbar-inverse{
.btn-navbar,
.nav .active>a,
.nav li.dropdown.open>.dropdown-toggle,
.nav li.dropdown.active>.dropdown-toggle,
.nav li.dropdown.open.active>.dropdown-toggle {
color: #ffffff;
@include linear-gradient($selected_gradient_start, $selected_gradient_end);
}
.badge.badge-inverse {
background-color: black;
}
.navbar.navbar-inverse .navbar-inner{
.nav>li>a:hover,
.nav>li>a:focus {
@include linear-gradient($hover_gradient_start, $hover_gradient_end);
}
span.input-group-btn .hidden-xs {display:inline !important;}
@media (max-width: 768px) {
span.input-group-btn .hidden-xs {display:none !important;}
}
.dropdown-menu{
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
margin: 0;
span.btn a{ text-decoration: none; color: #333333}
// help-inline is not defined in Bootstrap3
.help-inline{
vertical-align: middle;
line-height: 2.428571;
}
.nav-collapse.collapse.in li a{
color: #ffffff;
.well {
padding: 19px 19px 19px 36px;
background-color: white;
}
.navbar-fixed-top{
position: relative;
.label-default {
background-color: #cccccc;
}
.nav-collapse.collapse.in li a:hover,
.ui-menu .ui-menu-item a.ui-state-focus {
color: #ffffff;
text-decoration: none;
border-color: #0081c2;
-webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0;
@include linear-gradient(#0081c2, #0077b3);
.form-actions {
padding: 19px 20px 20px;
margin-top: 20px;
margin-bottom: 20px;
}
.pull-right .dropdown-submenu > .dropdown-menu
{
left: -95%;
border-radius: 6px 0px 6px 6px;
.navbar.navbar-form{
background-color: #f8f8f8;
padding: 10px;
border: 1px solid #e7e7e7;
border-radius: 4px;
}
.title_filter form{
margin: 0;
.nav.nav-tabs{
margin-bottom: 20px;
}
.tab-pane{
.tab-content{
min-height: 420px;
}
#about .tab-pane{
max-height: 420px;
/* custom inclusion of right, left and below tabs */
.tabs-below > .nav-tabs,
.tabs-right > .nav-tabs,
.tabs-left > .nav-tabs {
border-bottom: 0;
}
.tab-content > .tab-pane,
.pill-content > .pill-pane {
display: none;
}
.tab-content > .active,
.pill-content > .active {
display: block;
}
.tabs-below > .nav-tabs {
border-top: 1px solid #ddd;
}
.autocomplete-clear {
height: 18px;
.tabs-below > .nav-tabs > li {
margin-top: -1px;
margin-bottom: 0;
vertical-align: middle;
}
.form-search .btn{
height: 30px;
.tabs-below > .nav-tabs > li > a {
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
}
.tabs-below > .nav-tabs > li > a:hover,
.tabs-below > .nav-tabs > li > a:focus {
border-top-color: #ddd;
border-bottom-color: transparent;
}
.tabs-below > .nav-tabs > .active > a,
.tabs-below > .nav-tabs > .active > a:hover,
.tabs-below > .nav-tabs > .active > a:focus {
border-color: transparent #ddd #ddd #ddd;
}
.tabs-left > .nav-tabs > li,
.tabs-right > .nav-tabs > li {
float: none;
}
.tabs-left > .nav-tabs > li > a,
.tabs-right > .nav-tabs > li > a {
min-width: 74px;
margin-right: 0;
margin-bottom: 3px;
}
.tabs-left > .nav-tabs {
float: left;
margin-right: 19px;
padding-right: 0;
border-right: 1px solid #ddd;
}
.tabs-left > .nav-tabs > li > a {
margin-right: -1px;
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
}
.tabs-left > .nav-tabs > li > a:hover,
.tabs-left > .nav-tabs > li > a:focus {
border-color: #eeeeee #dddddd #eeeeee #eeeeee;
}
.tabs-left > .nav-tabs .active > a,
.tabs-left > .nav-tabs .active > a:hover,
.tabs-left > .nav-tabs .active > a:focus {
border-color: #ddd transparent #ddd #ddd;
*border-right-color: #ffffff;
}
.tabs-right > .nav-tabs {
float: right;
margin-left: 19px;
border-left: 1px solid #ddd;
}
.tabs-right > .nav-tabs > li > a {
margin-left: -1px;
-webkit-border-radius: 0 4px 4px 0;
-moz-border-radius: 0 4px 4px 0;
border-radius: 0 4px 4px 0;
}
.tabs-right > .nav-tabs > li > a:hover,
.tabs-right > .nav-tabs > li > a:focus {
border-color: #eeeeee #eeeeee #eeeeee #dddddd;
}
.tabs-right > .nav-tabs .active > a,
.tabs-right > .nav-tabs .active > a:hover,
.tabs-right > .nav-tabs .active > a:focus {
border-color: #ddd #ddd #ddd transparent;
*border-left-color: #ffffff;
}

Also available in: Unified diff