Sharkk/Torq
Sharkk/Torq
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: Sharkk:cde958a5a7267ea3ea0e61fc8e84ebe3268b23f3
Branches Tags
Sharkk:master
..
compare: Sharkk:616c57e3c51d53dcded6407cbff4fb0e0d237c48
Branches Tags
Sharkk:master

2 Commits
cde958a5a7 ... 616c57e3c5

Author SHA1 Message Date
Sky Johnson
616c57e3c5 buttons 2 2025-04-11 15:37:09 -05:00
Sky Johnson
a2fd8087a6 buttons 2025-04-11 15:28:14 -05:00
5 changed files with 231 additions and 185 deletions
Show Stats Expand all files Collapse all files

1
css/bootstrap.css vendored
View File

@ -43,3 +43,4 @@
@import "carousel.css";
@import "hero-unit.css";
@import "utilities.css";
@import "caret.css";

45
css/button-groups.css
View File

@ -3,16 +3,11 @@
========================================
*/
/* Make the div behave like a button */
/* Make the div behave like a button container */
.btn-group {
position: relative;
display: inline-block;
font-size: 0;
/* remove as part 1 of font-size inline-block hack */
display: inline-flex;
vertical-align: middle;
/* match .btn alignment given font-size hack above */
white-space: nowrap;
/* prevent buttons from wrapping when in tight spaces */
}
/* Space out series of button groups */
@ -22,22 +17,18 @@
/* Optional: Group multiple button groups together for a toolbar */
.btn-toolbar {
font-size: 0;
/* Hack to remove whitespace that results from using inline-block */
display: flex;
flex-wrap: wrap;
gap: 5px;
margin-top: calc(var(--base-line-height) / 2);
margin-bottom: calc(var(--base-line-height) / 2);
}
.btn-toolbar>.btn+.btn,
.btn-toolbar>.btn-group+.btn,
.btn-toolbar>.btn+.btn-group {
margin-left: 5px;
}
/* Float them, remove border radius, then re-add to first and last elements */
.btn-group > .btn {
position: relative;
border-radius: 0;
flex: 0 1 auto;
}
.btn-group > .btn + .btn {
@ -48,7 +39,6 @@
.btn-group > .dropdown-menu,
.btn-group > .popover {
font-size: var(--base-font-size);
/* redeclare as part 2 of font-size inline-block hack */
}
/* Reset fonts for other sizes */
@ -78,6 +68,13 @@
border-bottom-right-radius: var(--base-border-radius);
}
/* Ensure proper alignment of dropdown-toggle button */
.btn-group > .dropdown-toggle {
display: inline-flex;
align-items: center;
justify-content: center;
}
/* Reset corners for large buttons */
.btn-group > .btn.large:first-child {
margin-left: 0;
@ -97,6 +94,7 @@
.btn-group > .btn:active,
.btn-group > .btn.active {
z-index: 2;
position: relative; /* Ensure z-index works properly */
}
/* On active and open, don't show outline */
@ -158,23 +156,18 @@
/* Reposition the caret */
.btn .caret {
margin-top: 8px;
display: inline-block;
vertical-align: middle;
margin-left: 0;
}
/* Carets in other button sizes */
.btn-large .caret {
margin-top: 6px;
border-left-width: 5px;
border-right-width: 5px;
border-top-width: 5px;
}
.btn-mini .caret,
.btn-small .caret {
margin-top: 8px;
}
/* Upside down carets for .dropup */
.dropup .btn-large .caret {
border-bottom-width: 5px;
@ -193,12 +186,12 @@
/* Vertical button groups */
.btn-group-vertical {
display: inline-block;
display: inline-flex;
flex-direction: column;
}
.btn-group-vertical > .btn {
display: block;
float: none;
width: 100%;
max-width: 100%;
border-radius: 0;
}

52
css/buttons.css
View File

@ -5,20 +5,19 @@
/* Core */
.btn {
display: inline-block;
display: inline-flex;
align-items: center;
justify-content: center;
padding: 4px 12px;
margin-bottom: 0;
/* For input.btn */
font-size: var(--base-font-size);
line-height: var(--base-line-height);
text-align: center;
vertical-align: middle;
cursor: pointer;
background-color: var(--btn-background);
background-image: linear-gradient(to bottom, var(--btn-background), var(--btn-background-highlight));
border: 1px solid var(--btn-border);
border-bottom-color: #b3b3b3;
/* darken(--btn-border, 10%) */
border-radius: var(--base-border-radius);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05);
}
@ -28,8 +27,39 @@
.btn:focus {
color: var(--gray-dark);
text-decoration: none;
background-position: 0 -15px;
transition: background-position 0.1s linear;
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-background) 80%, black), color-mix(in srgb, var(--btn-background-highlight) 80%, black));
transition: background-image 0.2s ease;
}
/* Specific hover states for colored buttons */
.btn-primary:hover, .btn-primary:focus {
color: var(--white);
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-primary-background) 80%, black), color-mix(in srgb, var(--btn-primary-background-highlight) 80%, black));
}
.btn-warning:hover, .btn-warning:focus {
color: var(--white);
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-warning-background) 80%, black), color-mix(in srgb, var(--btn-warning-background-highlight) 80%, black));
}
.btn-danger:hover, .btn-danger:focus {
color: var(--white);
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-danger-background) 80%, black), color-mix(in srgb, var(--btn-danger-background-highlight) 80%, black));
}
.btn-success:hover, .btn-success:focus {
color: var(--white);
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-success-background) 80%, black), color-mix(in srgb, var(--btn-success-background-highlight) 80%, black));
}
.btn-info:hover, .btn-info:focus {
color: var(--white);
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-info-background) 80%, black), color-mix(in srgb, var(--btn-info-background-highlight) 80%, black));
}
.btn-inverse:hover, .btn-inverse:focus {
color: var(--white);
background-image: linear-gradient(to bottom, color-mix(in srgb, var(--btn-inverse-background) 80%, black), color-mix(in srgb, var(--btn-inverse-background-highlight) 80%, black));
}
/* Focus state for keyboard and accessibility */
@ -54,6 +84,7 @@
background-image: none;
opacity: 0.65;
box-shadow: none;
pointer-events: none;
}
/* Button Sizes */
@ -94,7 +125,7 @@
/* Block button */
.btn-block {
display: block;
display: flex;
width: 100%;
padding-left: 0;
padding-right: 0;
@ -171,13 +202,6 @@ input[type="button"].btn-block {
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
/* Cross-browser Jank */
button.btn::-moz-focus-inner,
input[type="submit"].btn::-moz-focus-inner {
padding: 0;
border: 0;
}
/* Link buttons */
.btn-link,
.btn-link:active,

22
css/caret.css Normal file
View File

@ -0,0 +1,22 @@
/*
Caret
========================================
*/
/* Define the caret appearance */
.caret {
display: inline-block;
width: 0;
height: 0;
vertical-align: middle;
border-top: 4px solid;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
}
/* Upside down caret for dropup */
.dropup .caret {
border-top: 0;
border-bottom: 4px solid;
}

20
css/tests/buttons.html
View File

@ -1,5 +1,6 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Buttons &middot; Bootstrap</title>
@ -37,7 +38,8 @@
</div><!-- /btn-group -->
<div class="btn-group dropup">
<button class="btn btn-primary">Dropup</button>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
@ -48,7 +50,8 @@
</div><!-- /btn-group -->
<div class="btn-group dropup">
<button class="btn btn-danger">Dropup</button>
<button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
@ -59,7 +62,8 @@
</div><!-- /btn-group -->
<div class="btn-group dropup">
<button class="btn btn-warning">Dropup</button>
<button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
@ -70,7 +74,8 @@
</div><!-- /btn-group -->
<div class="btn-group dropup">
<button class="btn btn-success">Dropup</button>
<button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
@ -92,7 +97,8 @@
</div><!-- /btn-group -->
<div class="btn-group dropup">
<button class="btn btn-inverse">Dropup</button>
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
@ -106,8 +112,7 @@
</div> <!-- /container -->
<!-- Le javascript
================================================== -->
<!-- Le javascript ================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../../docs/assets/js/jquery.js"></script>
<script src="../../docs/assets/js/bootstrap-transition.js"></script>
@ -124,4 +129,5 @@
<script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
</body>
</html>