vendor/assets/stylesheets/button.css.scss in flashgrid-1.3.0 vs vendor/assets/stylesheets/button.css.scss in flashgrid-2.0.0

- old
+ new

@@ -6,20 +6,20 @@ #Button Links #Button Icons #Button Outlines #Button Styles #Button Group -#Button Toolbar */ +#Button Toolbar +#Button Data Toggles */ /* #Button ================================================== */ .btn { -webkit-appearance: none; -moz-appearance: none; - background: rgba(236,238,241,1); - border: none; - border-bottom: 2px solid rgba(196,198,201,1); + background: rgba(246,247,249,1); + border: 1px solid rgba(217,222,225,1); border-radius: 2px; -moz-box-sizing: border-box; box-sizing: border-box; color: rgba(71,74,84,1); cursor: pointer; @@ -35,29 +35,27 @@ text-rendering: geometricPrecision; -webkit-transition: all 0.3s linear; transition: all 0.3s linear; vertical-align: middle; } +.btn:active, +.btn.active, .btn:hover, +.btn:focus, .btn[disabled], -.btn[disabled]:hover { - background: rgba(226,228,231,1); +.btn[disabled]:hover, +.open > .dropdown-toggle.btn { + background: rgba(236,237,239,1); text-decoration: none; } .btn[disabled], .btn[disabled]:hover { color: rgba(71,74,84,1); cursor: not-allowed; } .btn:active, .btn[disabled]:active { - border-bottom-width: 0; - -webkit-transform: translateY(2px); - -moz-transform: translateY(2px); - -ms-transform: translateY(2px); - -o-transform: translateY(2px); - transform: translateY(2px); -webkit-transition: all 0.1s linear; transition: all 0.1s linear; } /* #Button Sizes @@ -99,170 +97,161 @@ .btn-green, .btn-green[disabled], .btn-red, .btn-red[disabled] { color: rgba(255,255,255,1); } .btn-black { - background: rgba(61,64,74,1); + background: rgba(71,74,84,1); border-color: rgba(1,4,14,1); } +.btn-black:active, +.btn-black.active, .btn-black:hover, +.btn-black:focus, .btn-black[disabled], -.btn-black[disabled]:hover { background: rgba(51,54,64,1); } +.btn-black[disabled]:hover, +.open > .dropdown-toggle.btn-black { background: rgba(61,64,74,1); } .btn-blue { background: rgba(58,144,216,1); border-color: rgba(8,94,166,1); } +.btn-blue:active, +.btn-blue.active, .btn-blue:hover, +.btn-blue:focus, .btn-blue[disabled], -.btn-blue[disabled]:hover { background: rgba(48,134,206,1); } +.btn-blue[disabled]:hover, +.open > .dropdown-toggle.btn-blue { background: rgba(48,134,206,1); } .btn-green { background: rgba(122,179,23,1); border-color: rgba(72,129,3,1); } +.btn-green:active, +.btn-green.active, .btn-green:hover, +.btn-green:focus, .btn-green[disabled], -.btn-green[disabled]:hover { background: rgba(112,169,13,1); } +.btn-green[disabled]:hover, +.open > .dropdown-toggle.btn-green { background: rgba(112,169,13,1); } .btn-red { background: rgba(220,74,56,1); border-color: rgba(180,34,16,1); } +.btn-red:active, +.btn-red.active, .btn-red:hover, +.btn-red:focus, .btn-red[disabled], -.btn-red[disabled]:hover { background: rgba(210,64,46,1); } +.btn-red[disabled]:hover, +.open > .dropdown-toggle.btn-red { background: rgba(210,64,46,1); } .btn-white { background: rgba(255,255,255,1); } +.btn-white:active, +.btn-white.active, .btn-white:hover, +.btn-white:focus, .btn-white[disabled], -.btn-white[disabled]:hover { background: rgba(226,228,231,1); } +.btn-white[disabled]:hover, +.open > .dropdown-toggle.btn-white { background: rgba(246,247,249,1); } /* #Button Links ================================================== */ .btn-link { - background: none; - border: none; + background: transparent; + border-color: transparent; color: rgba(174,182,192,1); - margin-top: 12px; padding: 0; } -.btn-link:hover { - background: none; +.btn-link:active, +.btn-link.active, +.btn-link:hover, +.btn-link:focus, { + background: transparent; color: rgba(71,74,84,1); } -.btn-link.btn-large { margin-top: 17px; } -.btn-link.btn-small { margin-top: 8px; } -.btn-link.btn-mini { margin-top: 6px; } -.btn-link.btn-link-clean { margin-top: 0; } /* #Button Icons ================================================== */ .btn-icon { font-size: 17px; line-height: 17px; - padding: 12px 14px 10px 14px; + padding: 10px 13px; } .btn-large.btn-icon { font-size: 23px; line-height: 23px; - padding: 13px 14px 11px 14px; + padding: 11px 13px; } .btn-small.btn-icon { font-size: 14px; line-height: 14px; - padding: 8px 9px 6px 8px; + padding: 6px 7px 6px 6px; } .btn-mini.btn-icon { font-size: 11px; line-height: 11px; - padding: 6px 7px 4px 7px; + padding: 5px 6px; } /* #Button Outlines ================================================== */ .btn-outline { background: transparent; - border: 1px solid rgba(229,230,234,1); - border-radius: 2px; color: rgba(174,182,192,1); } -.btn-outline:hover { +.btn-outline:active, +.btn-outline.active, +.btn-outline:hover, +.btn-outline:focus { background: transparent; - border-color: rgba(199,200,204,1); color: rgba(71,74,84,1); } -.btn-outline:active { - border-bottom-width: 1px; - -webkit-transform: translateY(0px); - -moz-transform: translateY(0px); - -ms-transform: translateY(0px); - -o-transform: translateY(0px); - transform: translateY(0px); - -webkit-transition: all 0.3s linear; - transition: all 0.3s linear; -} -.btn-outline.btn-large { padding: 14px 29px 16px 29px; } -.btn-outline.btn-small { padding: 7px 14px 8px 14px; } -.btn-outline.btn-mini { padding: 5px 14px 6px 14px; } -.btn-outline.btn-icon { padding: 10px 12px 9px 12px; } -.btn-outline.btn-large.btn-icon { padding: 11px 13px 11px 13px; } -.btn-outline.btn-small.btn-icon { padding: 6px 7px 6px 6px; } -.btn-outline.btn-mini.btn-icon { padding: 4px 6px 4px 6px; } +.btn-outline[disabled], +.btn-outline[disabled]:hover { color: rgba(174,182,192,1); } .btn-outline.btn-black { border-color: rgba(71,74,84,1); color: rgba(71,74,84,1); } -.btn-outline.btn-black:hover { color: rgba(61,64,74,1); } +.btn-outline.btn-black:active, +.btn-outline.btn-black.active, +.btn-outline.btn-black:hover, +.btn-outline.btn-black:focus { color: rgba(61,64,74,1); } .btn-outline.btn-blue { border-color: rgba(58,144,216,1); color: rgba(58,144,216,1); } -.btn-outline.btn-blue:hover { color: rgba(48,134,206,1); } +.btn-outline.btn-blue:active, +.btn-outline.btn-blue.active, +.btn-outline.btn-blue:hover, +.btn-outline.btn-blue:focus { color: rgba(48,134,206,1); } .btn-outline.btn-green { border-color: rgba(122,179,23,1); color: rgba(122,179,23,1); } -.btn-outline.btn-green:hover { color: rgba(102,159,3,1); } +.btn-outline.btn-green:active, +.btn-outline.btn-green.active, +.btn-outline.btn-green:hover, +.btn-outline.btn-green:focus { color: rgba(102,159,3,1); } .btn-outline.btn-red { border-color: rgba(220,74,56,1); color: rgba(220,74,56,1); } -.btn-outline.btn-red:hover { color: rgba(210,64,46,1); } +.btn-outline.btn-red:active, +.btn-outline.btn-red.active, +.btn-outline.btn-red:hover, +.btn-outline.btn-red:focus { color: rgba(210,64,46,1); } .btn-outline.btn-white { border-color: rgba(255,255,255,1); - color: rgba(225,255,255,1); + color: rgba(255,255,255,1); } -.btn-outline.btn-white:hover { color: rgba(226,228,231,1); } +.btn-outline.btn-white:active, +.btn-outline.btn-white.active, +.btn-outline.btn-white:hover, +.btn-outline.btn-white:focus { color: rgba(71,74,84,1); } /* #Button Styles ================================================== */ -.btn-round { border-radius: 500px; } -.btn-uppercase { - font-size: 12px; - letter-spacing: 1px; - line-height: 12px; - padding-bottom: 13px; - text-transform: uppercase; -} -.btn-xlarge.btn-uppercase { - font-size: 13px; - line-height: 13px; - padding: 20px 30px; -} -.btn-large.btn-uppercase { - font-size: 13px; - line-height: 13px; - padding-bottom: 16px; - padding-top: 16px; -} -.btn-small.btn-uppercase { - font-size: 10px; - line-height: 10px; - padding-top: 8px; -} -.btn-mini.btn-uppercase { - font-size: 8px; - line-height: 8px; - padding-bottom: 7px; -} +.btn-circle { border-radius: 500px; } +.btn-uppercase { text-transform: uppercase; } /* #Button Group ================================================== */ .btn-group { display: inline-block; @@ -271,60 +260,64 @@ white-space: nowrap; vertical-align: middle; } .btn-group + .btn-group { margin-left: 5px; } .btn-group.pull-right + .btn-group.pull-right { - margin-left: 0; margin-right: 10px; + margin-left: 0; } .btn-group > .btn { - border-right: 1px solid rgba(196,198,201,1); border-radius: 0; + margin-left: -1px; position: relative; } -.btn-group > .btn-black { border-color: rgba(1,4,14,1); } -.btn-group > .btn-blue { border-color: rgba(8,94,166,1); } -.btn-group > .btn-green { border-color: rgba(72,129,3,1); } -.btn-group > .btn-red { border-color: rgba(180,34,16,1); } -.btn-group > .btn-white { border-color: rgba(196,198,201,1); } .btn-group > .btn:first-child { border-bottom-left-radius: 2px; border-top-left-radius: 2px; margin-left: 0; } .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { - border-right: none; border-bottom-right-radius: 2px; border-top-right-radius: 2px; } -.btn-group > .btn:hover, -.btn-group > .btn:focus, .btn-group > .btn:active, -.btn-group > .btn.active { z-index: 2; } +.btn-group > .btn.active, +.btn-group > .btn:hover, +.btn-group > .btn:focus { z-index: 2; } .btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { outline: 0; } -.btn-group-outline > .btn { - border-width: 1px; - margin-left: -1px; +.btn-group.open .dropdown-toggle { outline: 0; } +.btn-group-justified { + border-collapse: separate; + display: table; + table-layout: fixed; + width: 100%; } -.btn-group-outline > .btn-outline:first-child { margin-left: 0; } -.btn-group-outline > .btn-outline:last-child, -.btn-group-outline > .dropdown-toggle { border-right: 1px solid rgba(229,230,234,1); } -.btn-group-outline > .btn-outline-black:last-child { border-right-color: rgba(1,4,14,1); } -.btn-group-outline > .btn-outline-blue:last-child { border-right-color: rgba(8,94,166,1); } -.btn-group-outline > .btn-outline-green:last-child { border-right-color: rgba(72,129,3,1); } -.btn-group-outline > .btn-outline-red:last-child { border-right-color: rgba(180,34,16,1); } -.btn-group-outline > .btn-outline-white:last-child { border-right-color: rgba(196,198,201,1); } -.btn-group-outline > .btn-outline:last-child:hover, -.btn-group-outline > .dropdown-toggle:hover { border-right: 1px solid rgba(199,200,204,1); } +.btn-group-justified > .btn, +.btn-group-justified > .btn-group { + display: table-cell; + float: none; + width: 1%; +} +.btn-group-justified > .btn-group .btn { width: 100%; } +.btn-group-justified > .btn { border-right-width: 0; } +.btn-group-justified > .btn:last-child { border-right-width: 1px; } /* #Button Toolbar ================================================== */ .btn-toolbar { font-size: 0; margin-bottom: 10px; margin-top: 10px; } .btn-toolbar > .btn + .btn, .btn-toolbar > .btn-group + .btn, -.btn-toolbar > .btn + .btn-group { margin-left: 5px; } +.btn-toolbar > .btn + .btn-group { margin-left: 5px; } + +/* #Button Data Toggles +================================================== */ +[data-toggle="buttons"] > .btn > input[type="radio"], +[data-toggle="buttons"] > .btn > input[type="checkbox"] { + position: absolute; + z-index: -1; + opacity: 0; +} \ No newline at end of file