diff --git a/core/styleguide/css/states.css b/core/styleguide/css/states.css deleted file mode 100644 index dfcd118..0000000 --- a/core/styleguide/css/states.css +++ /dev/null @@ -1,47 +0,0 @@ -/* basic styling */ -.sg-pattern-state:before { - margin-right: 4px; - content: "\2022"; - display: inline-block; - margin-bottom: -4px; - font-size: 18px; - vertical-align: bottom; -} - -/* nav styling */ -.sg-nav .sg-pattern-state:before { - margin-top: -4px; - margin-bottom: 0; - margin-left: -4px; - height: 20px; - display: block; - float: left; -} - -.sg-sub-nav .sg-pattern-state:before { - margin-left: -11px; - margin-right: 4px; -} - -/* call out for pattern's pattern state */ -span.sg-pattern-state { - color: #999; -} - -span.sg-pattern-state:before { - margin-bottom: -3px; - margin-left: 4px; -} - -/* pattern states */ -.inprogress:before { - color: #FF4136 !important; -} - -.inreview:before { - color: #FFCC00 !important; -} - -.complete:before { - color: #2ECC40 !important; -} \ No newline at end of file diff --git a/core/styleguide/css/styleguide.css b/core/styleguide/css/styleguide.css index 37eb184..23b83b1 100755 --- a/core/styleguide/css/styleguide.css +++ b/core/styleguide/css/styleguide.css @@ -317,6 +317,46 @@ display: inline-block; margin-right: 0.4em; } +/* basic styling */ +.sg-pattern-state:before { + margin-right: 4px; + content: "\2022"; + display: inline-block; + margin-bottom: -4px; + font-size: 18px; + vertical-align: bottom; } + +/* nav styling */ +.sg-nav .sg-pattern-state:before { + margin-top: -4px; + margin-bottom: 0; + margin-left: -4px; + height: 20px; + display: block; + float: left; } + +.sg-sub-nav .sg-pattern-state:before { + margin-left: -11px; + margin-right: 4px; } + +/* call out for pattern's pattern state */ +span.sg-pattern-state { + color: #999; } + +span.sg-pattern-state:before { + margin-bottom: -3px; + margin-left: 4px; } + +/* pattern states */ +.inprogress:before { + color: #FF4136 !important; } + +.inreview:before { + color: #FFCC00 !important; } + +.complete:before { + color: #2ECC40 !important; } + /*------------------------------------*\ $PATTERN LAB VIEWPORT \*------------------------------------*/ @@ -438,10 +478,6 @@ .sg-pattern-head a:hover { color: #222222; } -/* Clean View */ -.sg-clean .sg-main { - padding: 0; } - .sg-colors { overflow: hidden; } .sg-colors li { diff --git a/core/styleguide/css/styleguide.scss b/core/styleguide/css/styleguide.scss index 1dd0b44..7fd533b 100755 --- a/core/styleguide/css/styleguide.scss +++ b/core/styleguide/css/styleguide.scss @@ -467,6 +467,56 @@ $animate-quick: 0.2s; } } +//Pattern States (active, inprogress, complete, etc) + +/* basic styling */ +.sg-pattern-state:before { + margin-right: 4px; + content: "\2022"; + display: inline-block; + margin-bottom: -4px; + font-size: 18px; + vertical-align: bottom; +} + +/* nav styling */ +.sg-nav .sg-pattern-state:before { + margin-top: -4px; + margin-bottom: 0; + margin-left: -4px; + height: 20px; + display: block; + float: left; +} + +.sg-sub-nav .sg-pattern-state:before { + margin-left: -11px; + margin-right: 4px; +} + +/* call out for pattern's pattern state */ +span.sg-pattern-state { + color: #999; +} + +span.sg-pattern-state:before { + margin-bottom: -3px; + margin-left: 4px; +} + +/* pattern states */ +.inprogress:before { + color: #FF4136 !important; +} + +.inreview:before { + color: #FFCC00 !important; +} + +.complete:before { + color: #2ECC40 !important; +} + /*------------------------------------*\ @@ -627,11 +677,6 @@ $animate-quick: 0.2s; } } -/* Clean View */ -.sg-clean .sg-main { - padding: 0; -} - // Style Guide color swatches .sg-colors { overflow: hidden; @@ -724,7 +769,7 @@ $animate-quick: 0.2s; display: block; } -//Visually emphasize annotated elements +//Annotated elements Styles .has-annotation { cursor: help !important; box-shadow: 0 0 10px $sg-secondary; diff --git a/core/templates/index.mustache b/core/templates/index.mustache index 58b9ea4..31a43da 100644 --- a/core/templates/index.mustache +++ b/core/templates/index.mustache @@ -14,7 +14,6 @@ -