From a60f8a6d79f150a4785dce8e3aaac38086a20510 Mon Sep 17 00:00:00 2001 From: Alexandr Kondrashov Date: Sat, 22 Aug 2015 03:47:26 +0300 Subject: [PATCH 001/183] replace PNG to SVG and compress SVGs before: https://pp.vk.me/c624325/v624325775/44408/FabMA25FDDs.jpg before(image-rendering: pixelated): https://pp.vk.me/c624325/v624325775/44416/Dzb6tO4Mmys.jpg after: https://pp.vk.me/c624325/v624325775/4440f/imd6KcYBgGI.jpg --- scss/_custom-forms.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index ec211acaa..9c5b7796f 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -74,12 +74,12 @@ } input:checked ~ .c-indicator { - background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTYuNCwxTDUuNywxLjdMMi45LDQuNUwyLjEsMy43TDEuNCwzTDAsNC40bDAuNywwLjdsMS41LDEuNWwwLjcsMC43bDAuNy0wLjdsMy41LTMuNWwwLjctMC43TDYuNCwxTDYuNCwxeiINCgkvPg0KPC9zdmc+DQo=); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik02LjQgMWwtLjcuNy0yLjggMi44LS44LS44LS43LS43TDAgNC40bC43LjcgMS41IDEuNS43LjcuNy0uNyAzLjUtMy41LjctLjdMNi40IDF6Ii8+PC9zdmc+); } input:indeterminate ~ .c-indicator { background-color: #0074d9; - background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iOHB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDggOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgOCA4IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0wLDN2Mmg4VjNIMHoiLz4NCjwvc3ZnPg0K); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0wIDN2Mmg4VjNIMHoiLz48L3N2Zz4=); @include box-shadow(none); } } @@ -94,7 +94,7 @@ } input:checked ~ .c-indicator { - background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQsMUMyLjMsMSwxLDIuMywxLDRzMS4zLDMsMywzczMtMS4zLDMtM1M1LjcsMSw0LDF6Ii8+DQo8L3N2Zz4NCg==); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii00IC00IDggOCI+PGNpcmNsZSByPSIzIiBmaWxsPSIjZmZmIi8+PC9zdmc+); } } @@ -131,7 +131,7 @@ max-width: 100%; padding: .375rem 1.75rem .375rem .75rem; vertical-align: middle; - background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; + background: #fff url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0IDUiPjxwYXRoIGZpbGw9IiMzMzMiIGQ9Ik0yIDBMMCAyaDR6bTAgNUwwIDNoNHoiLz48L3N2Zz4=) no-repeat right .75rem center; background-size: 8px 10px; border: 1px solid $input-border; From 353e0a49a97c24d89f6cdb95014419d4137dee6e Mon Sep 17 00:00:00 2001 From: Alexandr Kondrashov Date: Sat, 22 Aug 2015 03:50:31 +0300 Subject: [PATCH 002/183] compress SVGs Well compressed, but I'm sure it is possible to compress more --- scss/_variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 3b31dbdaf..70e22e8e8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -293,9 +293,9 @@ $input-group-addon-border-color: $input-border !default; $cursor-disabled: not-allowed !default; // Form validation icons -$form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg=="; -$form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg=="; -$form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4="; +$form-icon-success: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjNWNiODVjIiBkPSJNMjMzLjggNjEwYy0xMy4zIDAtMjYtNi0zNC0xNi44TDkwLjUgNDQ4LjhDNzYuMyA0MzAgODAgNDAzLjMgOTguOCAzODljMTguOC0xNC4yIDQ1LjUtMTAuNCA1OS44IDguNGw3MiA5NUw0NTEuMyAyNDJjMTIuNS0yMCAzOC44LTI2LjIgNTguOC0xMy43IDIwIDEyLjQgMjYgMzguNyAxMy43IDU4LjhMMjcwIDU5MGMtNy40IDEyLTIwLjIgMTkuNC0zNC4zIDIwaC0yeiIvPjwvc3ZnPg=="; +$form-icon-warning: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZjBhZDRlIiBkPSJNNjAzIDY0MC4ybC0yNzguNS01MDljLTMuOC02LjYtMTAuOC0xMC42LTE4LjUtMTAuNnMtMTQuNyA0LTE4LjUgMTAuNkw5IDY0MC4yYy0zLjcgNi41LTMuNiAxNC40LjIgMjAuOCAzLjggNi41IDEwLjggMTAuNCAxOC4zIDEwLjRoNTU3YzcuNiAwIDE0LjYtNCAxOC40LTEwLjQgMy41LTYuNCAzLjYtMTQuNCAwLTIwLjh6bS0yNjYuNC0zMGgtNjEuMlY1NDloNjEuMnY2MS4yem0wLTEwN2gtNjEuMlYzMDRoNjEuMnYxOTl6Ii8+PC9zdmc+"; +$form-icon-error: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZDk1MzRmIiBkPSJNNDQ3IDU0NC40Yy0xNC40IDE0LjQtMzcuNiAxNC40LTUyIDBsLTg5LTkyLjctODkgOTIuN2MtMTQuNSAxNC40LTM3LjcgMTQuNC01MiAwLTE0LjQtMTQuNC0xNC40LTM3LjYgMC01Mmw5Mi40LTk2LjMtOTIuNC05Ni4zYy0xNC40LTE0LjQtMTQuNC0zNy42IDAtNTJzMzcuNi0xNC4zIDUyIDBsODkgOTIuOCA4OS4yLTkyLjdjMTQuNC0xNC40IDM3LjYtMTQuNCA1MiAwIDE0LjMgMTQuNCAxNC4zIDM3LjYgMCA1MkwzNTQuNiAzOTZsOTIuNCA5Ni40YzE0LjQgMTQuNCAxNC40IDM3LjYgMCA1MnoiLz48L3N2Zz4="; // Dropdowns From 4d979239ec3af0a540bd5dfc989f87eb76bb1a3c Mon Sep 17 00:00:00 2001 From: Catalin Zalog Date: Fri, 18 Sep 2015 01:19:32 +0300 Subject: [PATCH 003/183] The .text-hide won't hide the text :) --- scss/mixins/_text-hide.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/mixins/_text-hide.scss b/scss/mixins/_text-hide.scss index daed5fb7a..52a38a906 100644 --- a/scss/mixins/_text-hide.scss +++ b/scss/mixins/_text-hide.scss @@ -1,6 +1,6 @@ // CSS image replacement @mixin text-hide() { - font: "0/0" a; + font: 0/0 a; color: transparent; text-shadow: none; background-color: transparent; From aaae40c069ee79102a5587f7dc383bac9825f96d Mon Sep 17 00:00:00 2001 From: Stephanie Kendall Date: Tue, 1 Dec 2015 13:44:37 -0600 Subject: [PATCH 004/183] implements a _custom.scss, resolves #17322 --- scss/_custom.scss | 4 ++++ scss/bootstrap.scss | 1 + 2 files changed, 5 insertions(+) create mode 100644 scss/_custom.scss diff --git a/scss/_custom.scss b/scss/_custom.scss new file mode 100644 index 000000000..6871992aa --- /dev/null +++ b/scss/_custom.scss @@ -0,0 +1,4 @@ +// Custom Overrides +// +// Copy settings from `_variables.scss` to this file to override +// the Bootstrap defaults without modifying key, versioned files. diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index e9300f54d..8f7e90ea2 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -6,6 +6,7 @@ // Core variables and mixins @import "variables"; +@import "custom"; @import "mixins"; // Reset and dependencies From 568073feb9a29bd5b154384b3cce43fd372cb32e Mon Sep 17 00:00:00 2001 From: Alexandr Kondrashov Date: Tue, 8 Dec 2015 02:48:05 +0300 Subject: [PATCH 005/183] SVG: base64 > ASCII85 --- scss/_custom-forms.scss | 12 ++++-------- scss/_variables.scss | 12 +++--------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index ae5fc3d93..1ebe6316a 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -75,12 +75,12 @@ } input:checked ~ .c-indicator { - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik02LjQgMWwtLjcuNy0yLjggMi44LS44LS44LS43LS43TDAgNC40bC43LjcgMS41IDEuNS43LjcuNy0uNyAzLjUtMy41LjctLjdMNi40IDF6Ii8+PC9zdmc+); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"); } input:indeterminate ~ .c-indicator { background-color: #0074d9; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA4IDgiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0wIDN2Mmg4VjNIMHoiLz48L3N2Zz4=); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E"); @include box-shadow(none); } } @@ -95,7 +95,7 @@ } input:checked ~ .c-indicator { - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9Ii00IC00IDggOCI+PGNpcmNsZSByPSIzIiBmaWxsPSIjZmZmIi8+PC9zdmc+); + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E"); } } @@ -135,12 +135,8 @@ padding: .375rem 1.75rem .375rem .75rem; padding-right: .75rem \9; vertical-align: middle; -<<<<<<< HEAD - background: #fff url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0IDUiPjxwYXRoIGZpbGw9IiMzMzMiIGQ9Ik0yIDBMMCAyaDR6bTAgNUwwIDNoNHoiLz48L3N2Zz4=) no-repeat right .75rem center; -======= - background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; + background: #fff url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E") no-repeat right .75rem center; background-image: none \9; ->>>>>>> twbs/v4-dev background-size: 8px 10px; border: $input-border-width solid $input-border-color; // Use vendor prefixes as `appearance` isn't part of the CSS spec. diff --git a/scss/_variables.scss b/scss/_variables.scss index fca481a6d..5b5caa433 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -295,15 +295,9 @@ $input-group-addon-border-color: $input-border !default; $cursor-disabled: not-allowed !default; // Form validation icons -<<<<<<< HEAD -$form-icon-success: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjNWNiODVjIiBkPSJNMjMzLjggNjEwYy0xMy4zIDAtMjYtNi0zNC0xNi44TDkwLjUgNDQ4LjhDNzYuMyA0MzAgODAgNDAzLjMgOTguOCAzODljMTguOC0xNC4yIDQ1LjUtMTAuNCA1OS44IDguNGw3MiA5NUw0NTEuMyAyNDJjMTIuNS0yMCAzOC44LTI2LjIgNTguOC0xMy43IDIwIDEyLjQgMjYgMzguNyAxMy43IDU4LjhMMjcwIDU5MGMtNy40IDEyLTIwLjIgMTkuNC0zNC4zIDIwaC0yeiIvPjwvc3ZnPg=="; -$form-icon-warning: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZjBhZDRlIiBkPSJNNjAzIDY0MC4ybC0yNzguNS01MDljLTMuOC02LjYtMTAuOC0xMC42LTE4LjUtMTAuNnMtMTQuNyA0LTE4LjUgMTAuNkw5IDY0MC4yYy0zLjcgNi41LTMuNiAxNC40LjIgMjAuOCAzLjggNi41IDEwLjggMTAuNCAxOC4zIDEwLjRoNTU3YzcuNiAwIDE0LjYtNCAxOC40LTEwLjQgMy41LTYuNCAzLjYtMTQuNCAwLTIwLjh6bS0yNjYuNC0zMGgtNjEuMlY1NDloNjEuMnY2MS4yem0wLTEwN2gtNjEuMlYzMDRoNjEuMnYxOTl6Ii8+PC9zdmc+"; -$form-icon-error: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZDk1MzRmIiBkPSJNNDQ3IDU0NC40Yy0xNC40IDE0LjQtMzcuNiAxNC40LTUyIDBsLTg5LTkyLjctODkgOTIuN2MtMTQuNSAxNC40LTM3LjcgMTQuNC01MiAwLTE0LjQtMTQuNC0xNC40LTM3LjYgMC01Mmw5Mi40LTk2LjMtOTIuNC05Ni4zYy0xNC40LTE0LjQtMTQuNC0zNy42IDAtNTJzMzcuNi0xNC4zIDUyIDBsODkgOTIuOCA4OS4yLTkyLjdjMTQuNC0xNC40IDM3LjYtMTQuNCA1MiAwIDE0LjMgMTQuNCAxNC4zIDM3LjYgMCA1MkwzNTQuNiAzOTZsOTIuNCA5Ni40YzE0LjQgMTQuNCAxNC40IDM3LjYgMCA1MnoiLz48L3N2Zz4="; -======= -$form-icon-success: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNoZWNrIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiM1Q0I4NUMiIGQ9Ik0yMzMuOCw2MTAuMWMtMTMuMywwLTI1LjktNi4yLTM0LTE2LjlMOTAuNSw0NDguOEM3Ni4zLDQzMCw4MCw0MDMuMyw5OC44LDM4OS4xYzE4LjgtMTQuMyw0NS41LTEwLjUsNTkuOCw4LjNsNzEuOSw5NWwyMjAuOS0yNTAuNWMxMi41LTIwLDM4LjgtMjYuMSw1OC44LTEzLjZjMjAsMTIuNCwyNi4xLDM4LjcsMTMuNiw1OC44TDI3MCw1OTBjLTcuNCwxMi0yMC4yLDE5LjQtMzQuMywyMC4xQzIzNS4xLDYxMC4xLDIzNC41LDYxMC4xLDIzMy44LDYxMC4xeiIvPjwvc3ZnPg==" !default; -$form-icon-warning: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9Ildhcm5pbmciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgNjEyIDc5MiIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjEyIDc5MiIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+PHBhdGggZmlsbD0iI0YwQUQ0RSIgZD0iTTYwMyw2NDAuMmwtMjc4LjUtNTA5Yy0zLjgtNi42LTEwLjgtMTAuNi0xOC41LTEwLjZzLTE0LjcsNC4xLTE4LjUsMTAuNkw5LDY0MC4yYy0zLjcsNi41LTMuNiwxNC40LDAuMiwyMC44YzMuOCw2LjUsMTAuOCwxMC40LDE4LjMsMTAuNGg1NTcuMWM3LjUsMCwxNC41LTMuOSwxOC4zLTEwLjRDNjA2LjYsNjU0LjYsNjA2LjcsNjQ2LjYsNjAzLDY0MC4yeiBNMzM2LjYsNjEwLjJoLTYxLjJWNTQ5aDYxLjJWNjEwLjJ6IE0zMzYuNiw1MDMuMWgtNjEuMlYzMDQuMmg2MS4yVjUwMy4xeiIvPjwvc3ZnPg==" !default; -$form-icon-error: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkNyb3NzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYxMiA3OTIiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDYxMiA3OTIiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwYXRoIGZpbGw9IiNEOTUzNEYiIGQ9Ik00NDcsNTQ0LjRjLTE0LjQsMTQuNC0zNy42LDE0LjQtNTEuOSwwTDMwNiw0NTEuN2wtODkuMSw5Mi43Yy0xNC40LDE0LjQtMzcuNiwxNC40LTUxLjksMGMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlsOTIuNC05Ni40TDE2NSwyOTkuNmMtMTQuNC0xNC40LTE0LjQtMzcuNiwwLTUxLjlzMzcuNi0xNC40LDUxLjksMGw4OS4yLDkyLjdsODkuMS05Mi43YzE0LjQtMTQuNCwzNy42LTE0LjQsNTEuOSwwYzE0LjQsMTQuNCwxNC40LDM3LjYsMCw1MS45TDM1NC43LDM5Nmw5Mi40LDk2LjRDNDYxLjQsNTA2LjgsNDYxLjQsNTMwLDQ0Nyw1NDQuNHoiLz48L3N2Zz4=" !default; ->>>>>>> twbs/v4-dev +$form-icon-success: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath d='M2.31 6.726l-1.698-2.2c-.423-1.032.452-1.407 1.1-.8l1.1 1.4 3.4-3.8c.594-.63 1.59-.267 1.2.7l-4 4.6c-.443.514-.81.418-1.1.1z' fill='%235b5'/%3E%3C/svg%3E" !default; +$form-icon-warning: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 8 8'%3E%3Cpath id='a' fill='%23d54' d='M.228 1.548l6.135 6.197c.833.77 2.183-.36 1.403-1.3L1.632.245C.725-.538-.518.735.228 1.55z'/%3E%3Cuse xlink:href='%23a' transform='rotate(90 4 4)'/%3E%3C/svg%3E" !default; +$form-icon-error: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fa4' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E" !default; // Dropdowns From d4e9dad3debdbc4169be883faf84f44bdb2b44db Mon Sep 17 00:00:00 2001 From: Alexandr Kondrashov Date: Tue, 8 Dec 2015 03:27:53 +0300 Subject: [PATCH 006/183] SVG: base64 > ASCII85 (fix merge) --- scss/_variables.scss | 72 +++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 5b5caa433..03d06117d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -60,7 +60,7 @@ $enable-grid-classes: true !default; $spacer: 1rem !default; $spacer-x: $spacer !default; $spacer-y: $spacer !default; -$border-width: .0625rem !default; +$border-width: 1px !default; // Body @@ -90,13 +90,13 @@ $grid-breakpoints: ( // Extra small screen / phone xs: 0, // Small screen / phone - sm: 34em, + sm: 544px, // Medium screen / tablet - md: 48em, + md: 768px, // Large screen / desktop - lg: 62em, + lg: 992px, // Extra large screen / wide desktop - xl: 75em + xl: 1200px ) !default; @@ -105,10 +105,10 @@ $grid-breakpoints: ( // Define the maximum width of `.container` for different screen sizes. $container-max-widths: ( - sm: 34rem, // 480 - md: 45rem, // 720 - lg: 60rem, // 960 - xl: 72.25rem // 1140 + sm: 576px, + md: 720px, + lg: 940px, + xl: 1140px ) !default; @@ -134,7 +134,7 @@ $font-size-root: 16px !default; $font-size-base: 1rem !default; $font-size-lg: 1.25rem !default; -$font-size-sm: .85rem !default; +$font-size-sm: .875rem !default; $font-size-xs: .75rem !default; $font-size-h1: 2.5rem !default; @@ -176,6 +176,12 @@ $blockquote-border-color: $gray-lighter !default; $hr-border-color: rgba(0,0,0,.1) !default; $hr-border-width: $border-width !default; +$dt-font-weight: bold !default; + +$nested-kbd-font-weight: bold !default; + +$list-inline-padding: 5px !default; + // Components // @@ -207,6 +213,7 @@ $table-bg-accent: #f9f9f9 !default; $table-bg-hover: #f5f5f5 !default; $table-bg-active: $table-bg-hover !default; +$table-border-width: $border-width !default; $table-border-color: $gray-lighter !default; @@ -217,6 +224,7 @@ $table-border-color: $gray-lighter !default; $btn-padding-x: 1rem !default; $btn-padding-y: .375rem !default; $btn-font-weight: normal !default; +$btn-border-width: $border-width !default; $btn-primary-color: #fff !default; $btn-primary-bg: $brand-primary !default; @@ -265,7 +273,8 @@ $input-bg: #fff !default; $input-bg-disabled: $gray-lighter !default; $input-color: $gray !default; -$input-border: #ccc !default; +$input-border-color: #ccc !default; +$input-border-width: $border-width !default; $input-box-shadow: inset 0 1px 1px rgba(0,0,0,.075) !default; $input-border-radius: $border-radius !default; @@ -283,21 +292,21 @@ $input-padding-y-sm: .275rem !default; $input-padding-x-lg: 1.25rem !default; $input-padding-y-lg: .75rem !default; -$input-height: (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)) !default; -$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default; -$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default; +$input-height: (($font-size-base * $line-height) + ($input-padding-y * 2)) !default; +$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default; +$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default; $form-group-margin-bottom: $spacer-y !default; $input-group-addon-bg: $gray-lighter !default; -$input-group-addon-border-color: $input-border !default; +$input-group-addon-border-color: $input-border-color !default; $cursor-disabled: not-allowed !default; // Form validation icons $form-icon-success: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath d='M2.31 6.726l-1.698-2.2c-.423-1.032.452-1.407 1.1-.8l1.1 1.4 3.4-3.8c.594-.63 1.59-.267 1.2.7l-4 4.6c-.443.514-.81.418-1.1.1z' fill='%235b5'/%3E%3C/svg%3E" !default; $form-icon-warning: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 8 8'%3E%3Cpath id='a' fill='%23d54' d='M.228 1.548l6.135 6.197c.833.77 2.183-.36 1.403-1.3L1.632.245C.725-.538-.518.735.228 1.55z'/%3E%3Cuse xlink:href='%23a' transform='rotate(90 4 4)'/%3E%3C/svg%3E" !default; -$form-icon-error: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fa4' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E" !default; +$form-icon-danger: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fa4' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E" !default; // Dropdowns @@ -305,7 +314,8 @@ $form-icon-error: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.o // Dropdown menu container and contents. $dropdown-bg: #fff !default; -$dropdown-border: rgba(0,0,0,.15) !default; +$dropdown-border-color: rgba(0,0,0,.15) !default; +$dropdown-border-width: $border-width !default; $dropdown-divider-bg: #e5e5e5 !default; $dropdown-link-color: $gray-dark !default; @@ -324,8 +334,6 @@ $dropdown-header-color: $gray-light !default; // // Warning: Avoid customizing these values. They're used for a bird's eye view // of components dependent on the z-axis and are designed to all work together. -// -// Note: These variables are not generated into the Customizer. $zindex-navbar: 1000 !default; $zindex-dropdown: 1000 !default; @@ -364,6 +372,7 @@ $nav-disabled-link-hover-color: $gray-light !default; $nav-tabs-border-color: #ddd !default; +$nav-tabs-link-border-width: $border-width !default; $nav-tabs-link-hover-border-color: $gray-lighter !default; $nav-tabs-active-link-hover-bg: $body-bg !default; @@ -390,7 +399,8 @@ $pagination-padding-y-lg: .75rem !default; $pagination-color: $link-color !default; $pagination-bg: #fff !default; -$pagination-border: #ddd !default; +$pagination-border-width: $border-width !default; +$pagination-border-color: #ddd !default; $pagination-hover-color: $link-hover-color !default; $pagination-hover-bg: $gray-lighter !default; @@ -408,7 +418,8 @@ $pagination-disabled-border: #ddd !default; // Pager $pager-bg: $pagination-bg !default; -$pager-border: $pagination-border !default; +$pager-border-width: $border-width !default; +$pager-border-color: $pagination-border-color !default; $pager-border-radius: 15px !default; $pager-hover-bg: $pagination-hover-bg !default; @@ -450,10 +461,14 @@ $state-danger-border: darken($state-danger-bg, 5%) !default; $card-spacer-x: 1.25rem !default; $card-spacer-y: .75rem !default; $card-border-width: .0625rem !default; -$card-border-radius: .25rem !default; +$card-border-radius: $border-radius !default; $card-border-color: #e5e5e5 !default; $card-border-radius-inner: ($card-border-radius - $card-border-width) !default; $card-cap-bg: #f5f5f5 !default; +$card-bg: #fff !default; + +$card-link-hover-color: #fff !default; + // Tooltips @@ -470,8 +485,8 @@ $tooltip-arrow-color: $tooltip-bg !default; $popover-bg: #fff !default; $popover-max-width: 276px !default; +$popover-border-width: $border-width !default; $popover-border-color: rgba(0,0,0,.2) !default; -$popover-fallback-border-color: #ccc !default; $popover-title-bg: darken($popover-bg, 3%) !default; @@ -480,7 +495,6 @@ $popover-arrow-color: $popover-bg !default; $popover-arrow-outer-width: ($popover-arrow-width + 1) !default; $popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default; -$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default; // Labels @@ -494,6 +508,7 @@ $label-danger-bg: $brand-danger !default; $label-color: #fff !default; $label-link-hover-color: #fff !default; +$label-font-weight: bold !default; // Modals @@ -524,6 +539,7 @@ $modal-sm: 300px !default; $alert-padding: 15px !default; $alert-border-radius: $border-radius !default; $alert-link-font-weight: bold !default; +$alert-border-width: $border-width !default; $alert-success-bg: $state-success-bg !default; $alert-success-text: $state-success-text !default; @@ -558,7 +574,8 @@ $progress-bar-info-bg: $brand-info !default; // List group $list-group-bg: #fff !default; -$list-group-border: #ddd !default; +$list-group-border-color: #ddd !default; +$list-group-border-width: $border-width !default; $list-group-border-radius: $border-radius !default; $list-group-hover-bg: #f5f5f5 !default; @@ -580,7 +597,8 @@ $list-group-link-heading-color: #333 !default; $thumbnail-padding: .25rem !default; $thumbnail-bg: $body-bg !default; -$thumbnail-border: #ddd !default; +$thumbnail-border-width: $border-width !default; +$thumbnail-border-color: #ddd !default; $thumbnail-border-radius: $border-radius !default; @@ -628,4 +646,4 @@ $kbd-bg: #333 !default; $pre-bg: #f7f7f9 !default; $pre-color: $gray-dark !default; $pre-border-color: #ccc !default; -$pre-scrollable-max-height: 340px !default; +$pre-scrollable-max-height: 340px !default; \ No newline at end of file From 750d45c9e9bb361a341bc5005a43c4abcb1f6a77 Mon Sep 17 00:00:00 2001 From: Alexandr Kondrashov Date: Tue, 8 Dec 2015 03:46:16 +0300 Subject: [PATCH 007/183] Add an empty line at the end of the file --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 03d06117d..2f2e1d2ff 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -646,4 +646,4 @@ $kbd-bg: #333 !default; $pre-bg: #f7f7f9 !default; $pre-color: $gray-dark !default; $pre-border-color: #ccc !default; -$pre-scrollable-max-height: 340px !default; \ No newline at end of file +$pre-scrollable-max-height: 340px !default; From c4c9e1959f40b822d7d347eaffcb05b7012c95f4 Mon Sep 17 00:00:00 2001 From: Alexandr Kondrashov Date: Tue, 8 Dec 2015 14:54:37 +0300 Subject: [PATCH 008/183] Fix size of validation feedback icons --- scss/_variables.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 2f2e1d2ff..a346ee6ab 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -304,9 +304,9 @@ $input-group-addon-border-color: $input-border-color !default; $cursor-disabled: not-allowed !default; // Form validation icons -$form-icon-success: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath d='M2.31 6.726l-1.698-2.2c-.423-1.032.452-1.407 1.1-.8l1.1 1.4 3.4-3.8c.594-.63 1.59-.267 1.2.7l-4 4.6c-.443.514-.81.418-1.1.1z' fill='%235b5'/%3E%3C/svg%3E" !default; -$form-icon-warning: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 8 8'%3E%3Cpath id='a' fill='%23d54' d='M.228 1.548l6.135 6.197c.833.77 2.183-.36 1.403-1.3L1.632.245C.725-.538-.518.735.228 1.55z'/%3E%3Cuse xlink:href='%23a' transform='rotate(90 4 4)'/%3E%3C/svg%3E" !default; -$form-icon-danger: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fa4' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E" !default; +$form-icon-success: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-2 -2 12 12'%3E%3Cpath fill='%235cb85c' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E" !default; +$form-icon-warning: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-1 -1 10 10'%3E%3Cpath fill='%23f0ad4e' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E" !default; +$form-icon-danger: "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='-6 -6 20 20'%3E%3Cpath id='a' fill='%23d9534f' d='M.228 1.548l6.135 6.197c.833.77 2.183-.36 1.403-1.3L1.632.245C.725-.538-.518.735.228 1.55z'/%3E%3Cuse xlink:href='%23a' transform='rotate(90 4 4)'/%3E%3C/svg%3E" !default; // Dropdowns From 523c5a3d1acbe515a96d814d65912d0619150c09 Mon Sep 17 00:00:00 2001 From: Stephanie Kendall Date: Wed, 16 Dec 2015 09:27:09 -0600 Subject: [PATCH 009/183] switching position of custom in bootstrap.scss for better efficiency --- scss/bootstrap.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 8f7e90ea2..5ead350f9 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -5,8 +5,8 @@ */ // Core variables and mixins -@import "variables"; @import "custom"; +@import "variables"; @import "mixins"; // Reset and dependencies From e543565d7810912cf5aa31a414ac5c9eac93d74d Mon Sep 17 00:00:00 2001 From: vsn4ik Date: Wed, 6 Jan 2016 16:47:44 +0300 Subject: [PATCH 010/183] Use text-emphasis-variant mixin for .text-muted --- scss/utilities/_text.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index f3a0c9880..901f77144 100644 --- a/scss/utilities/_text.scss +++ b/scss/utilities/_text.scss @@ -32,9 +32,7 @@ // Contextual colors -.text-muted { - color: $text-muted; -} +@include text-emphasis-variant('.text-muted', $text-muted); @include text-emphasis-variant('.text-primary', $brand-primary); From c3d1b7f256e99cc64c796bf58e19ee5c20fe7926 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 8 Dec 2015 00:31:43 -0800 Subject: [PATCH 011/183] Introduce $tooltip-padding-{x,y} & $tooltip-margin vars [skip sauce] --- scss/_tooltip.scss | 10 +++++----- scss/_variables.scss | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scss/_tooltip.scss b/scss/_tooltip.scss index 941579ec9..a17aefc0a 100644 --- a/scss/_tooltip.scss +++ b/scss/_tooltip.scss @@ -14,7 +14,7 @@ &.tooltip-top, &.bs-tether-element-attached-bottom { padding: $tooltip-arrow-width 0; - margin-top: -3px; + margin-top: -$tooltip-margin; .tooltip-arrow { bottom: 0; @@ -27,7 +27,7 @@ &.tooltip-right, &.bs-tether-element-attached-left { padding: 0 $tooltip-arrow-width; - margin-left: 3px; + margin-left: $tooltip-margin; .tooltip-arrow { top: 50%; @@ -40,7 +40,7 @@ &.tooltip-bottom, &.bs-tether-element-attached-top { padding: $tooltip-arrow-width 0; - margin-top: 3px; + margin-top: $tooltip-margin; .tooltip-arrow { top: 0; @@ -53,7 +53,7 @@ &.tooltip-left, &.bs-tether-element-attached-right { padding: 0 $tooltip-arrow-width; - margin-left: -3px; + margin-left: -$tooltip-margin; .tooltip-arrow { top: 50%; @@ -68,7 +68,7 @@ // Wrapper for the tooltip content .tooltip-inner { max-width: $tooltip-max-width; - padding: 3px 8px; + padding: $tooltip-padding-y $tooltip-padding-x; color: $tooltip-color; text-align: center; background-color: $tooltip-bg; diff --git a/scss/_variables.scss b/scss/_variables.scss index c63af8490..8e1cb130c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -475,6 +475,9 @@ $tooltip-max-width: 200px !default; $tooltip-color: #fff !default; $tooltip-bg: #000 !default; $tooltip-opacity: .9 !default; +$tooltip-padding-y: 3px !default; +$tooltip-padding-x: 8px !default; +$tooltip-margin: 3px !default; $tooltip-arrow-width: 5px !default; $tooltip-arrow-color: $tooltip-bg !default; From 53958dab0b0471d968f36fdae982b653e09241c6 Mon Sep 17 00:00:00 2001 From: Bass Jobsen Date: Fri, 1 Jan 2016 10:51:27 +0100 Subject: [PATCH 012/183] In modern browsers, prevent breadcrumb separator from getting underlined on :hover when not using
    markup Fixes #18733, except in IE9-11 Closes #18740 --- scss/_breadcrumb.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_breadcrumb.scss b/scss/_breadcrumb.scss index 5ccca354c..6fb812d1c 100644 --- a/scss/_breadcrumb.scss +++ b/scss/_breadcrumb.scss @@ -11,6 +11,7 @@ float: left; + .breadcrumb-item::before { + display: inline-block; padding-right: $breadcrumb-item-padding; padding-left: $breadcrumb-item-padding; color: $breadcrumb-divider-color; From 86caa76f547a3ad44596aa9949e101c5c69a67d8 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 6 Jan 2016 18:34:28 -0800 Subject: [PATCH 013/183] In IE9-11, prevent breadcrumb separator from getting underlined on :hover when not using
      markup Fixes #18733 in IE9-11 Also adds comments to the code explaining this and #18740. --- scss/_breadcrumb.scss | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/scss/_breadcrumb.scss b/scss/_breadcrumb.scss index 6fb812d1c..d5fba04a4 100644 --- a/scss/_breadcrumb.scss +++ b/scss/_breadcrumb.scss @@ -10,14 +10,29 @@ .breadcrumb-item { float: left; + // The separator between breadcrumbs (by default, a forward-slash: "/") + .breadcrumb-item::before { - display: inline-block; + display: inline-block; // Suppress underlining of the separator in modern browsers padding-right: $breadcrumb-item-padding; padding-left: $breadcrumb-item-padding; color: $breadcrumb-divider-color; content: "#{$breadcrumb-divider}"; } + // When not using