Merge pull request #244 from citizennet/FBCM-5076/davezuch/Add_pill_blocks

FBCM-5076 Add pill buttons

Author: davezuch

css/Makefile

@@ -4,6 +4,7 @@ CSS_DIR ?= $(ROOT_DIR)/css
 DIST_DIR ?= $(ROOT_DIR)/dist
 
 # Variables that we control.
+CSS_SRC := $(CSS_DIR)/src/*
 CSS_NODE_MODULES := $(CSS_DIR)/node_modules/.stamp
 CSS_PACKAGE_JSON := $(CSS_DIR)/package.json
 CSS_YARN_LOCK := $(CSS_DIR)/yarn.lock
@@ -26,16 +27,16 @@ $(CSS_NODE_MODULES): $(CSS_PACKAGE_JSON) $(CSS_YARN_LOCK)
 	$(CSS_NPX) yarn install
 	touch $@
 
-$(DIST_CSS_DEV_GLOBAL): $(CSS_NODE_MODULES) | $(DIST_DIR)
+$(DIST_CSS_DEV_GLOBAL): $(CSS_SRC) $(CSS_NODE_MODULES) | $(DIST_DIR)
 	$(CSS_NPX) webpack
 
-$(DIST_CSS_DEV_SCOPED): $(CSS_NODE_MODULES) | $(DIST_DIR)
+$(DIST_CSS_DEV_SCOPED): $(CSS_SRC) $(CSS_NODE_MODULES) | $(DIST_DIR)
 	$(CSS_NPX) webpack --env=scoped
 
-$(DIST_CSS_PROD_GLOBAL): $(CSS_NODE_MODULES) | $(DIST_DIR)
+$(DIST_CSS_PROD_GLOBAL): $(CSS_SRC) $(CSS_NODE_MODULES) | $(DIST_DIR)
 	$(CSS_NPX) webpack --env=prod
 
-$(DIST_CSS_PROD_SCOPED): $(CSS_NODE_MODULES) | $(DIST_DIR)
+$(DIST_CSS_PROD_SCOPED): $(CSS_SRC) $(CSS_NODE_MODULES) | $(DIST_DIR)
 	$(CSS_NPX) webpack --env=prod,scoped
 
 $(DIST_DIR):

css/src/index.css

@@ -191,7 +191,9 @@ dt {
 .group:hover .group-hover\:\!focus\:\!disabled\:sibling\:border-grey-70:not(:focus):not(:disabled) ~ * { @apply .border-grey-70; }
 .focus\:next\:text-blue-88:focus + * { @apply .text-blue-88; }
 .\!active\:border-b:not(:active) { @apply .border-b; }
+.\!active\:border-b-2:not(:active) { @apply .border-b-2; }
 .active\:border-t:active { @apply .border-t; }
+.active\:border-t-2:active { @apply .border-t-2; }
 .disabled\:opacity-50:disabled { @apply .opacity-50; }
 .disabled\:cursor-default:disabled { @apply .cursor-default; }
 .\!disabled\:cursor-pointer:not(:disabled) { @apply .cursor-pointer; }

css/src/tailwind.js

@@ -66,6 +66,7 @@ config.colors = Object.assign(config.colors, {
   'blue-75': '#009FBF',
   'blue-82': '#00ABD1',
   'blue-88': '#00BBE0',
+  'blue-88-a40': '#00BBE060',
   'facebook-blue': '#3B5998',
   'fb-blue': '#3B5998',
   'google-blue': '#4285F4',