From af61bf673953cf9c88da72bba6dd81aa44814e8c Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 3 Sep 2014 04:25:16 +0200 Subject: rake convert --- assets/stylesheets/bootstrap/_dropdowns.scss | 6 ++---- assets/stylesheets/bootstrap/_jumbotron.scss | 3 ++- assets/stylesheets/bootstrap/_list-group.scss | 1 + assets/stylesheets/bootstrap/_pager.scss | 1 - assets/stylesheets/bootstrap/_panels.scss | 3 ++- assets/stylesheets/bootstrap/_popovers.scss | 9 ++++---- assets/stylesheets/bootstrap/_print.scss | 26 +++++++++++------------- assets/stylesheets/bootstrap/_thumbnails.scss | 2 +- assets/stylesheets/bootstrap/_variables.scss | 10 +++------ assets/stylesheets/bootstrap/mixins/_labels.scss | 2 +- 10 files changed, 29 insertions(+), 34 deletions(-) (limited to 'assets/stylesheets') diff --git a/assets/stylesheets/bootstrap/_dropdowns.scss b/assets/stylesheets/bootstrap/_dropdowns.scss index eb74be5..260f15b 100644 --- a/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/assets/stylesheets/bootstrap/_dropdowns.scss @@ -103,9 +103,8 @@ &:focus { color: $dropdown-link-disabled-color; } -} -// Nuke hover/focus effects -.dropdown-menu > .disabled > a { + + // Nuke hover/focus effects &:hover, &:focus { text-decoration: none; @@ -212,4 +211,3 @@ } } } - diff --git a/assets/stylesheets/bootstrap/_jumbotron.scss b/assets/stylesheets/bootstrap/_jumbotron.scss index 75efe64..9d89671 100644 --- a/assets/stylesheets/bootstrap/_jumbotron.scss +++ b/assets/stylesheets/bootstrap/_jumbotron.scss @@ -23,7 +23,8 @@ border-top-color: darken($jumbotron-bg, 10%); } - .container & { + .container &, + .container-fluid & { border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container } diff --git a/assets/stylesheets/bootstrap/_list-group.scss b/assets/stylesheets/bootstrap/_list-group.scss index 36c297c..53b4302 100644 --- a/assets/stylesheets/bootstrap/_list-group.scss +++ b/assets/stylesheets/bootstrap/_list-group.scss @@ -74,6 +74,7 @@ a.list-group-item { &.disabled:focus { background-color: $list-group-disabled-bg; color: $list-group-disabled-color; + cursor: not-allowed; // Force color to inherit for custom content .list-group-item-heading { diff --git a/assets/stylesheets/bootstrap/_pager.scss b/assets/stylesheets/bootstrap/_pager.scss index 6531fe6..af879af 100644 --- a/assets/stylesheets/bootstrap/_pager.scss +++ b/assets/stylesheets/bootstrap/_pager.scss @@ -51,5 +51,4 @@ cursor: not-allowed; } } - } diff --git a/assets/stylesheets/bootstrap/_panels.scss b/assets/stylesheets/bootstrap/_panels.scss index fec08b2..2210e91 100644 --- a/assets/stylesheets/bootstrap/_panels.scss +++ b/assets/stylesheets/bootstrap/_panels.scss @@ -56,7 +56,8 @@ // any kind of custom content between the two. .panel { - > .list-group { + > .list-group, + > .panel-collapse > .list-group { margin-bottom: 0; .list-group-item { diff --git a/assets/stylesheets/bootstrap/_popovers.scss b/assets/stylesheets/bootstrap/_popovers.scss index 1cf27ae..9e28c3c 100644 --- a/assets/stylesheets/bootstrap/_popovers.scss +++ b/assets/stylesheets/bootstrap/_popovers.scss @@ -11,7 +11,11 @@ display: none; max-width: $popover-max-width; padding: 1px; - text-align: left; // Reset given new insertion method + // Reset font and text propertes given new insertion method + font-size: $font-size-base; + font-weight: normal; + line-height: $line-height-base; + text-align: left; background-color: $popover-bg; background-clip: padding-box; border: 1px solid $popover-fallback-border-color; @@ -33,8 +37,6 @@ margin: 0; // reset heading margin padding: 8px 14px; font-size: $font-size-base; - font-weight: normal; - line-height: 18px; background-color: $popover-title-bg; border-bottom: 1px solid darken($popover-title-bg, 5%); border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0; @@ -129,5 +131,4 @@ bottom: -$popover-arrow-width; } } - } diff --git a/assets/stylesheets/bootstrap/_print.scss b/assets/stylesheets/bootstrap/_print.scss index 3655d03..a5acd82 100644 --- a/assets/stylesheets/bootstrap/_print.scss +++ b/assets/stylesheets/bootstrap/_print.scss @@ -1,15 +1,14 @@ // // Basic print styles // -------------------------------------------------- -// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css +// Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css @media print { - * { - text-shadow: none !important; - color: #000 !important; // Black prints faster: h5bp.com/s background: transparent !important; + color: #000 !important; // Black prints faster: h5bp.com/s box-shadow: none !important; + text-shadow: none !important; } a, @@ -25,9 +24,10 @@ content: " (" attr(title) ")"; } - // Don't show links for images, or javascript/internal links - a[href^="javascript:"]:after, - a[href^="#"]:after { + // Don't show links that are fragment identifiers, + // or use the `javascript:` pseudo protocol + a[href^="#"]:after, + a[href^="javascript:"]:after { content: ""; } @@ -72,12 +72,6 @@ .navbar { display: none; } - .table { - td, - th { - background-color: #fff !important; - } - } .btn, .dropup > .btn { > .caret { @@ -90,6 +84,11 @@ .table { border-collapse: collapse !important; + + td, + th { + background-color: #fff !important; + } } .table-bordered { th, @@ -97,5 +96,4 @@ border: 1px solid #ddd !important; } } - } diff --git a/assets/stylesheets/bootstrap/_thumbnails.scss b/assets/stylesheets/bootstrap/_thumbnails.scss index 3d5ed86..ea99859 100644 --- a/assets/stylesheets/bootstrap/_thumbnails.scss +++ b/assets/stylesheets/bootstrap/_thumbnails.scss @@ -12,7 +12,7 @@ background-color: $thumbnail-bg; border: 1px solid $thumbnail-border; border-radius: $thumbnail-border-radius; - @include transition(all .2s ease-in-out); + @include transition(border .2s ease-in-out); > img, a > img { diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index a424736..3749661 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -377,12 +377,12 @@ $navbar-default-toggle-border-color: #ddd !default; // Inverted navbar // Reset inverted navbar basics -$navbar-inverse-color: lighten($gray-light, 12%) !default; +$navbar-inverse-color: lighten($gray-light, 15%) !default; $navbar-inverse-bg: #222 !default; $navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default; // Inverted navbar links -$navbar-inverse-link-color: $gray-light !default; +$navbar-inverse-link-color: lighten($gray-light, 15%) !default; $navbar-inverse-link-hover-color: #fff !default; $navbar-inverse-link-hover-bg: transparent !default; $navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default; @@ -412,8 +412,6 @@ $nav-link-hover-bg: $gray-lighter !default; $nav-disabled-link-color: $gray-light !default; $nav-disabled-link-hover-color: $gray-light !default; -$nav-open-link-hover-color: #fff !default; - //== Tabs $nav-tabs-border-color: #ddd !default; @@ -538,7 +536,7 @@ $popover-title-bg: darken($popover-bg, 3%) !default; //** Popover arrow width $popover-arrow-width: 10px !default; //** Popover arrow color -$popover-arrow-color: #fff !default; +$popover-arrow-color: $popover-bg !default; //** Popover outer arrow width $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; @@ -851,5 +849,3 @@ $page-header-border-color: $gray-lighter !default; $dl-horizontal-offset: $component-offset-horizontal !default; //** Horizontal line color. $hr-border: $gray-lighter !default; - - diff --git a/assets/stylesheets/bootstrap/mixins/_labels.scss b/assets/stylesheets/bootstrap/mixins/_labels.scss index d99a653..eda6dfd 100644 --- a/assets/stylesheets/bootstrap/mixins/_labels.scss +++ b/assets/stylesheets/bootstrap/mixins/_labels.scss @@ -2,7 +2,7 @@ @mixin label-variant($color) { background-color: $color; - + &[href] { &:hover, &:focus { -- cgit v1.2.3