vendor/assets/stylesheets/button.scss in active_frontend-1.0.11 vs vendor/assets/stylesheets/button.scss in active_frontend-2.0.0

- old
+ new

@@ -14,53 +14,49 @@ /* # Button ================================================== */ .btn { -webkit-appearance: none; - -moz-appearance: none; + -moz-appearance: none; background: rgba(245,248,250,1); - border: 1px solid rgba(225,232,237,1); + border: 1px solid rgba(245,248,250,1); border-radius: 2px; -moz-box-sizing: border-box; - box-sizing: border-box; - box-shadow: inset 0 1px 0 rgba(255,255,255,1); + box-sizing: border-box; color: rgba(43,50,53,1); cursor: pointer; display: inline-block; -webkit-font-smoothing: antialiased; font-weight: bold; - font-size: 13px; + font-size: 13px; line-height: 13px; margin: 0; padding: 12px 20px; text-decoration: none; - text-rendering: geometricPrecision; - text-align: center; + text-rendering: geometricPrecision; + text-align: center; -webkit-transition: all 0.3s linear; - transition: all 0.3s linear; + transition: all 0.3s linear; vertical-align: middle; white-space: nowrap; } .btn:active, .btn.active, .btn:hover, .btn:focus, .btn[disabled], .btn[disabled]:hover, -.open > .dropdown-toggle.btn { - background: rgba(235,238,240,1); - text-decoration: none; -} +.open > .dropdown-toggle.btn { text-decoration: none; } .btn[disabled], .btn[disabled]:hover { - color: rgba(43,50,53,1); cursor: not-allowed; + pointer-events: none; } .btn:active, .btn[disabled]:active { -webkit-transition: all 0.1s linear; - transition: all 0.1s linear; + transition: all 0.1s linear; } /* # Sizes ================================================== */ .btn-large { @@ -85,163 +81,65 @@ } .btn-block, button.btn-block, input.btn-block { -moz-box-sizing: border-box; - box-sizing: border-box; + box-sizing: border-box; display: block; min-width: 100%; padding-right: 0; - padding-left: 0; + padding-left: 0; width: 100%; } /* # Colors ================================================== */ .btn-black { - background: rgba(56,67,81,1); - border-color: rgba(6,17,31,1); - box-shadow: inset 0 1px 0 rgba(86,97,111,1); + background: rgba(43,50,53,1); + border-color: rgba(43,50,53,1); color: rgba(255,255,255,1) !important; } -.btn-black:active, -.btn-black.active, -.btn-black:hover, -.btn-black:focus, -.btn-black[disabled], -.btn-black[disabled]:hover, -.open > .dropdown-toggle.btn-black { - background: rgba(66,77,91,1); - color: rgba(255,255,255,1) !important; -} .btn-blue { - background: rgba(15,135,226,1); - border-color: rgba(0,120,211,1); - box-shadow: inset 0 1px 0 rgba(45,165,255,1); + background: rgba(0,132,255,1); + border-color: rgba(0,132,255,1); color: rgba(255,255,255,1) !important; } -.btn-blue:active, -.btn-blue.active, -.btn-blue:hover, -.btn-blue:focus, -.btn-blue[disabled], -.btn-blue[disabled]:hover, -.open > .dropdown-toggle.btn-blue { - background: rgba(25,145,236,1); - color: rgba(255,255,255,1) !important; -} .btn-green { - background: rgba(89,168,15,1); - border-color: rgba(74,153,0,1); - box-shadow: inset 0 1px 0 rgba(119,198,45,1); + background: rgba(68,205,1,1); + border-color: rgba(68,205,1,1); color: rgba(255,255,255,1) !important; } -.btn-green:active, -.btn-green.active, -.btn-green:hover, -.btn-green:focus, -.btn-green[disabled], -.btn-green[disabled]:hover, -.open > .dropdown-toggle.btn-green { - background: rgba(99,178,25,1); - color: rgba(255,255,255,1) !important; -} .btn-orange { - background: rgba(232,126,15,1); - border-color: rgba(202,96,0,1); - box-shadow: inset 0 1px 0 rgba(252,146,35,1); + background: rgba(255,131,0,1); + border-color: rgba(255,131,0,1); color: rgba(255,255,255,1) !important; } -.btn-orange:active, -.btn-orange.active, -.btn-orange:hover, -.btn-orange:focus, -.btn-orange[disabled], -.btn-orange[disabled]:hover, -.open > .dropdown-toggle.btn-orange { - background: rgba(242,136,25,1); - color: rgba(255,255,255,1) !important; -} .btn-purple { - background: rgba(117,73,170,1); - border-color: rgba(97,43,130,1); - box-shadow: inset 0 1px 0 rgba(137,93,190,1); + background: rgba(196,0,235,1); + border-color: rgba(196,0,235,1); color: rgba(255,255,255,1) !important; } -.btn-purple:active, -.btn-purple.active, -.btn-purple:hover, -.btn-purple:focus, -.btn-purple[disabled], -.btn-purple[disabled]:hover, -.open > .dropdown-toggle.btn-purple { - background: rgba(127,83,180,1); - color: rgba(255,255,255,1) !important; -} .btn-red { - background: rgba(218,79,46,1); - border-color: rgba(188,49,16,1); - box-shadow: inset 0 1px 0 rgba(248,109,106,1); + background: rgba(255,59,48,1); + border-color: rgba(255,59,48,1); color: rgba(255,255,255,1) !important; } -.btn-red:active, -.btn-red.active, -.btn-red:hover, -.btn-red:focus, -.btn-red[disabled], -.btn-red[disabled]:hover, -.open > .dropdown-toggle.btn-red { - background: rgba(228,89,56,1); - color: rgba(255,255,255,1) !important; -} .btn-smoke { background: rgba(102,117,127,1); - border-color: rgba(62,77,87,1); - box-shadow: inset 0 1px 0 rgba(132,147,157,1); + border-color: rgba(102,117,127,1); color: rgba(255,255,255,1) !important; } -.btn-smoke:active, -.btn-smoke.active, -.btn-smoke:hover, -.btn-smoke:focus, -.btn-smoke[disabled], -.btn-smoke[disabled]:hover, -.open > .dropdown-toggle.btn-smoke { - background: rgba(112,127,137,1); - color: rgba(255,255,255,1) !important; -} .btn-white { background: rgba(255,255,255,1); border-color: rgba(255,255,255,1); color: rgba(225,232,237,1) !important; } -.btn-white:active, -.btn-white.active, -.btn-white:hover, -.btn-white:focus, -.btn-white[disabled], -.btn-white[disabled]:hover, -.open > .dropdown-toggle.btn-white { - background: rgba(225,232,237,1); +.btn-yellow { + background: rgba(255,235,0,1); + border-color: rgba(255,235,0,1); color: rgba(255,255,255,1) !important; } -.btn-yellow { - background: rgba(255,217,15,1); - border-color: rgba(240,202,0,1); - box-shadow: inset 0 1px 0 rgba(255,237,35,1); - color: rgba(43,50,53,1) !important; -} -.btn-yellow:active, -.btn-yellow.active, -.btn-yellow:hover, -.btn-yellow:focus, -.btn-yellow[disabled], -.btn-yellow[disabled]:hover, -.open > .dropdown-toggle.btn-yellow { - background: rgba(255,227,25,1); - color: rgba(43,50,53,1) !important; -} /* # Links ================================================== */ .btn-link { background: transparent; @@ -293,150 +191,114 @@ padding: 5px 6px; } /* # Outlines ================================================== */ -.btn-outline { +.btn-outline, +.btn-outline[disabled], +.btn-outline[disabled]:hover { background: transparent; - box-shadow: none; color: rgba(174,182,192,1) !important; } .btn-outline:active, .btn-outline.active, .btn-outline:hover, -.btn-outline:focus, -.btn-outline[disabled], -.btn-outline[disabled]:hover { - background: transparent; - color: rgba(102,117,127,1) !important; +.btn-outline:focus { + background: rgba(245,248,250,1); + color: rgba(43,50,53,1) !important; } -.btn-outline[disabled], -.btn-outline[disabled]:hover { - border-color: rgba(174,182,192,1); - color: rgba(174,182,192,1) !important; -} -.btn-outline.btn-black { - border-color: rgba(56,67,81,1); - color: rgba(56,67,81,1) !important; -} +.btn-outline.btn-black, +.btn-outline.btn-black[disabled], +.btn-outline.btn-black[disabled]:hover { color: rgba(43,50,53,1) !important; } .btn-outline.btn-black:active, .btn-outline.btn-black.active, .btn-outline.btn-black:hover, -.btn-outline.btn-black:focus, -.btn-outline.btn-black[disabled], -.btn-outline.btn-black[disabled]:hover { - border-color: rgba(136,147,151,1); - color: rgba(136,147,151,1) !important; +.btn-outline.btn-black:focus { + background: rgba(43,50,53,1); + color: rgba(255,255,255,1) !important; } -.btn-outline.btn-blue { - border-color: rgba(15,135,226,1); - color: rgba(15,135,226,1) !important; -} +.btn-outline.btn-blue, +.btn-outline.btn-blue[disabled], +.btn-outline.btn-blue[disabled]:hover { color: rgba(0,132,255,1) !important; } .btn-outline.btn-blue:active, .btn-outline.btn-blue.active, .btn-outline.btn-blue:hover, -.btn-outline.btn-blue:focus, -.btn-outline.btn-blue[disabled], -.btn-outline.btn-blue[disabled]:hover { - border-color: rgba(45,165,255,1); - color: rgba(45,165,255,1) !important; +.btn-outline.btn-blue:focus { + background: rgba(0,132,255,1); + color: rgba(255,255,255,1) !important; } -.btn-outline.btn-green { - border-color: rgba(89,168,15,1); - color: rgba(89,168,15,1) !important; -} +.btn-outline.btn-green, +.btn-outline.btn-green[disabled], +.btn-outline.btn-green[disabled]:hover { color: rgba(68,205,1,1) !important; } .btn-outline.btn-green:active, .btn-outline.btn-green.active, .btn-outline.btn-green:hover, -.btn-outline.btn-green:focus, -.btn-outline.btn-green[disabled], -.btn-outline.btn-green[disabled]:hover { - border-color: rgba(129,198,45,1); - color: rgba(129,198,45,1) !important; +.btn-outline.btn-green:focus { + background: rgba(68,205,1,1); + color: rgba(255,255,255,1) !important; } -.btn-outline.btn-orange { - border-color: rgba(232,126,15,1); - color: rgba(232,126,15,1) !important; -} +.btn-outline.btn-orange, +.btn-outline.btn-orange[disabled], +.btn-outline.btn-orange[disabled]:hover { color: rgba(255,131,0,1) !important; } .btn-outline.btn-orange:active, .btn-outline.btn-orange.active, .btn-outline.btn-orange:hover, -.btn-outline.btn-orange:focus, -.btn-outline.btn-orange[disabled], -.btn-outline.btn-orange[disabled]:hover { - border-color: rgba(252,146,35,1); - color: rgba(252,146,35,1) !important; +.btn-outline.btn-orange:focus { + background: rgba(255,131,0,1); + color: rgba(255,255,255,1) !important; } -.btn-outline.btn-purple { - border-color: rgba(117,73,170,1); - color: rgba(117,73,170,1) !important; -} +.btn-outline.btn-purple, +.btn-outline.btn-purple[disabled], +.btn-outline.btn-purple[disabled]:hover { color: rgba(196,0,235,1) !important; } .btn-outline.btn-purple:active, .btn-outline.btn-purple.active, .btn-outline.btn-purple:hover, -.btn-outline.btn-purple:focus, -.btn-outline.btn-purple[disabled], -.btn-outline.btn-purple[disabled]:hover { - border-color: rgba(137,93,190,1); - color: rgba(137,93,190,1) !important; +.btn-outline.btn-purple:focus { + background: rgba(196,0,235,1); + color: rgba(255,255,255,1) !important; } -.btn-outline.btn-red { - border-color: rgba(218,79,46,1); - color: rgba(218,79,46,1) !important; -} +.btn-outline.btn-red, +.btn-outline.btn-red[disabled], +.btn-outline.btn-red[disabled]:hover { color: rgba(255,59,48,1) !important; } .btn-outline.btn-red:active, .btn-outline.btn-red.active, .btn-outline.btn-red:hover, -.btn-outline.btn-red:focus, -.btn-outline.btn-red[disabled], -.btn-outline.btn-red[disabled]:hover { - border-color: rgba(248,109,76,1); - color: rgba(248,109,76,1) !important; +.btn-outline.btn-red:focus { + background: rgba(255,79,68,1); + color: rgba(255,255,255,1) !important; } -.btn-outline.btn-smoke { - border-color: rgba(102,117,127,1); - color: rgba(102,117,127,1) !important; -} +.btn-outline.btn-smoke, +.btn-outline.btn-smoke[disabled], +.btn-outline.btn-smoke[disabled]:hover { color: rgba(102,117,127,1) !important; } .btn-outline.btn-smoke:active, .btn-outline.btn-smoke.active, .btn-outline.btn-smoke:hover, -.btn-outline.btn-smoke:focus, -.btn-outline.btn-smoke[disabled], -.btn-outline.btn-smoke[disabled]:hover { - border-color: rgba(132,147,157,1); - color: rgba(132,147,157,1) !important; -} -.btn-outline.btn-white { - border-color: rgba(255,255,255,1); +.btn-outline.btn-smoke:focus { + background: rgba(102,117,127,1); color: rgba(255,255,255,1) !important; } +.btn-outline.btn-white, +.btn-outline.btn-white[disabled], +.btn-outline.btn-white[disabled]:hover { color: rgba(255,255,255,1) !important; } .btn-outline.btn-white:active, .btn-outline.btn-white.active, .btn-outline.btn-white:hover, -.btn-outline.btn-white:focus, -.btn-outline.btn-white[disabled], -.btn-outline.btn-white[disabled]:hover { - border-color: rgba(225,232,237,1); - color: rgba(225,232,237,1) !important; -} -.btn-outline.btn-yellow { - border-color: rgba(255,217,15,1); - color: rgba(255,217,15,1) !important; -} +.btn-outline.btn-white:focus { color: rgba(225,232,237,1) !important; } +.btn-outline.btn-yellow, +.btn-outline.btn-yellow[disabled], +.btn-outline.btn-yellow[disabled]:hover { color: rgba(255,235,0,1) !important; } .btn-outline.btn-yellow:active, .btn-outline.btn-yellow.active, .btn-outline.btn-yellow:hover, -.btn-outline.btn-yellow:focus, -.btn-outline.btn-yellow[disabled], -.btn-outline.btn-yellow[disabled]:hover { - border-color: rgba(255,227,25,1); - color: rgba(255,227,25,1) !important; +.btn-outline.btn-yellow:focus { + background: rgba(255,235,0,1); + color: rgba(255,255,255,1) !important; } /* # Styles ================================================== */ -.btn-circle { border-radius: 500px; } +.btn-circle { border-radius: 500px; } .btn-uppercase { text-transform: uppercase; } /* # Group ================================================== */ .btn-group, @@ -448,27 +310,28 @@ vertical-align: middle; } .btn-group + .btn-group { margin-left: 5px; } .btn-group.pull-right + .btn-group.pull-right { margin-right: 10px; - margin-left: 0; + margin-left: 0; } +.btn-group > .dropdown-toggle:not(:first-child) { border-left-color: rgba(0,0,0,0.15); } .btn-group > .btn, .btn-group-vertical > .btn { border-radius: 0; margin-left: -1px; position: relative; } .btn-group > .btn:first-child { border-bottom-left-radius: 2px; - border-top-left-radius: 2px; + border-top-left-radius: 2px; margin-left: 0; } .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { border-bottom-right-radius: 2px; - border-top-right-radius: 2px; + border-top-right-radius: 2px; } .btn-group > .btn:active, .btn-group > .btn.active, .btn-group > .btn:hover, .btn-group > .btn:focus, @@ -483,23 +346,23 @@ .btn-group-vertical > .btn-group, .btn-group-vertical > .btn-group > .btn { border-radius: 0; display: block; margin-left: 0; - margin-top: -1px; + margin-top: -1px; max-width: 100%; width: 100%; } .btn-group-vertical > .btn:first-child { border-top-right-radius: 2px; - border-top-left-radius: 2px; + border-top-left-radius: 2px; margin-left: 0; } .btn-group-vertical > .btn:last-child, .btn-group-vertical > .dropdown-toggle { border-bottom-right-radius: 2px; - border-bottom-left-radius: 2px; + border-bottom-left-radius: 2px; } .btn-group-justified { border-collapse: separate; display: table; table-layout: fixed; @@ -518,11 +381,11 @@ /* # Toolbar ================================================== */ .btn-toolbar { font-size: 0; margin-bottom: 10px; - margin-top: 10px; + margin-top: 10px; } .btn-toolbar > .btn + .btn, .btn-toolbar > .btn-group + .btn, .btn-toolbar > .btn + .btn-group { margin-left: 5px; } @@ -542,40 +405,40 @@ .btn-group-responsive > .btn-group, .btn-group-responsive > .btn-group > .btn { border-radius: 0; display: block; margin-left: 0; - margin-top: -1px; + margin-top: -1px; max-width: 100%; width: 100%; } .btn-group-responsive > .btn:first-child { border-top-right-radius: 2px; - border-top-left-radius: 2px; + border-top-left-radius: 2px; margin-left: 0; } .btn-group-responsive > .btn:last-child, .btn-group-responsive > .dropdown-toggle { border-bottom-right-radius: 2px; - border-bottom-left-radius: 2px; + border-bottom-left-radius: 2px; } .btn-group-vertical-responsive > .btn, .btn-group-vertical-responsive > .btn-group, .btn-group-vertical-responsive > .btn-group > .btn { display: inline-block; margin-left: -1px; - margin-top: 0; + margin-top: 0; max-width: initial; width: initial; } .btn-group-vertical-responsive > .btn:first-child { border-bottom-left-radius: 2px; - border-top-right-radius: 0; - border-top-left-radius: 2px; + border-top-right-radius: 0; + border-top-left-radius: 2px; } .btn-group-vertical-responsive > .btn:last-child, .btn-group-vertical-responsive > .dropdown-toggle { border-bottom-right-radius: 2px; - border-bottom-left-radius: 0; - border-top-right-radius: 2px; + border-bottom-left-radius: 0; + border-top-right-radius: 2px; } } \ No newline at end of file