From 331f1fc4b7e910c2f1ffc950b6580385e865feec Mon Sep 17 00:00:00 2001 From: Vaibhav Date: Mon, 3 Jun 2019 18:50:31 +0530 Subject: [PATCH] css: Reorder app_components.scss so `.button` are in same place. --- static/styles/app_components.scss | 49 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/static/styles/app_components.scss b/static/styles/app_components.scss index 5b95fdee98..3160399853 100644 --- a/static/styles/app_components.scss +++ b/static/styles/app_components.scss @@ -101,22 +101,6 @@ min-width: inherit; } -.new-style .button.sea-green { - color: hsl(156, 41%, 40%); - border-color: hsl(156, 28%, 70%); -} - -.new-style .button.btn-warning { - color: hsl(35, 70%, 56%); - border-color: hsl(35, 98%, 84%); -} - -.new-style .button.btn-danger { - color: hsl(357, 64%, 72%); - border-color: hsl(4, 56%, 82%); -} - -/* -- button states -- */ .new-style .button:hover, .new-style .button:focus { border-color: hsl(0, 0%, 60%); @@ -128,6 +112,11 @@ background-color: hsl(0, 0%, 95%); } +.new-style .button.sea-green { + color: hsl(156, 41%, 40%); + border-color: hsl(156, 28%, 70%); +} + .new-style .button.sea-green:hover, .new-style .button.sea-green:focus { border-color: hsl(156, 30%, 50%); @@ -139,15 +128,9 @@ background-color: hsl(154, 33%, 96%); } -.new-style .button.btn-danger:hover, -.new-style .button.btn-danger:focus { - border-color: hsl(2, 46%, 68%); -} - -.new-style .button.btn-danger:active { - color: hsl(357, 55%, 63%); - border-color: hsl(2, 46%, 68%); - background-color: hsl(7, 82%, 98%); +.new-style .button.btn-warning { + color: hsl(35, 70%, 56%); + border-color: hsl(35, 98%, 84%); } .new-style .button.btn-warning:hover { @@ -160,6 +143,22 @@ background-color: hsl(33, 48%, 96%); } +.new-style .button.btn-danger { + color: hsl(357, 64%, 72%); + border-color: hsl(4, 56%, 82%); +} + +.new-style .button.btn-danger:hover, +.new-style .button.btn-danger:focus { + border-color: hsl(2, 46%, 68%); +} + +.new-style .button.btn-danger:active { + color: hsl(357, 55%, 63%); + border-color: hsl(2, 46%, 68%); + background-color: hsl(7, 82%, 98%); +} + .new-style .button[disabled="disabled"] { cursor: not-allowed; -moz-filter: saturate(0);