From 6fe694cbd0627c45db4ed5ac3935d783ea0f02c8 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 2 Sep 2014 23:48:44 +0200 Subject: Port over fixes from branch next --- assets/stylesheets/_bootstrap.scss | 50 +++++++++++++++++++++++++++ assets/stylesheets/bootstrap.scss | 50 --------------------------- assets/stylesheets/bootstrap/_list-group.scss | 3 +- assets/stylesheets/bootstrap/_variables.scss | 2 +- assets/stylesheets/bootstrap/bootstrap.scss | 50 --------------------------- 5 files changed, 52 insertions(+), 103 deletions(-) create mode 100644 assets/stylesheets/_bootstrap.scss delete mode 100644 assets/stylesheets/bootstrap.scss delete mode 100644 assets/stylesheets/bootstrap/bootstrap.scss (limited to 'assets') diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss new file mode 100644 index 0000000..65204aa --- /dev/null +++ b/assets/stylesheets/_bootstrap.scss @@ -0,0 +1,50 @@ +// Core variables and mixins +@import "bootstrap/variables"; +@import "bootstrap/mixins"; + +// Reset and dependencies +@import "bootstrap/normalize"; +@import "bootstrap/print"; +@import "bootstrap/glyphicons"; + +// 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/jumbotron"; +@import "bootstrap/thumbnails"; +@import "bootstrap/alerts"; +@import "bootstrap/progress-bars"; +@import "bootstrap/media"; +@import "bootstrap/list-group"; +@import "bootstrap/panels"; +@import "bootstrap/responsive-embed"; +@import "bootstrap/wells"; +@import "bootstrap/close"; + +// Components w/ JavaScript +@import "bootstrap/modals"; +@import "bootstrap/tooltip"; +@import "bootstrap/popovers"; +@import "bootstrap/carousel"; + +// Utility classes +@import "bootstrap/utilities"; +@import "bootstrap/responsive-utilities"; diff --git a/assets/stylesheets/bootstrap.scss b/assets/stylesheets/bootstrap.scss deleted file mode 100644 index 65204aa..0000000 --- a/assets/stylesheets/bootstrap.scss +++ /dev/null @@ -1,50 +0,0 @@ -// Core variables and mixins -@import "bootstrap/variables"; -@import "bootstrap/mixins"; - -// Reset and dependencies -@import "bootstrap/normalize"; -@import "bootstrap/print"; -@import "bootstrap/glyphicons"; - -// 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/jumbotron"; -@import "bootstrap/thumbnails"; -@import "bootstrap/alerts"; -@import "bootstrap/progress-bars"; -@import "bootstrap/media"; -@import "bootstrap/list-group"; -@import "bootstrap/panels"; -@import "bootstrap/responsive-embed"; -@import "bootstrap/wells"; -@import "bootstrap/close"; - -// Components w/ JavaScript -@import "bootstrap/modals"; -@import "bootstrap/tooltip"; -@import "bootstrap/popovers"; -@import "bootstrap/carousel"; - -// Utility classes -@import "bootstrap/utilities"; -@import "bootstrap/responsive-utilities"; diff --git a/assets/stylesheets/bootstrap/_list-group.scss b/assets/stylesheets/bootstrap/_list-group.scss index 49c64eb..36c297c 100644 --- a/assets/stylesheets/bootstrap/_list-group.scss +++ b/assets/stylesheets/bootstrap/_list-group.scss @@ -74,8 +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 { color: inherit; diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 1abd52e..2d17e0c 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -1,4 +1,4 @@ -// When true, asset path helpers are used, otherwise regular url() is used +// When true, asset path helpers are used, otherwise the regular CSS `url()` is used. // When there no function is defined, `fn('')` is parsed as string that equals the right hand side // NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path) $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default; diff --git a/assets/stylesheets/bootstrap/bootstrap.scss b/assets/stylesheets/bootstrap/bootstrap.scss deleted file mode 100644 index 4d6f8aa..0000000 --- a/assets/stylesheets/bootstrap/bootstrap.scss +++ /dev/null @@ -1,50 +0,0 @@ -// Core variables and mixins -@import "variables"; -@import "mixins"; - -// Reset and dependencies -@import "normalize"; -@import "print"; -@import "glyphicons"; - -// Core CSS -@import "scaffolding"; -@import "type"; -@import "code"; -@import "grid"; -@import "tables"; -@import "forms"; -@import "buttons"; - -// Components -@import "component-animations"; -@import "dropdowns"; -@import "button-groups"; -@import "input-groups"; -@import "navs"; -@import "navbar"; -@import "breadcrumbs"; -@import "pagination"; -@import "pager"; -@import "labels"; -@import "badges"; -@import "jumbotron"; -@import "thumbnails"; -@import "alerts"; -@import "progress-bars"; -@import "media"; -@import "list-group"; -@import "panels"; -@import "responsive-embed"; -@import "wells"; -@import "close"; - -// Components w/ JavaScript -@import "modals"; -@import "tooltip"; -@import "popovers"; -@import "carousel"; - -// Utility classes -@import "utilities"; -@import "responsive-utilities"; -- cgit v1.2.3