From 7543faa577161006ab211e333f569f2a84cc316d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Tue, 31 Jan 2017 17:21:22 -0800 Subject: [PATCH] [Frontend] WIP Style Guide Fixes #1233 Adds to text inputs content; Mods to MCTExample to allow a padded wrapper around
 element;
Fixed snow theme css file reference;
---
 example/styleguide/bundle.js                  |  2 +-
 .../res/sass/_style-guide-base.scss           | 20 ++++++++++------
 .../res/sass/style-guide-espresso.scss        |  3 ++-
 .../styleguide/res/sass/style-guide-snow.scss |  3 ++-
 example/styleguide/res/templates/input.html   | 24 +++++++++----------
 .../styleguide/res/templates/mct-example.html | 10 ++++----
 example/styleguide/src/MCTExample.js          |  2 +-
 7 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/example/styleguide/bundle.js b/example/styleguide/bundle.js
index 43135f0ac3..0400b615ec 100644
--- a/example/styleguide/bundle.js
+++ b/example/styleguide/bundle.js
@@ -67,7 +67,7 @@ define([
                     "theme": "espresso"
                 },
                 {
-                    "stylesheetUrl": "css/time-conductor-snow.css",
+                    "stylesheetUrl": "css/style-guide-snow.css",
                     "theme": "snow"
                 }
             ]
diff --git a/example/styleguide/res/sass/_style-guide-base.scss b/example/styleguide/res/sass/_style-guide-base.scss
index 449a7f0e3b..678da448a4 100644
--- a/example/styleguide/res/sass/_style-guide-base.scss
+++ b/example/styleguide/res/sass/_style-guide-base.scss
@@ -41,24 +41,32 @@
         text-transform: uppercase;
     }
 
+    .w-markup {
+        //Wrap markup example "pre" element
+        background-color: $colorCode;
+        border-radius: $interiorMargin;
+        display: block;
+        padding: $interiorMargin $interiorMarginLg;
+        position: relative;
+    }
+
     code,
     pre {
-        background-color: pushBack($colorBodyBg, 20%);
-        display: inline-block;
         font-size: 0.8rem;
     }
 
     code {
+        background-color: $colorCode;
         border-radius: $controlCr;
+        display: inline-block;
         padding: 1px $interiorMargin;
     }
 
     pre {
-        border-radius: $interiorMargin;
         display: block;
         margin: 0;
         overflow: auto;
-        padding: $interiorMargin $interiorMarginLg;
+        padding-bottom: $interiorMarginLg;
         white-space: pre;
     }
 
@@ -129,8 +137,7 @@
             width: $d;
             text-align: left;
             .glyph {
-                //@include test();
-                color: pullForward($colorBodyFg, 30%);
+                color: $colorGlyphExample;
                 font-size: 5em;
                 margin: $interiorMarginLg 0;
                 text-align: center;
@@ -140,7 +147,6 @@
                 color: pushBack($colorBodyFg, 10%);
                 text-transform: uppercase;
                 white-space: nowrap;
-                //width: 33%;
             }
         }
     }
diff --git a/example/styleguide/res/sass/style-guide-espresso.scss b/example/styleguide/res/sass/style-guide-espresso.scss
index 0ed5025d71..d043d1009b 100644
--- a/example/styleguide/res/sass/style-guide-espresso.scss
+++ b/example/styleguide/res/sass/style-guide-espresso.scss
@@ -28,6 +28,7 @@
 @import "../../../../platform/commonUI/general/res/sass/icons";
 
 // Thematic constants
-//$colorHeaders: pullForward($colorBodyFg, 30%);
+$colorCode: rgba(black, 0.1);
+$colorGlyphExample: #fff;
 
 @import "style-guide-base";
\ No newline at end of file
diff --git a/example/styleguide/res/sass/style-guide-snow.scss b/example/styleguide/res/sass/style-guide-snow.scss
index 5caa7b0307..f29d2299ff 100644
--- a/example/styleguide/res/sass/style-guide-snow.scss
+++ b/example/styleguide/res/sass/style-guide-snow.scss
@@ -28,6 +28,7 @@
 @import "../../../../platform/commonUI/general/res/sass/icons";
 
 // Thematic constants
-//$colorHeaders: pullForward($colorBodyFg, 30%);
+$colorCode: rgba(black, 0.1);
+$colorGlyphExample: darken($colorBodyBg, 30%);
 
 @import "style-guide-base";
\ No newline at end of file
diff --git a/example/styleguide/res/templates/input.html b/example/styleguide/res/templates/input.html
index 7b99536bac..f93abfc6f1 100644
--- a/example/styleguide/res/templates/input.html
+++ b/example/styleguide/res/templates/input.html
@@ -31,21 +31,19 @@
         

Text inputs have a consistent look-and-feel across the application. The input's placeholder is styled to appear visually different from an entered value.

-

A variety of size styles are available: .lg, .med and .sm. Numeric inputs that benefit from right-alignment can be styled by adding .numeric.

+

A variety of size styles are available: .lg, .med and .sm. .lg text inputs dynamically scale their width to 100% of their container's width. Numeric inputs that benefit from right-alignment can be styled by adding .numeric.

- +

- +

- -

- -

- +



- + +

+
@@ -62,14 +60,14 @@
- +


- +

- +

- + diff --git a/example/styleguide/res/templates/mct-example.html b/example/styleguide/res/templates/mct-example.html index ae83eff402..2c87e6329b 100644 --- a/example/styleguide/res/templates/mct-example.html +++ b/example/styleguide/res/templates/mct-example.html @@ -1,6 +1,8 @@
-

Markup

-
-

Example

-
+

Markup

+ +

+    
+

Example

+
diff --git a/example/styleguide/src/MCTExample.js b/example/styleguide/src/MCTExample.js index a32e893f6c..d98150a94c 100644 --- a/example/styleguide/src/MCTExample.js +++ b/example/styleguide/src/MCTExample.js @@ -6,7 +6,7 @@ define([ function MCTExample() { function link($scope, $element, $attrs, controller, $transclude) { - var codeEl = $element.find('code'); + var codeEl = $element.find('pre'); var exampleEl = $element.find('div'); $transclude(function (clone) {