|
| 1 | +From 83398845a90161ae8e94dbee31bbbae1652fd014 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Nick Zavaritsky < [email protected]> |
| 3 | +Date: Sun, 15 Dec 2019 23:26:02 +0000 |
| 4 | +Subject: [PATCH] luajit.me customisations |
| 5 | + |
| 6 | +--- |
| 7 | + Gemfile.lock | 2 +- |
| 8 | + scss/_button-group.scss | 6 ++++++ |
| 9 | + scss/_buttons.scss | 34 ++++++++++++++++++++++++----- |
| 10 | + scss/_variables.scss | 33 ++++++++++++----------------- |
| 11 | + scss/bootstrap.scss | 47 +++++++++++++++++++++-------------------- |
| 12 | + 5 files changed, 74 insertions(+), 48 deletions(-) |
| 13 | + |
| 14 | +diff --git a/Gemfile.lock b/Gemfile.lock |
| 15 | +index 6a308fcd9..cfc78c963 100644 |
| 16 | +--- a/Gemfile.lock |
| 17 | ++++ b/Gemfile.lock |
| 18 | +@@ -79,4 +79,4 @@ DEPENDENCIES |
| 19 | + wdm (~> 0.1.1) |
| 20 | + |
| 21 | + BUNDLED WITH |
| 22 | +- 1.17.3 |
| 23 | ++ 2.1.2 |
| 24 | +diff --git a/scss/_button-group.scss b/scss/_button-group.scss |
| 25 | +index d7220029a..fe33129b1 100644 |
| 26 | +--- a/scss/_button-group.scss |
| 27 | ++++ b/scss/_button-group.scss |
| 28 | +@@ -60,6 +60,7 @@ |
| 29 | + |
| 30 | + .btn-group-sm > .btn { @extend .btn-sm; } |
| 31 | + .btn-group-lg > .btn { @extend .btn-lg; } |
| 32 | ++.btn-group-cp-size > .btn { @extend .btn-cp-size; } |
| 33 | + |
| 34 | + |
| 35 | + // |
| 36 | +@@ -91,6 +92,11 @@ |
| 37 | + padding-left: $btn-padding-x-lg * .75; |
| 38 | + } |
| 39 | + |
| 40 | ++.btn-cp-size + .dropdown-toggle-split { |
| 41 | ++ padding-right: $btn-padding-x-cp-size * .75; |
| 42 | ++ padding-left: $btn-padding-x-cp-size * .75; |
| 43 | ++} |
| 44 | ++ |
| 45 | + |
| 46 | + // The clickable button for toggling the menu |
| 47 | + // Set the same inset shadow as the :active state |
| 48 | +diff --git a/scss/_buttons.scss b/scss/_buttons.scss |
| 49 | +index 2a7d94ad2..31e835212 100644 |
| 50 | +--- a/scss/_buttons.scss |
| 51 | ++++ b/scss/_buttons.scss |
| 52 | +@@ -62,11 +62,11 @@ fieldset:disabled a.btn { |
| 53 | + } |
| 54 | + } |
| 55 | + |
| 56 | +-@each $color, $value in $theme-colors { |
| 57 | +- .btn-outline-#{$color} { |
| 58 | +- @include button-outline-variant($value); |
| 59 | +- } |
| 60 | +-} |
| 61 | ++//@each $color, $value in $theme-colors { |
| 62 | ++// .btn-outline-#{$color} { |
| 63 | ++// @include button-outline-variant($value); |
| 64 | ++// } |
| 65 | ++//} |
| 66 | + |
| 67 | + |
| 68 | + // |
| 69 | +@@ -99,6 +99,26 @@ fieldset:disabled a.btn { |
| 70 | + // No need for an active state here |
| 71 | + } |
| 72 | + |
| 73 | ++.btn-cp-color { |
| 74 | ++ font-weight: $font-weight-normal; |
| 75 | ++ color: #a0a0a0; |
| 76 | ++ |
| 77 | ++ @include hover() { |
| 78 | ++ color: #f0f0f0; |
| 79 | ++ } |
| 80 | ++ |
| 81 | ++ &:focus, |
| 82 | ++ &.focus { |
| 83 | ++ box-shadow: none; |
| 84 | ++ } |
| 85 | ++ |
| 86 | ++ &:not(:disabled):not(.disabled):active, |
| 87 | ++ &:not(:disabled):not(.disabled).active, |
| 88 | ++ .show > &.dropdown-toggle { |
| 89 | ++ color: #f0f0f0; |
| 90 | ++ } |
| 91 | ++} |
| 92 | ++ |
| 93 | + |
| 94 | + // |
| 95 | + // Button Sizes |
| 96 | +@@ -112,6 +132,10 @@ fieldset:disabled a.btn { |
| 97 | + @include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-line-height-sm, $btn-border-radius-sm); |
| 98 | + } |
| 99 | + |
| 100 | ++.btn-cp-size { |
| 101 | ++ @include button-size($btn-padding-y-cp-size, $btn-padding-x-cp-size, $btn-font-size-cp-size, $btn-line-height-cp-size, $btn-border-radius-cp-size); |
| 102 | ++} |
| 103 | ++ |
| 104 | + |
| 105 | + // |
| 106 | + // Block button |
| 107 | +diff --git a/scss/_variables.scss b/scss/_variables.scss |
| 108 | +index d9e88df9a..ed7c3a055 100644 |
| 109 | +--- a/scss/_variables.scss |
| 110 | ++++ b/scss/_variables.scss |
| 111 | +@@ -81,12 +81,8 @@ $theme-colors: map-merge( |
| 112 | + ( |
| 113 | + "primary": $primary, |
| 114 | + "secondary": $secondary, |
| 115 | +- "success": $success, |
| 116 | +- "info": $info, |
| 117 | + "warning": $warning, |
| 118 | + "danger": $danger, |
| 119 | +- "light": $light, |
| 120 | +- "dark": $dark |
| 121 | + ), |
| 122 | + $theme-colors |
| 123 | + ); |
| 124 | +@@ -113,11 +109,11 @@ $enable-gradients: false !default; |
| 125 | + $enable-transitions: true !default; |
| 126 | + $enable-prefers-reduced-motion-media-query: true !default; |
| 127 | + $enable-hover-media-query: false !default; // Deprecated, no longer affects any compiled CSS |
| 128 | +-$enable-grid-classes: true !default; |
| 129 | ++$enable-grid-classes: false !default; |
| 130 | + $enable-pointer-cursor-for-buttons: true !default; |
| 131 | +-$enable-print-styles: true !default; |
| 132 | ++$enable-print-styles: false !default; |
| 133 | + $enable-responsive-font-sizes: false !default; |
| 134 | +-$enable-validation-icons: true !default; |
| 135 | ++$enable-validation-icons: false !default; |
| 136 | + $enable-deprecation-messages: true !default; |
| 137 | + |
| 138 | + |
| 139 | +@@ -189,15 +185,10 @@ $paragraph-margin-bottom: 1rem !default; |
| 140 | + // adapting to different screen sizes, for use in media queries. |
| 141 | + |
| 142 | + $grid-breakpoints: ( |
| 143 | +- xs: 0, |
| 144 | +- sm: 576px, |
| 145 | +- md: 768px, |
| 146 | +- lg: 992px, |
| 147 | +- xl: 1200px |
| 148 | + ) !default; |
| 149 | + |
| 150 | +-@include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); |
| 151 | +-@include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints"); |
| 152 | ++//@include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); |
| 153 | ++//@include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints"); |
| 154 | + |
| 155 | + |
| 156 | + // Grid containers |
| 157 | +@@ -205,10 +196,6 @@ $grid-breakpoints: ( |
| 158 | + // Define the maximum width of `.container` for different screen sizes. |
| 159 | + |
| 160 | + $container-max-widths: ( |
| 161 | +- sm: 540px, |
| 162 | +- md: 720px, |
| 163 | +- lg: 960px, |
| 164 | +- xl: 1140px |
| 165 | + ) !default; |
| 166 | + |
| 167 | + @include _assert-ascending($container-max-widths, "$container-max-widths"); |
| 168 | +@@ -218,7 +205,7 @@ $container-max-widths: ( |
| 169 | + // |
| 170 | + // Set the number of columns and specify the width of the gutters. |
| 171 | + |
| 172 | +-$grid-columns: 12 !default; |
| 173 | ++$grid-columns: 1 !default; |
| 174 | + $grid-gutter-width: 30px !default; |
| 175 | + |
| 176 | + |
| 177 | +@@ -235,6 +222,7 @@ $border-color: $gray-300 !default; |
| 178 | + $border-radius: .25rem !default; |
| 179 | + $border-radius-lg: .3rem !default; |
| 180 | + $border-radius-sm: .2rem !default; |
| 181 | ++$border-radius-cp-size: 2px !default; |
| 182 | + |
| 183 | + $rounded-pill: 50rem !default; |
| 184 | + |
| 185 | +@@ -423,6 +411,12 @@ $btn-padding-x-lg: $input-btn-padding-x-lg !default; |
| 186 | + $btn-font-size-lg: $input-btn-font-size-lg !default; |
| 187 | + $btn-line-height-lg: $input-btn-line-height-lg !default; |
| 188 | + |
| 189 | ++$btn-padding-y-cp-size: 5px; |
| 190 | ++$btn-padding-x-cp-size: 9px; |
| 191 | ++$btn-font-size-cp-size: 15px; |
| 192 | ++$btn-line-height-cp-size: 1; |
| 193 | ++ |
| 194 | ++ |
| 195 | + $btn-border-width: $input-btn-border-width !default; |
| 196 | + |
| 197 | + $btn-font-weight: $font-weight-normal !default; |
| 198 | +@@ -440,6 +434,7 @@ $btn-block-spacing-y: .5rem !default; |
| 199 | + $btn-border-radius: $border-radius !default; |
| 200 | + $btn-border-radius-lg: $border-radius-lg !default; |
| 201 | + $btn-border-radius-sm: $border-radius-sm !default; |
| 202 | ++$btn-border-radius-cp-size: $border-radius-cp-size !default; |
| 203 | + |
| 204 | + $btn-transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out !default; |
| 205 | + |
| 206 | +diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss |
| 207 | +index 9f15c2a8b..d0bf64fff 100644 |
| 208 | +--- a/scss/bootstrap.scss |
| 209 | ++++ b/scss/bootstrap.scss |
| 210 | +@@ -11,34 +11,35 @@ |
| 211 | + @import "root"; |
| 212 | + @import "reboot"; |
| 213 | + @import "type"; |
| 214 | +-@import "images"; |
| 215 | +-@import "code"; |
| 216 | +-@import "grid"; |
| 217 | +-@import "tables"; |
| 218 | +-@import "forms"; |
| 219 | ++//@import "images"; |
| 220 | ++//@import "code"; |
| 221 | ++//@import "grid"; |
| 222 | ++//@import "tables"; |
| 223 | ++//@import "forms"; |
| 224 | + @import "buttons"; |
| 225 | +-@import "transitions"; |
| 226 | ++//@import "transitions"; |
| 227 | + @import "dropdown"; |
| 228 | + @import "button-group"; |
| 229 | +-@import "input-group"; |
| 230 | +-@import "custom-forms"; |
| 231 | +-@import "nav"; |
| 232 | +-@import "navbar"; |
| 233 | +-@import "card"; |
| 234 | +-@import "breadcrumb"; |
| 235 | +-@import "pagination"; |
| 236 | +-@import "badge"; |
| 237 | +-@import "jumbotron"; |
| 238 | ++//@import "input-group"; |
| 239 | ++//@import "custom-forms"; |
| 240 | ++//@import "nav"; |
| 241 | ++//@import "navbar"; |
| 242 | ++//@import "card"; |
| 243 | ++//@import "breadcrumb"; |
| 244 | ++//@import "pagination"; |
| 245 | ++//@import "badge"; |
| 246 | ++//@import "jumbotron"; |
| 247 | + @import "alert"; |
| 248 | +-@import "progress"; |
| 249 | +-@import "media"; |
| 250 | ++//@import "progress"; |
| 251 | ++//@import "media"; |
| 252 | + @import "list-group"; |
| 253 | + @import "close"; |
| 254 | +-@import "toasts"; |
| 255 | +-@import "modal"; |
| 256 | ++//@import "toasts"; |
| 257 | ++//@import "modal"; |
| 258 | + @import "tooltip"; |
| 259 | + @import "popover"; |
| 260 | +-@import "carousel"; |
| 261 | +-@import "spinners"; |
| 262 | +-@import "utilities"; |
| 263 | +-@import "print"; |
| 264 | ++//@import "carousel"; |
| 265 | ++//@import "spinners"; |
| 266 | ++//@import "utilities"; |
| 267 | ++@import "utilities/screenreaders"; |
| 268 | ++//@import "print"; |
| 269 | +-- |
| 270 | +2.17.1 |
| 271 | + |
0 commit comments