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 "carousel.css";
@import "hero-unit.css"; @import "hero-unit.css";
@import "utilities.css"; @import "utilities.css";
@import "caret.css";

101
css/button-groups.css
View File

@ -3,100 +3,98 @@
======================================== ========================================
*/ */
/* Make the div behave like a button */ /* Make the div behave like a button container */
.btn-group { .btn-group {
position: relative; position: relative;
display: inline-block; display: inline-flex;
font-size: 0;
/* remove as part 1 of font-size inline-block hack */
vertical-align: middle; 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 */ /* Space out series of button groups */
.btn-group+.btn-group { .btn-group + .btn-group {
margin-left: 5px; margin-left: 5px;
} }
/* Optional: Group multiple button groups together for a toolbar */ /* Optional: Group multiple button groups together for a toolbar */
.btn-toolbar { .btn-toolbar {
font-size: 0; display: flex;
/* Hack to remove whitespace that results from using inline-block */ flex-wrap: wrap;
gap: 5px;
margin-top: calc(var(--base-line-height) / 2); margin-top: calc(var(--base-line-height) / 2);
margin-bottom: 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 */ /* Float them, remove border radius, then re-add to first and last elements */
.btn-group>.btn { .btn-group > .btn {
position: relative; position: relative;
border-radius: 0; border-radius: 0;
flex: 0 1 auto;
} }
.btn-group>.btn+.btn { .btn-group > .btn + .btn {
margin-left: -1px; margin-left: -1px;
} }
.btn-group>.btn, .btn-group > .btn,
.btn-group>.dropdown-menu, .btn-group > .dropdown-menu,
.btn-group>.popover { .btn-group > .popover {
font-size: var(--base-font-size); font-size: var(--base-font-size);
/* redeclare as part 2 of font-size inline-block hack */
} }
/* Reset fonts for other sizes */ /* Reset fonts for other sizes */
.btn-group>.btn-mini { .btn-group > .btn-mini {
font-size: var(--font-size-mini); font-size: var(--font-size-mini);
} }
.btn-group>.btn-small { .btn-group > .btn-small {
font-size: var(--font-size-small); font-size: var(--font-size-small);
} }
.btn-group>.btn-large { .btn-group > .btn-large {
font-size: var(--font-size-large); font-size: var(--font-size-large);
} }
/* Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match */ /* Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match */
.btn-group>.btn:first-child { .btn-group > .btn:first-child {
margin-left: 0; margin-left: 0;
border-top-left-radius: var(--base-border-radius); border-top-left-radius: var(--base-border-radius);
border-bottom-left-radius: var(--base-border-radius); border-bottom-left-radius: var(--base-border-radius);
} }
/* Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it */ /* Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it */
.btn-group>.btn:last-child, .btn-group > .btn:last-child,
.btn-group>.dropdown-toggle { .btn-group > .dropdown-toggle {
border-top-right-radius: var(--base-border-radius); border-top-right-radius: var(--base-border-radius);
border-bottom-right-radius: var(--base-border-radius); 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 */ /* Reset corners for large buttons */
.btn-group>.btn.large:first-child { .btn-group > .btn.large:first-child {
margin-left: 0; margin-left: 0;
border-top-left-radius: var(--border-radius-large); border-top-left-radius: var(--border-radius-large);
border-bottom-left-radius: var(--border-radius-large); border-bottom-left-radius: var(--border-radius-large);
} }
.btn-group>.btn.large:last-child, .btn-group > .btn.large:last-child,
.btn-group>.large.dropdown-toggle { .btn-group > .large.dropdown-toggle {
border-top-right-radius: var(--border-radius-large); border-top-right-radius: var(--border-radius-large);
border-bottom-right-radius: var(--border-radius-large); border-bottom-right-radius: var(--border-radius-large);
} }
/* On hover/focus/active, bring the proper btn to front */ /* On hover/focus/active, bring the proper btn to front */
.btn-group>.btn:hover, .btn-group > .btn:hover,
.btn-group>.btn:focus, .btn-group > .btn:focus,
.btn-group>.btn:active, .btn-group > .btn:active,
.btn-group>.btn.active { .btn-group > .btn.active {
z-index: 2; z-index: 2;
position: relative; /* Ensure z-index works properly */
} }
/* On active and open, don't show outline */ /* On active and open, don't show outline */
@ -106,18 +104,18 @@
} }
/* Split button dropdowns */ /* Split button dropdowns */
.btn-group>.btn+.dropdown-toggle { .btn-group > .btn + .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
box-shadow: inset 1px 0 0 rgba(255, 255, 255, .125), inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, .125), inset 0 1px 0 rgba(255, 255, 255, .2), 0 1px 2px rgba(0, 0, 0, .05);
} }
.btn-group>.btn-mini+.dropdown-toggle { .btn-group > .btn-mini + .dropdown-toggle {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
} }
.btn-group>.btn-large+.dropdown-toggle { .btn-group > .btn-large + .dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
@ -158,23 +156,18 @@
/* Reposition the caret */ /* Reposition the caret */
.btn .caret { .btn .caret {
margin-top: 8px; display: inline-block;
vertical-align: middle;
margin-left: 0; margin-left: 0;
} }
/* Carets in other button sizes */ /* Carets in other button sizes */
.btn-large .caret { .btn-large .caret {
margin-top: 6px;
border-left-width: 5px; border-left-width: 5px;
border-right-width: 5px; border-right-width: 5px;
border-top-width: 5px; border-top-width: 5px;
} }
.btn-mini .caret,
.btn-small .caret {
margin-top: 8px;
}
/* Upside down carets for .dropup */ /* Upside down carets for .dropup */
.dropup .btn-large .caret { .dropup .btn-large .caret {
border-bottom-width: 5px; border-bottom-width: 5px;
@ -193,33 +186,33 @@
/* Vertical button groups */ /* Vertical button groups */
.btn-group-vertical { .btn-group-vertical {
display: inline-block; display: inline-flex;
flex-direction: column;
} }
.btn-group-vertical>.btn { .btn-group-vertical > .btn {
display: block; width: 100%;
float: none;
max-width: 100%; max-width: 100%;
border-radius: 0; border-radius: 0;
} }
.btn-group-vertical>.btn+.btn { .btn-group-vertical > .btn + .btn {
margin-left: 0; margin-left: 0;
margin-top: -1px; margin-top: -1px;
} }
.btn-group-vertical>.btn:first-child { .btn-group-vertical > .btn:first-child {
border-radius: var(--base-border-radius) var(--base-border-radius) 0 0; border-radius: var(--base-border-radius) var(--base-border-radius) 0 0;
} }
.btn-group-vertical>.btn:last-child { .btn-group-vertical > .btn:last-child {
border-radius: 0 0 var(--base-border-radius) var(--base-border-radius); border-radius: 0 0 var(--base-border-radius) var(--base-border-radius);
} }
.btn-group-vertical>.btn-large:first-child { .btn-group-vertical > .btn-large:first-child {
border-radius: var(--border-radius-large) var(--border-radius-large) 0 0; border-radius: var(--border-radius-large) var(--border-radius-large) 0 0;
} }
.btn-group-vertical>.btn-large:last-child { .btn-group-vertical > .btn-large:last-child {
border-radius: 0 0 var(--border-radius-large) var(--border-radius-large); border-radius: 0 0 var(--border-radius-large) var(--border-radius-large);
} }

54
css/buttons.css
View File

@ -5,20 +5,19 @@
/* Core */ /* Core */
.btn { .btn {
display: inline-block; display: inline-flex;
align-items: center;
justify-content: center;
padding: 4px 12px; padding: 4px 12px;
margin-bottom: 0; margin-bottom: 0;
/* For input.btn */
font-size: var(--base-font-size); font-size: var(--base-font-size);
line-height: var(--base-line-height); line-height: var(--base-line-height);
text-align: center; text-align: center;
vertical-align: middle;
cursor: pointer; cursor: pointer;
background-color: var(--btn-background); background-color: var(--btn-background);
background-image: linear-gradient(to bottom, var(--btn-background), var(--btn-background-highlight)); background-image: linear-gradient(to bottom, var(--btn-background), var(--btn-background-highlight));
border: 1px solid var(--btn-border); border: 1px solid var(--btn-border);
border-bottom-color: #b3b3b3; border-bottom-color: #b3b3b3;
/* darken(--btn-border, 10%) */
border-radius: var(--base-border-radius); 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); 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 { .btn:focus {
color: var(--gray-dark); color: var(--gray-dark);
text-decoration: none; text-decoration: none;
background-position: 0 -15px; 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-position 0.1s linear; 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 */ /* Focus state for keyboard and accessibility */
@ -54,6 +84,7 @@
background-image: none; background-image: none;
opacity: 0.65; opacity: 0.65;
box-shadow: none; box-shadow: none;
pointer-events: none;
} }
/* Button Sizes */ /* Button Sizes */
@ -94,7 +125,7 @@
/* Block button */ /* Block button */
.btn-block { .btn-block {
display: block; display: flex;
width: 100%; width: 100%;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
@ -102,7 +133,7 @@
} }
/* Vertically space out multiple block buttons */ /* Vertically space out multiple block buttons */
.btn-block+.btn-block { .btn-block + .btn-block {
margin-top: 5px; margin-top: 5px;
} }
@ -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); 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 */ /* Link buttons */
.btn-link, .btn-link,
.btn-link:active, .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;
}

238
css/tests/buttons.html
View File

@ -1,127 +1,133 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8">
<title>Buttons &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
<!-- Le styles --> <head>
<link href="..//bootstrap.css" rel="stylesheet"> <meta charset="utf-8">
<style> <title>Buttons &middot; Bootstrap</title>
body { <meta name="viewport" content="width=device-width, initial-scale=1.0">
padding-top: 30px; <meta name="description" content="">
padding-bottom: 30px; <meta name="author" content="">
}
</style>
<link href="../bootstrap-responsive.css" rel="stylesheet">
</head>
<body> <!-- Le styles -->
<link href="..//bootstrap.css" rel="stylesheet">
<style>
body {
padding-top: 30px;
padding-bottom: 30px;
}
</style>
<link href="../bootstrap-responsive.css" rel="stylesheet">
</head>
<div class="container"> <body>
<h2>Dropups</h2> <div class="container">
<div class="btn-toolbar">
<div class="btn-group dropup"> <h2>Dropups</h2>
<button class="btn">Dropup</button> <div class="btn-toolbar">
<button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <div class="btn-group dropup">
<ul class="dropdown-menu"> <button class="btn">Dropup</button>
<li><a href="#">Action</a></li> <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<li><a href="#">Another action</a></li> <ul class="dropdown-menu">
<li><a href="#">Something else here</a></li> <li><a href="#">Action</a></li>
<li class="divider"></li> <li><a href="#">Another action</a></li>
<li><a href="#">Separated link</a></li> <li><a href="#">Something else here</a></li>
</ul> <li class="divider"></li>
</div><!-- /btn-group --> <li><a href="#">Separated link</a></li>
<div class="btn-group dropup"> </ul>
<button class="btn btn-primary">Dropup</button> </div><!-- /btn-group -->
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <div class="btn-group dropup">
<ul class="dropdown-menu"> <button class="btn btn-primary">Dropup</button>
<li><a href="#">Action</a></li> <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span
<li><a href="#">Another action</a></li> class="caret"></span></button>
<li><a href="#">Something else here</a></li> <ul class="dropdown-menu">
<li class="divider"></li> <li><a href="#">Action</a></li>
<li><a href="#">Separated link</a></li> <li><a href="#">Another action</a></li>
</ul> <li><a href="#">Something else here</a></li>
</div><!-- /btn-group --> <li class="divider"></li>
<div class="btn-group dropup"> <li><a href="#">Separated link</a></li>
<button class="btn btn-danger">Dropup</button> </ul>
<button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> </div><!-- /btn-group -->
<ul class="dropdown-menu"> <div class="btn-group dropup">
<li><a href="#">Action</a></li> <button class="btn btn-danger">Dropup</button>
<li><a href="#">Another action</a></li> <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span
<li><a href="#">Something else here</a></li> class="caret"></span></button>
<li class="divider"></li> <ul class="dropdown-menu">
<li><a href="#">Separated link</a></li> <li><a href="#">Action</a></li>
</ul> <li><a href="#">Another action</a></li>
</div><!-- /btn-group --> <li><a href="#">Something else here</a></li>
<div class="btn-group dropup"> <li class="divider"></li>
<button class="btn btn-warning">Dropup</button> <li><a href="#">Separated link</a></li>
<button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> </ul>
<ul class="dropdown-menu"> </div><!-- /btn-group -->
<li><a href="#">Action</a></li> <div class="btn-group dropup">
<li><a href="#">Another action</a></li> <button class="btn btn-warning">Dropup</button>
<li><a href="#">Something else here</a></li> <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span
<li class="divider"></li> class="caret"></span></button>
<li><a href="#">Separated link</a></li> <ul class="dropdown-menu">
</ul> <li><a href="#">Action</a></li>
</div><!-- /btn-group --> <li><a href="#">Another action</a></li>
<div class="btn-group dropup"> <li><a href="#">Something else here</a></li>
<button class="btn btn-success">Dropup</button> <li class="divider"></li>
<button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <li><a href="#">Separated link</a></li>
<ul class="dropdown-menu"> </ul>
<li><a href="#">Action</a></li> </div><!-- /btn-group -->
<li><a href="#">Another action</a></li> <div class="btn-group dropup">
<li><a href="#">Something else here</a></li> <button class="btn btn-success">Dropup</button>
<li class="divider"></li> <button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span
<li><a href="#">Separated link</a></li> class="caret"></span></button>
</ul> <ul class="dropdown-menu">
</div><!-- /btn-group --> <li><a href="#">Action</a></li>
<div class="btn-group dropup"> <li><a href="#">Another action</a></li>
<button class="btn btn-info">Dropup</button> <li><a href="#">Something else here</a></li>
<button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <li class="divider"></li>
<ul class="dropdown-menu"> <li><a href="#">Separated link</a></li>
<li><a href="#">Action</a></li> </ul>
<li><a href="#">Another action</a></li> </div><!-- /btn-group -->
<li><a href="#">Something else here</a></li> <div class="btn-group dropup">
<li class="divider"></li> <button class="btn btn-info">Dropup</button>
<li><a href="#">Separated link</a></li> <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
</ul> <ul class="dropdown-menu">
</div><!-- /btn-group --> <li><a href="#">Action</a></li>
<div class="btn-group dropup"> <li><a href="#">Another action</a></li>
<button class="btn btn-inverse">Dropup</button> <li><a href="#">Something else here</a></li>
<button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button> <li class="divider"></li>
<ul class="dropdown-menu"> <li><a href="#">Separated link</a></li>
<li><a href="#">Action</a></li> </ul>
<li><a href="#">Another action</a></li> </div><!-- /btn-group -->
<li><a href="#">Something else here</a></li> <div class="btn-group dropup">
<li class="divider"></li> <button class="btn btn-inverse">Dropup</button>
<li><a href="#">Separated link</a></li> <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span
</ul> class="caret"></span></button>
</div><!-- /btn-group --> <ul class="dropdown-menu">
</div><!-- /btn-toolbar --> <li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
</div><!-- /btn-toolbar -->
</div> <!-- /container --> </div> <!-- /container -->
<!-- Le javascript <!-- Le javascript ================================================== -->
================================================== --> <!-- Placed at the end of the document so the pages load faster -->
<!-- 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/jquery.js"></script> <script src="../../docs/assets/js/bootstrap-transition.js"></script>
<script src="../../docs/assets/js/bootstrap-transition.js"></script> <script src="../../docs/assets/js/bootstrap-alert.js"></script>
<script src="../../docs/assets/js/bootstrap-alert.js"></script> <script src="../../docs/assets/js/bootstrap-modal.js"></script>
<script src="../../docs/assets/js/bootstrap-modal.js"></script> <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
<script src="../../docs/assets/js/bootstrap-dropdown.js"></script> <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
<script src="../../docs/assets/js/bootstrap-scrollspy.js"></script> <script src="../../docs/assets/js/bootstrap-tab.js"></script>
<script src="../../docs/assets/js/bootstrap-tab.js"></script> <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
<script src="../../docs/assets/js/bootstrap-tooltip.js"></script> <script src="../../docs/assets/js/bootstrap-popover.js"></script>
<script src="../../docs/assets/js/bootstrap-popover.js"></script> <script src="../../docs/assets/js/bootstrap-button.js"></script>
<script src="../../docs/assets/js/bootstrap-button.js"></script> <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
<script src="../../docs/assets/js/bootstrap-collapse.js"></script> <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
<script src="../../docs/assets/js/bootstrap-carousel.js"></script> <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
<script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
</body>
</body>
</html> </html>