-
+
@@ -51,7 +51,7 @@
Palettes
- chevron_rightBlue
+ chevron_rightAmber
-
@@ -100,7 +100,7 @@
-
Form Elements
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,22 +118,22 @@
-
Page Palettes
- closeadd
+ closeadd
-
-
- - Blue Palette -
- - Green Palette + Brand Palette
- - Purple Palette + Accent Palette + +
- + Amber Palette
- - Red Palette + Green Palette
- - Yellow Palette + Red Palette
@@ -172,40 +172,38 @@
-
Form Elements
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,23 +118,23 @@
-
Page Palettes
- closeadd
+ closeadd
- - Blue Palette + Brand Palette + +
- + Accent Palette
- - Green Palette + Amber Palette
- - Purple Palette + Green Palette
- Red Palette -
- - Yellow Palette -
-Yellow Palette
+Accent Palette
- Default Page Colour
-Default page colour is
-$brand-color
.Other Page Colours
+Page Palettes
@@ -221,7 +219,7 @@Other Page Colours
- Linksaddclose + LinksaddcloseFork me on GitHub Follow Daemon on Twitter diff --git a/templates/page-palette-purple.html b/templates/page-palette-brand.html similarity index 80% rename from templates/page-palette-purple.html rename to templates/page-palette-brand.html index 00c6c63d6..c65eadaa9 100644 --- a/templates/page-palette-purple.html +++ b/templates/page-palette-brand.html @@ -4,7 +4,7 @@ -Page Palettes: Purple - Material +Page Palettes: Brand - Material @@ -21,9 +21,9 @@ - +-+@@ -51,7 +51,7 @@Palettes - chevron_rightPurple + chevron_rightBrand-
@@ -100,7 +100,7 @@
-
Form Elements
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,22 +118,22 @@
-
Page Palettes
- closeadd
+ closeadd
-
-
- - Blue Palette +
- + Brand Palette
- - Green Palette + Accent Palette -
- - Purple Palette +
- + Amber Palette
- - Red Palette + Green Palette
- - Yellow Palette + Red Palette
@@ -170,42 +170,40 @@
-
Page Palettes
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,22 +118,22 @@
-+-Purple Palette
+Brand Palette
- Default Page Colour
-Default page colour is
-$brand-color
.Other Page Colours
+Page Palettes
@@ -221,7 +219,7 @@Other Page Colours
- Linksaddclose + LinksaddcloseFork me on GitHub Follow Daemon on Twitter diff --git a/templates/page-palette-green.html b/templates/page-palette-green.html index b27b710d4..98ce004d0 100644 --- a/templates/page-palette-green.html +++ b/templates/page-palette-green.html @@ -23,7 +23,7 @@-+@@ -100,7 +100,7 @@- Form Elements - closeadd + closeadd
-
Form Elements (materialised)
@@ -118,22 +118,22 @@
-
Page Palettes
- closeadd
+ closeadd
- - Blue Palette - -
- - Green Palette + Brand Palette
- - Purple Palette + Accent Palette
- - Red Palette + Amber Palette + +
- + Green Palette
- - Yellow Palette + Red Palette
@@ -179,33 +179,31 @@ -
Form Elements
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,23 +118,23 @@
-
Page Palettes
- closeadd
+ closeadd
- - Blue Palette + Brand Palette
- - Green Palette + Accent Palette + +
- + Amber Palette
- - Purple Palette + Green Palette
- Red Palette -
- - Yellow Palette -
Red Palette
- Default Page Colour
-Default page colour is
-$brand-color
.Other Page Colours
+Page Palettes
@@ -221,7 +219,7 @@Other Page Colours
- Linksaddclose + LinksaddcloseFork me on GitHub Follow Daemon on Twitter diff --git a/templates/page-palette.html b/templates/page-palette.html index 9356d220b..19d70f981 100644 --- a/templates/page-palette.html +++ b/templates/page-palette.html @@ -23,7 +23,7 @@-+@@ -97,7 +97,7 @@- Form Elements - closeadd + closeadd
-
Form Elements (materialised)
@@ -115,22 +115,22 @@
- Page Palettes - closeadd + closeadd @@ -176,33 +176,31 @@
-
Form Elements
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -115,22 +115,22 @@
- Page Palettes - closeadd + closeadd @@ -188,28 +188,31 @@
Flat Buttons
-
Form Elements (materialised)
@@ -115,22 +115,22 @@
Page Palettes
- Default Page Colour
-Default page colour is
-$brand-color
.Other Page Colours
+Page Palettes
@@ -218,7 +216,7 @@Other Page Colours
- Linksaddclose + LinksaddcloseFork me on GitHub Follow Daemon on Twitter diff --git a/templates/ui-button.html b/templates/ui-button.html index 0bd115046..3c0cd5601 100644 --- a/templates/ui-button.html +++ b/templates/ui-button.html @@ -21,9 +21,9 @@ - +-+@@ -97,7 +97,7 @@+
++@@ -243,28 +246,31 @@
+- --Raised Buttons
++@@ -288,13 +294,6 @@
+- --Raised Buttons
Floating Action Buttons
Floating action buttons are used for a special type of promoted action. They are distinguished by a circled icon floating above the UI and have special motion behaviours related to morphing, launching, and the transferring anchor point.
----- --@@ -305,22 +304,22 @@Floating Action Buttons
@@ -350,11 +349,11 @@Floating Action Buttons
-+@@ -62,111 +62,107 @@
-
Page Palettes
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,23 +118,23 @@
Green Palette
- Default Page Colour
-Default page colour is
-$brand-color
.Other Page Colours
+Page Palettes
@@ -221,7 +219,7 @@Other Page Colours
- Linksaddclose + LinksaddcloseFork me on GitHub Follow Daemon on Twitter diff --git a/templates/page-palette-red.html b/templates/page-palette-red.html index 3279cd6ba..feab154c3 100644 --- a/templates/page-palette-red.html +++ b/templates/page-palette-red.html @@ -23,7 +23,7 @@-+@@ -100,7 +100,7 @@ -
Page Palettes
- closeadd
+ closeadd
-
Page Palettes
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,23 +118,23 @@
-Blue Palette
+Amber Palette
- Default Page Colour
-Default page colour is
-$brand-color
.Other Page Colours
+Page Palettes
@@ -221,7 +219,7 @@Other Page Colours
- Linksaddclose + LinksaddcloseFork me on GitHub Follow Daemon on Twitter diff --git a/templates/page-palette-yellow.html b/templates/page-palette-brand-accent.html similarity index 80% rename from templates/page-palette-yellow.html rename to templates/page-palette-brand-accent.html index 7eb6981f7..2000ec3fd 100644 --- a/templates/page-palette-yellow.html +++ b/templates/page-palette-brand-accent.html @@ -4,7 +4,7 @@ -Page Palettes: Yellow - Material +Page Palettes: Accent - Material @@ -21,9 +21,9 @@ - +-+@@ -51,7 +51,7 @@Palettes - chevron_rightYellow + chevron_rightAccent-
@@ -100,7 +100,7 @@
-
Page Palettes
- closeadd
+ closeadd
-
Form Elements (materialised)
@@ -118,22 +118,22 @@