From 05277cfebf9dde22e08eeae286930a2aa9c11219 Mon Sep 17 00:00:00 2001 From: Ryon Coleman Date: Fri, 27 Jan 2017 15:41:09 -0500 Subject: [PATCH 001/127] Add Google Tag Manager #GTM-NR2SD7C --- website/source/layouts/_meta.erb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/website/source/layouts/_meta.erb b/website/source/layouts/_meta.erb index 283afb6612..a336409dd7 100644 --- a/website/source/layouts/_meta.erb +++ b/website/source/layouts/_meta.erb @@ -15,7 +15,19 @@ <%= javascript_include_tag "html5shiv", "respond.min" %> + + + + <%= yield_content :head %> " class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>"> + + + From 9ee0c3417959e1fb7ff96fe8d0a719cdc4454790 Mon Sep 17 00:00:00 2001 From: Brian Kassouf Date: Fri, 3 Mar 2017 14:50:55 -0800 Subject: [PATCH 002/127] Allowed/Denied parameters support for globs (#2438) * Add check for globbed strings * Add tests for the acl globbing * Fix bad test case --- helper/strutil/strutil.go | 19 ++++++++++++++++++ helper/strutil/strutil_test.go | 36 ++++++++++++++++++++++++++++++++++ vault/acl.go | 10 +++++++++- vault/acl_test.go | 8 ++++++-- 4 files changed, 70 insertions(+), 3 deletions(-) diff --git a/helper/strutil/strutil.go b/helper/strutil/strutil.go index d079b9cb92..0d418016a1 100644 --- a/helper/strutil/strutil.go +++ b/helper/strutil/strutil.go @@ -255,3 +255,22 @@ func StrListDelete(s []string, d string) []string { return s } + +func GlobbedStringsMatch(item, val string) bool { + if len(item) < 2 { + return val == item + } + + hasPrefix := strings.HasPrefix(item, "*") + hasSuffix := strings.HasSuffix(item, "*") + + if hasPrefix && hasSuffix { + return strings.Contains(val, item[1:len(item)-1]) + } else if hasPrefix { + return strings.HasSuffix(val, item[1:]) + } else if hasSuffix { + return strings.HasPrefix(val, item[:len(item)-1]) + } + + return val == item +} diff --git a/helper/strutil/strutil_test.go b/helper/strutil/strutil_test.go index f818a26723..85ccd8b4c0 100644 --- a/helper/strutil/strutil_test.go +++ b/helper/strutil/strutil_test.go @@ -279,3 +279,39 @@ $$`, t.Fatalf("bad: expected:\n%#v\nactual:\n%#v", jsonExpected, actual) } } + +func TestGlobbedStringsMatch(t *testing.T) { + type tCase struct { + item string + val string + expect bool + } + + tCases := []tCase{ + tCase{"", "", true}, + tCase{"*", "*", true}, + tCase{"**", "**", true}, + tCase{"*t", "t", true}, + tCase{"*t", "test", true}, + tCase{"t*", "test", true}, + tCase{"*test", "test", true}, + tCase{"*test", "a test", true}, + tCase{"test", "a test", false}, + tCase{"*test", "tests", false}, + tCase{"test*", "test", true}, + tCase{"test*", "testsss", true}, + tCase{"test**", "testsss", false}, + tCase{"test**", "test*", true}, + tCase{"**test", "*test", true}, + tCase{"TEST", "test", false}, + tCase{"test", "test", true}, + } + + for _, tc := range tCases { + actual := GlobbedStringsMatch(tc.item, tc.val) + + if actual != tc.expect { + t.Fatalf("Bad testcase %#v, expected %b, got %b", tc, tc.expect, actual) + } + } +} diff --git a/vault/acl.go b/vault/acl.go index 81d6a978c8..550e0df029 100644 --- a/vault/acl.go +++ b/vault/acl.go @@ -5,6 +5,7 @@ import ( "strings" "github.com/armon/go-radix" + "github.com/hashicorp/vault/helper/strutil" "github.com/hashicorp/vault/logical" ) @@ -348,7 +349,14 @@ func valueInParameterList(v interface{}, list []interface{}) bool { func valueInSlice(v interface{}, list []interface{}) bool { for _, el := range list { - if reflect.DeepEqual(el, v) { + if reflect.TypeOf(el).String() == "string" && reflect.TypeOf(v).String() == "string" { + item := el.(string) + val := v.(string) + + if strutil.GlobbedStringsMatch(item, val) { + return true + } + } else if reflect.DeepEqual(el, v) { return true } } diff --git a/vault/acl_test.go b/vault/acl_test.go index 61ce4590cd..7eb45b8b43 100644 --- a/vault/acl_test.go +++ b/vault/acl_test.go @@ -366,6 +366,7 @@ func TestACL_ValuePermissions(t *testing.T) { {"dev/ops", []string{"allow"}, []interface{}{"good"}, true}, {"dev/ops", []string{"allow"}, []interface{}{"bad"}, false}, {"foo/bar", []string{"deny"}, []interface{}{"bad"}, false}, + {"foo/bar", []string{"deny"}, []interface{}{"bad glob"}, false}, {"foo/bar", []string{"deny"}, []interface{}{"good"}, true}, {"foo/bar", []string{"allow"}, []interface{}{"good"}, true}, {"foo/baz", []string{"aLLow"}, []interface{}{"good"}, true}, @@ -379,6 +380,9 @@ func TestACL_ValuePermissions(t *testing.T) { {"fizz/buzz", []string{"allow_multi"}, []interface{}{"good"}, true}, {"fizz/buzz", []string{"allow_multi"}, []interface{}{"good1"}, true}, {"fizz/buzz", []string{"allow_multi"}, []interface{}{"good2"}, true}, + {"fizz/buzz", []string{"allow_multi"}, []interface{}{"glob good2"}, false}, + {"fizz/buzz", []string{"allow_multi"}, []interface{}{"glob good3"}, true}, + {"fizz/buzz", []string{"allow_multi"}, []interface{}{"bad"}, false}, {"fizz/buzz", []string{"allow_multi"}, []interface{}{"bad"}, false}, {"fizz/buzz", []string{"allow_multi", "allow"}, []interface{}{"good1", "good"}, true}, {"fizz/buzz", []string{"deny_multi"}, []interface{}{"bad2"}, false}, @@ -686,7 +690,7 @@ path "dev/*" { path "foo/bar" { policy = "write" denied_parameters = { - "deny" = ["bad"] + "deny" = ["bad*"] } } path "foo/baz" { @@ -701,7 +705,7 @@ path "foo/baz" { path "fizz/buzz" { policy = "write" allowed_parameters = { - "allow_multi" = ["good", "good1", "good2"] + "allow_multi" = ["good", "good1", "good2", "*good3"] "allow" = ["good"] } denied_parameters = { From 2f1aed5500565bf23b0eed92047f307f2261d766 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sat, 4 Mar 2017 10:21:13 -0500 Subject: [PATCH 003/127] Fix poison pill location --- vault/core.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vault/core.go b/vault/core.go index ea378fa8ad..396a2bc16e 100644 --- a/vault/core.go +++ b/vault/core.go @@ -1534,6 +1534,16 @@ func (c *Core) periodicCheckKeyUpgrade(doneCh, stopCh chan struct{}) { continue } + // Check for a poison pill. If we can read it, it means we have stale + // keys (e.g. from replication being activated) and we need to seal to + // be unsealed again. + entry, _ := c.barrier.Get(poisonPillPath) + if entry != nil && len(entry.Value) > 0 { + c.logger.Warn("core: encryption keys have changed out from underneath us (possibly due to replication enabling), must be unsealed again") + go c.Shutdown() + continue + } + if err := c.checkKeyUpgrades(); err != nil { c.logger.Error("core: key rotation periodic upgrade check failed", "error", err) } @@ -1550,16 +1560,6 @@ func (c *Core) checkKeyUpgrades() error { // Check for an upgrade didUpgrade, newTerm, err := c.barrier.CheckUpgrade() if err != nil { - // The problem might be that we can't decrypt the value, e.g. if - // replication has been turned on, so check to see if a poison pill - // was written. If we can read it, it means we have stale keys and - // we need to seal to be unsealed again. - entry, _ := c.barrier.Get(poisonPillPath) - if entry != nil && len(entry.Value) > 0 { - c.logger.Warn("core: encryption keys have changed out from underneath us (possibly due to replication enabling), must be unsealed again") - go c.Shutdown() - return nil - } return err } From aecb5cbd3412a954021c202fb8291f1aea6c9712 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sat, 4 Mar 2017 16:35:41 -0500 Subject: [PATCH 004/127] Add some nil checks to mounting --- vault/audit.go | 14 ++++++++++++-- vault/auth.go | 19 +++++++++++++++---- vault/mount.go | 22 +++++++++++++++------- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/vault/audit.go b/vault/audit.go index 46e789dfb3..939184369c 100644 --- a/vault/audit.go +++ b/vault/audit.go @@ -87,6 +87,9 @@ func (c *Core) enableAudit(entry *MountEntry) error { if err != nil { return err } + if backend == nil { + return fmt.Errorf("nil audit backend of type %q returned from factory", entry.Type) + } newTable := c.audit.shallowClone() newTable.Entries = append(newTable.Entries, entry) @@ -300,14 +303,18 @@ func (c *Core) setupAudits() error { view := NewBarrierView(c.barrier, viewPath) // Initialize the backend - audit, err := c.newAuditBackend(entry, view, entry.Options) + backend, err := c.newAuditBackend(entry, view, entry.Options) if err != nil { c.logger.Error("core: failed to create audit entry", "path", entry.Path, "error", err) continue } + if backend == nil { + c.logger.Error("core: created audit entry was nil", "path", entry.Path, "type", entry.Type) + continue + } // Mount the backend - broker.Register(entry.Path, audit, view) + broker.Register(entry.Path, backend, view) successCount += 1 } @@ -376,6 +383,9 @@ func (c *Core) newAuditBackend(entry *MountEntry, view logical.Storage, conf map if err != nil { return nil, err } + if be == nil { + return nil, fmt.Errorf("nil backend returned from %q factory function", entry.Type) + } switch entry.Type { case "file": diff --git a/vault/auth.go b/vault/auth.go index 8380dbbe83..c3197bce2c 100644 --- a/vault/auth.go +++ b/vault/auth.go @@ -91,6 +91,9 @@ func (c *Core) enableCredential(entry *MountEntry) error { if err != nil { return err } + if backend == nil { + return fmt.Errorf("nil backend returned from %q factory", entry.Type) + } if err := backend.Initialize(); err != nil { return err @@ -151,6 +154,12 @@ func (c *Core) disableCredential(path string) (bool, error) { return true, err } + // Call cleanup function if it exists + backend := c.router.MatchingBackend(fullPath) + if backend != nil { + backend.Cleanup() + } + // Unmount the backend if err := c.router.Unmount(fullPath); err != nil { return true, err @@ -386,6 +395,9 @@ func (c *Core) setupCredentials() error { c.logger.Error("core: failed to create credential entry", "path", entry.Path, "error", err) return errLoadAuthFailed } + if backend == nil { + return fmt.Errorf("nil backend returned from %q factory", entry.Type) + } if err := backend.Initialize(); err != nil { return err @@ -430,10 +442,9 @@ func (c *Core) teardownCredentials() error { if c.auth != nil { authTable := c.auth.shallowClone() for _, e := range authTable.Entries { - prefix := e.Path - b, ok := c.router.root.Get(prefix) - if ok { - b.(*routeEntry).backend.Cleanup() + backend := c.router.MatchingBackend(credentialRoutePrefix + e.Path) + if backend != nil { + backend.Cleanup() } } } diff --git a/vault/mount.go b/vault/mount.go index c03c560e38..da0f66ed07 100644 --- a/vault/mount.go +++ b/vault/mount.go @@ -212,6 +212,9 @@ func (c *Core) mount(entry *MountEntry) error { if err != nil { return err } + if backend == nil { + return fmt.Errorf("nil backend of type %q returned from creation function", entry.Type) + } // Call initialize; this takes care of init tasks that must be run after // the ignore paths are collected @@ -283,9 +286,9 @@ func (c *Core) unmount(path string) (bool, error) { } // Call cleanup function if it exists - b, ok := c.router.root.Get(path) - if ok { - b.(*routeEntry).backend.Cleanup() + backend := c.router.MatchingBackend(path) + if backend != nil { + backend.Cleanup() } // Unmount the backend entirely @@ -638,6 +641,9 @@ func (c *Core) setupMounts() error { c.logger.Error("core: failed to create mount entry", "path", entry.Path, "error", err) return errLoadMountsFailed } + if backend == nil { + return fmt.Errorf("created mount entry of type %q is nil", entry.Type) + } if err := backend.Initialize(); err != nil { return err @@ -680,10 +686,9 @@ func (c *Core) unloadMounts() error { if c.mounts != nil { mountTable := c.mounts.shallowClone() for _, e := range mountTable.Entries { - prefix := e.Path - b, ok := c.router.root.Get(prefix) - if ok { - b.(*routeEntry).backend.Cleanup() + backend := c.router.MatchingBackend(e.Path) + if backend != nil { + backend.Cleanup() } } } @@ -712,6 +717,9 @@ func (c *Core) newLogicalBackend(t string, sysView logical.SystemView, view logi if err != nil { return nil, err } + if b == nil { + return nil, fmt.Errorf("nil backend of type %q returned from factory", t) + } return b, nil } From 68529eedd4f631e51dedcc8f94ed8747917ddf87 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sat, 4 Mar 2017 16:59:00 -0500 Subject: [PATCH 005/127] Fix dynamo test that can double close a channel --- physical/dynamodb_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/physical/dynamodb_test.go b/physical/dynamodb_test.go index d4efcef4c9..daac8c873f 100644 --- a/physical/dynamodb_test.go +++ b/physical/dynamodb_test.go @@ -198,13 +198,12 @@ func testDynamoDBLockTTL(t *testing.T, ha HABackend) { // The first lock should have lost the leader channel leaderChClosed := false blocking := make(chan struct{}) - time.AfterFunc(watchInterval*3, func() { - close(blocking) - }) // Attempt to read from the leader or the blocking channel, which ever one // happens first. go func() { select { + case <-time.After(watchInterval * 3): + return case <-leaderCh: leaderChClosed = true close(blocking) From 3445b3ae6368a48e2111f65d833e792e4e9746d1 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 6 Mar 2017 15:39:34 +0000 Subject: [PATCH 006/127] Updated doc to match real output (#2443) Regards hashicorp/vault#2116 --- website/source/docs/commands/read-write.html.md | 8 ++++---- .../intro/getting-started/dynamic-secrets.html.md | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/website/source/docs/commands/read-write.html.md b/website/source/docs/commands/read-write.html.md index 0b0ff07bb2..b0553eda0c 100644 --- a/website/source/docs/commands/read-write.html.md +++ b/website/source/docs/commands/read-write.html.md @@ -101,10 +101,10 @@ Data can be read using `vault read`. This command is very simple: ``` $ vault read secret/password -Key Value -lease_id secret/password/76c844fb-aeba-a766-0a50-2b907072233a -lease_duration 2764800 -value itsasecret +Key Value +--- ----- +refresh_interval 768h0m0s +value itsasecret ``` You can use the `-format` flag to get various different formats out diff --git a/website/source/intro/getting-started/dynamic-secrets.html.md b/website/source/intro/getting-started/dynamic-secrets.html.md index 2b95facc62..2aa1099710 100644 --- a/website/source/intro/getting-started/dynamic-secrets.html.md +++ b/website/source/intro/getting-started/dynamic-secrets.html.md @@ -124,10 +124,14 @@ special path `aws/creds/` where `NAME` is the role name: ``` $ vault read aws/creds/deploy -Key Value -lease_id aws/creds/deploy/0d042c53-aa8a-7ce7-9dfd-310351c465e5 -access_key AKIAJFN42DVCQWDHQYHQ -secret_key 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 +Key Value +--- ----- +lease_id aws/creds/deploy/0d042c53-aa8a-7ce7-9dfd-310351c465e5 +lease_duration 768h0m0s +lease_renewable true +access_key AKIAJFN42DVCQWDHQYHQ +secret_key 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 +security_token ``` Success! The access and secret key can now be used to perform any EC2 From c2bd662386bcb54ebc9378ad5b2567d919e91a9f Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Mon, 6 Mar 2017 13:11:14 -0500 Subject: [PATCH 007/127] Switch physical cache map index value to md5 from sha1 for all the performances --- physical/cache.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/physical/cache.go b/physical/cache.go index 96f2586f31..5f3e81e915 100644 --- a/physical/cache.go +++ b/physical/cache.go @@ -1,7 +1,7 @@ package physical import ( - "crypto/sha1" + "crypto/md5" "encoding/hex" "fmt" "strings" @@ -59,7 +59,7 @@ func NewCache(b Backend, size int, logger log.Logger) *Cache { } func (c *Cache) lockHashForKey(key string) string { - hf := sha1.New() + hf := md5.New() hf.Write([]byte(key)) return strings.ToLower(hex.EncodeToString(hf.Sum(nil))[:2]) } From 4f5f1e7a524cebda7fe9536023b91a308ccf640c Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 3 Mar 2017 11:51:49 -0500 Subject: [PATCH 008/127] Unify layout partials --- website/config.rb | 58 ++++++ website/helpers/sidebar_helpers.rb | 12 -- .../hashicorp-shared/_hashicorp-sidebar.scss | 21 +- website/source/layouts/_announcement-bnr.erb | 18 -- website/source/layouts/_footer.erb | 87 -------- website/source/layouts/_header.erb | 38 ---- website/source/layouts/_meta.erb | 25 --- website/source/layouts/_sidebar.erb | 35 ++-- website/source/layouts/layout.erb | 186 +++++++++++++++++- 9 files changed, 257 insertions(+), 223 deletions(-) delete mode 100644 website/helpers/sidebar_helpers.rb delete mode 100644 website/source/layouts/_announcement-bnr.erb delete mode 100644 website/source/layouts/_footer.erb delete mode 100644 website/source/layouts/_header.erb delete mode 100644 website/source/layouts/_meta.erb diff --git a/website/config.rb b/website/config.rb index 5e6629ca4e..e0164d4304 100644 --- a/website/config.rb +++ b/website/config.rb @@ -6,3 +6,61 @@ activate :hashicorp do |h| h.github_slug = "hashicorp/vault" h.website_root = "website" end + +helpers do + # Get the title for the page. + # + # @param [Middleman::Page] page + # + # @return [String] + def title_for(page) + if page && page.data.page_title + return "#{page.data.page_title} - Vault by HashiCorp" + end + + "Vault by HashiCorp" + end + + # Get the description for the page + # + # @param [Middleman::Page] page + # + # @return [String] + def description_for(page) + return escape_html(page.data.description || "") + end + + # This helps by setting the "active" class for sidebar nav elements + # if the YAML frontmatter matches the expected value. + def sidebar_current(expected) + current = current_page.data.sidebar_current || "" + if current.start_with?(expected) + return " class=\"active\"" + else + return "" + end + end + + # Returns the id for this page. + # @return [String] + def body_id_for(page) + if name = page.data.sidebar_current && !name.blank? + return "page-#{name.strip}" + end + return "page-home" + end + + # Returns the list of classes for this page. + # @return [String] + def body_classes_for(page) + classes = [] + + if page && page.data.layout + classes << "layout-#{page.data.layout}" + end + + classes << "-displaying-bnr" + + return classes.join(" ") + end +end diff --git a/website/helpers/sidebar_helpers.rb b/website/helpers/sidebar_helpers.rb deleted file mode 100644 index 124a7c53c6..0000000000 --- a/website/helpers/sidebar_helpers.rb +++ /dev/null @@ -1,12 +0,0 @@ -module SidebarHelpers - # This helps by setting the "active" class for sidebar nav elements - # if the YAML frontmatter matches the expected value. - def sidebar_current(expected) - current = current_page.data.sidebar_current || "" - if current.start_with?(expected) - return " class=\"active\"" - else - return "" - end - end -end diff --git a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss index 99f77f6c52..a8564f209f 100644 --- a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss +++ b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss @@ -143,11 +143,11 @@ $sidebar-icon-height: 20px; } .sidebar-image { - padding-top: 24px; - img { - display: block; - margin: 0 auto; - } + background-image: image-url('logo-header.svg'); + background-position: center center; + background-repeat: no-repeat; + height: 72px; + margin-top: 24px; } @@ -250,17 +250,6 @@ $sidebar-icon-height: 20px; min-width: $sidebar-width; width: $sidebar-width; } - - .sidebar .sidebar-header { - //height: $sidebar-width * 9/16; // 16:9 header dimension - } - - .sidebar .sidebar-image { - /* img { - width: $sidebar-width/4 - $sidebar-padding; - height: $sidebar-width/4 - $sidebar-padding; - } */ - } } .sidebar-overlay { diff --git a/website/source/layouts/_announcement-bnr.erb b/website/source/layouts/_announcement-bnr.erb deleted file mode 100644 index 77bf4f0dc9..0000000000 --- a/website/source/layouts/_announcement-bnr.erb +++ /dev/null @@ -1,18 +0,0 @@ -
-
-
-
-

- Announcing - - Secure Infrastructure Automation. - - Find out more - -

-
-
-
-
diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb deleted file mode 100644 index cd983f0183..0000000000 --- a/website/source/layouts/_footer.erb +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - -<%= javascript_include_tag "application" %> - - - - - diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb deleted file mode 100644 index 88d6ae38e0..0000000000 --- a/website/source/layouts/_header.erb +++ /dev/null @@ -1,38 +0,0 @@ -
"> -
-
-
-
-
- - by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>Hashicorp -
- -
- -
-
-
-
diff --git a/website/source/layouts/_meta.erb b/website/source/layouts/_meta.erb deleted file mode 100644 index 9f0a7edafc..0000000000 --- a/website/source/layouts/_meta.erb +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - <%= [current_page.data.page_title, "Vault by HashiCorp"].compact.join(" - ") %> - - <%= stylesheet_link_tag "application" %> - - - - - - - - <%= yield_content :head %> - - - " class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>"> diff --git a/website/source/layouts/_sidebar.erb b/website/source/layouts/_sidebar.erb index 3698086a10..3ba99e94bf 100644 --- a/website/source/layouts/_sidebar.erb +++ b/website/source/layouts/_sidebar.erb @@ -3,24 +3,21 @@ diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 729e9a543b..018e9d539c 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -1,10 +1,180 @@ -<%= partial "layouts/meta" %> -<%= partial "layouts/announcement-bnr" %> -<%= partial "layouts/header" %> -<%= partial "layouts/sidebar" %> + + + + + + -<%= yield %> + -<%= partial "ember_templates" %> -<%= partial "ember_steps" %> -<%= partial "layouts/footer" %> + <%= title_for(current_page) %> + + <%= stylesheet_link_tag "application" %> + + + + + + + + + + + <%= yield_content :head %> + + + +
+
+
+
+

+ Announcing + + Secure Infrastructure Automation. + + Find out more + +

+
+
+
+
+ + + + <%= partial "layouts/sidebar" %> + + <%= yield %> + + <%= partial "ember_templates" %> + <%= partial "ember_steps" %> + + + + + + + + <%= javascript_include_tag "application" %> + + + + From b9ea9a7f53ff9e1f7962425e7add34f4f4b5844f Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 14:51:37 -0500 Subject: [PATCH 009/127] Remove displaying-bnr This is not used anywhere --- website/config.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/website/config.rb b/website/config.rb index e0164d4304..ad1474719d 100644 --- a/website/config.rb +++ b/website/config.rb @@ -59,8 +59,6 @@ helpers do classes << "layout-#{page.data.layout}" end - classes << "-displaying-bnr" - return classes.join(" ") end end From 7b1dc98ab82a10758da3b2aec60de9b02f04b5d4 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 14:51:53 -0500 Subject: [PATCH 010/127] Remove empty scss file --- website/source/assets/stylesheets/_jumbotron.scss | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 website/source/assets/stylesheets/_jumbotron.scss diff --git a/website/source/assets/stylesheets/_jumbotron.scss b/website/source/assets/stylesheets/_jumbotron.scss deleted file mode 100755 index e69de29bb2..0000000000 From 0db284fa09da27556cb89b72fb16a801e93303d3 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 14:52:01 -0500 Subject: [PATCH 011/127] Use × instead of "X" --- website/source/_ember_templates.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/_ember_templates.html.erb b/website/source/_ember_templates.html.erb index 181ea58ce1..23184ab273 100644 --- a/website/source/_ember_templates.html.erb +++ b/website/source/_ember_templates.html.erb @@ -16,7 +16,7 @@ -X +×
{{renderedLogs}}
From 8bcf3b1741cbfb64a236d60c49dabf7308976aee Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 14:52:20 -0500 Subject: [PATCH 012/127] Do not show "Edit this Page" in dev either --- website/source/layouts/layout.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb index 018e9d539c..892c2f37c5 100644 --- a/website/source/layouts/layout.erb +++ b/website/source/layouts/layout.erb @@ -99,7 +99,7 @@
- <% if current_page.url != '/' %> + <% if current_page.url != '/' && current_page.url != '/index.html' %>
Edit this page
<% end %>
From a49714546f0f1a83eef4aed5fa2b7578995e55cc Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 14:53:00 -0500 Subject: [PATCH 013/127] Clean up scss --- website/source/assets/stylesheets/_api.scss | 86 +-- .../source/assets/stylesheets/_buttons.scss | 23 +- .../source/assets/stylesheets/_community.scss | 26 +- website/source/assets/stylesheets/_demo.scss | 217 +++--- website/source/assets/stylesheets/_docs.scss | 389 ++++------- .../source/assets/stylesheets/_downloads.scss | 108 +-- .../source/assets/stylesheets/_footer.scss | 34 +- .../source/assets/stylesheets/_global.scss | 117 ++-- .../source/assets/stylesheets/_header.scss | 13 +- website/source/assets/stylesheets/_home.scss | 657 +++--------------- .../source/assets/stylesheets/_sidebar.scss | 10 - .../source/assets/stylesheets/_variables.scss | 96 +-- .../assets/stylesheets/application.scss | 5 +- .../hashicorp-shared/_hashicorp-sidebar.scss | 2 + website/source/index.html.erb | 191 +++-- 15 files changed, 672 insertions(+), 1302 deletions(-) diff --git a/website/source/assets/stylesheets/_api.scss b/website/source/assets/stylesheets/_api.scss index c9c05c545d..5bc1dc2a19 100644 --- a/website/source/assets/stylesheets/_api.scss +++ b/website/source/assets/stylesheets/_api.scss @@ -3,48 +3,52 @@ // -------------------------------------------------- .bs-api-section dl, dl.api { - margin-top: 30px; - line-height: 20px; + margin-top: 30px; + line-height: 20px; - dt { + dt { + color: #888; + text-transform: uppercase; + font-weight: normal; + float: left; + width: 150px; + text-align: right; + } + + dd { + margin-left: 170px; + + pre.api-sample { + margin-top: 20px; + font-size: 14px; + padding: 10px; + } + } + + ul { + margin: 0; + padding: 0; + + li { + margin: 0; + list-style-type: none; + padding-bottom: 20px; + font-size: 15px; + font-family: $font-family-open-sans; + + &:last-child { + padding-bottom: 0; + } + + span.param { + font-weight: bold; + } + + span.param-flags { + font-style: italic; color: #888; - text-transform: uppercase; - font-weight: normal; - float: left; - width: 150px; - text-align: right; - } - - dd { - margin-left: 170px; - - pre.api-sample { - margin-top: 20px; - font-size: 14px; - padding: 10px; - } - } - - ul { - margin: 0; - padding: 0; - - li { - margin: 0; - list-style-type: none; - padding-bottom: 20px; - font-size: 15px; - font-family: $font-family-open-sans; - - span.param { - font-weight: bold; - } - - span.param-flags { - font-style: italic; - color: #888; - padding-right: 6px; - } - } + padding-right: 6px; + } } + } } diff --git a/website/source/assets/stylesheets/_buttons.scss b/website/source/assets/stylesheets/_buttons.scss index 3a635c5c0b..d663bfbd43 100755 --- a/website/source/assets/stylesheets/_buttons.scss +++ b/website/source/assets/stylesheets/_buttons.scss @@ -2,36 +2,37 @@ // Button Styles // -------------------------------------------------- -.v-btn{ +.v-btn { display: inline-block; background-color: $white; color: $black; border: 1px solid $black; + text-decoration: none; @include transition(color .3s ease-in-out); @include btn-shadow(); - &.lrg{ + &.lrg { font-size: 18px; padding: 10px 50px; } - &.sml{ + &.sml { font-size: 15px; padding: 8px 40px; } - &.blue{ + &.blue { color: $blue; border: 1px solid $blue; } - &.gray{ + &.gray { font-weight: 300; color: $gray; border: 1px solid $light-gray; } - &.terminal{ + &.terminal { padding-left: 52px; padding-right: 30px; margin-left: 12px; @@ -39,23 +40,23 @@ @include img-retina("icon-terminal.png", "icon-terminal@2x.png", 26px, 25px); } - &.started{ + &.started { margin-bottom: 12px; } - &:hover{ + &:hover, &:active, &:focus { text-decoration: none; @include transition(color .3s ease-in-out); - &.blue{ + &.blue { color: darken($blue, 8%); } - &.black{ + &.black { color: lighten($black, 50%); } - &.gray{ + &.gray { color: $black; } } diff --git a/website/source/assets/stylesheets/_community.scss b/website/source/assets/stylesheets/_community.scss index de945fa388..11c9855326 100644 --- a/website/source/assets/stylesheets/_community.scss +++ b/website/source/assets/stylesheets/_community.scss @@ -1,20 +1,16 @@ .people { - margin-top: 30px; + margin-top: 30px; - .person { - margin-bottom: 40px; + .person { + margin-bottom: 40px; - h3 { - text-transform: none; - } - - img { - width: 125px; - margin: auto auto; - } - - .bio { - padding-left: 150px; - } + img { + width: 125px; + margin: auto auto; } + + .bio { + padding-left: 150px; + } + } } diff --git a/website/source/assets/stylesheets/_demo.scss b/website/source/assets/stylesheets/_demo.scss index e7bd06b581..966caf0abc 100644 --- a/website/source/assets/stylesheets/_demo.scss +++ b/website/source/assets/stylesheets/_demo.scss @@ -1,141 +1,134 @@ -html, -body { - height: 100%; - min-height: 100%; -} - .demo-active { - background: #000; + background: #000; - #demo-app { - min-height: 100%; - } + #demo-app { + min-height: 100%; + } - #header, - #sidebar, - #hero, - #content, - #footer, - .sidebar-overlay { - display: none; - } + #header, + #sidebar, + #hero, + #container, + #footer, + .sidebar-overlay { + display: none; + } } .demo-overlay { - background: black; - width: 100%; - height: 100%; - min-height: 100%; - line-height: 1.3; - overflow: auto; - color: #DDDDDD; - display: block; - font-size: 15px; - font-family: 'Ubuntu Mono', 'Monaco', monospace; - @include box-shadow(0px -2px 30px 0px rgba(0, 0, 0, 0.40)); - z-index: 1000; + background: black; + width: 100%; + height: 100%; + min-height: 100%; + line-height: 1.3; + overflow: auto; + color: #DDDDDD; + display: block; + font-size: 15px; + font-family: $font-family-monospace; + @include box-shadow(0px -2px 30px 0px rgba(0, 0, 0, 0.40)); + z-index: 50; } .instruction-wrapper { - background: #000; - width: 100%; - padding: 20px; - position: fixed; - top: 0; - z-index: 5; + background: #000; + width: 100%; + padding: 20px; + position: fixed; + top: 0; + z-index: 100; } .instruction { - overflow: auto; - padding: 10px; - max-width: 800px; - min-width: 400px; - margin: 0 auto; - background-color: darken($blue, 28%); + overflow: auto; + padding: 10px; + max-width: 800px; + min-width: 400px; + margin: 0 auto; + background-color: darken($blue, 28%); - code { - background: none; - color: inherit; - font-weight: 700; - padding-left: 10px; - } + code { + background: none; + color: inherit; + font-weight: 700; + padding-left: 10px; + } - a { - color: white; - text-decoration: underline; - } + a { + color: white; + text-decoration: underline; + } - p:last-child { - margin-bottom: 0px; - } + p:last-child { + margin-bottom: 0px; + } - ul { - padding-left: 15px; - } - - li { - list-style-type: none; - } + ul { + padding-left: 15px; + } + li { + list-style-type: none; + } } .close-terminal{ - display: inline-block; - position: fixed; - top: 0; - right: 0; - width: 60px; - height: 60px; - color: #8B8A8F; - text-align: center; - line-height: 60px; - font-size: 30px; - transition: all 250ms ease-in; - cursor: pointer; - z-index: 10; + display: inline-block; + position: fixed; + top: 0; + right: 0; + width: 60px; + height: 60px; + color: #8B8A8F; + text-align: center; + line-height: 60px; + font-size: 40px; + transition: all 250ms ease-in; + cursor: pointer; + z-index: 100; - &:hover{ - text-decoration: none; - color: $white; - transition: all 250ms ease-in; - } + &:hover{ + text-decoration: none; + color: $white; + transition: all 250ms ease-in; + } } .demo-terminal { + background-color: black; + padding: 25px 65px 0 25px; + padding-top: 250px; + padding-bottom: 50px; + min-height: 100%; + width: 100%; + display: block; + overflow: auto; + position: relative; + z-index: 90; + + &.fullscreen { + min-height: 300px; + padding-top: 20px; + z-index: 6; + } + + .log { + white-space: pre; + } + + input.shell { + padding: 0; + margin: 0; + display: inline-block; + bottom: 0; + width: 90%; background-color: black; - padding: 25px 65px 0 25px; - padding-top: 250px; - padding-bottom: 50px; - min-height: 100%; - width: 100%; - display: block; - overflow: auto; - position: relative; - z-index: 1; + border: 0; + outline: 0; - &.fullscreen { - min-height: 300px; - padding-top: 20px; - z-index: 6; - } - - .log { - white-space: pre; - } - - input.shell { - padding: 0; - margin: 0; - display: inline-block; - bottom: 0; - width: 90%; - background-color: black; - border: 0; - outline: 0; - - &.hidden { - opacity: 0; - } + &.hidden { + opacity: 0; } + } } diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 9c53993ba4..0cfe56e5e1 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -2,277 +2,190 @@ // Docs // -------------------------------------------------- -body.layout-atlas, -body.layout-consul, -body.layout-dnsimple, -body.layout-dme, -body.layout-cloudflare, -body.layout-cloudstack, -body.layout-google, -body.layout-heroku, -body.layout-mailgun, -body.layout-digitalocean, -body.layout-aws, +$docs-font-size: 15px; + body.layout-docs, body.layout-inner, body.layout-downloads, -body.layout-intro{ - display: flex; - flex-direction: column; +body.layout-intro { + >.container{ + .col-md-8[role=main]{ + min-height: 800px; + background-color: white; - >.container{ - flex: 1 0 auto; + >div{ + position: relative; + z-index: 10; + } + } + } - .col-md-8[role=main]{ - background-color: white; + *:focus { + outline: none; + } - >div{ - position: relative; - z-index: 10; - } - } - } + h1 > code, + h2 > code, + h3 > code, + h4 > code, + h5 > code + h6 > code, + li > code, + table code, + p code, + tt, + .alert code { + font-family: $font-family-monospace; + font-size: 90%; + background-color: transparent; + color: inherit; + padding: 0; + } } -.docs-sidebar{ - position: relative; - z-index: 20; - margin-bottom: 30px; - margin-top: 50px; - margin-right: 4%; - @include open(); +.docs-sidebar { + margin-bottom: 30px; + margin-top: 50px; - a{ - color: $dark-blue; - } + ul.nav.docs-sidenav { + display: block; + padding-bottom: 15px; - .nav.docs-sidenav{ - padding-bottom: 15px; + li { + a { + color: $sidebar-link-color; + font-size: 13px; + padding: 10px 0 10px 15px; - :last-child{ - border-bottom: none; - } + &:before { + color: $dark-blue; + content: '\203A'; + font-size: $docs-font-size; + left: 0; + line-height: 100%; + opacity: 0.4; + position: absolute; - //all li - li{ - position: relative; - - > a{ - padding: 10px 0 10px 8px; - font-size: 13px; - color: $dark-blue; - - &:before{ - @include bez-1-transition(); - } - - &:hover{ - background-color: transparent !important; - - &:before{ - @include bez-1-transition(); - } - } - } - } - - $parent-active-state: -14px; - $parent-default-state: -10px; - $child-active-state: -4px; - $child-default-state: 0px; - - //first teir li - > li { - margin: 0 0 0 10px; - - &.active { - >a{ - color: lighten($black, 4%); - - &:hover{ - &:before{ - left: $parent-default-state; - } - } - - &:before{ - background: image-url("triangle-sprite.png") 0 0 no-repeat; - @include img-retina("triangle-sprite.png", "triangle-sprite@2x.png", 7px, 25px); - } - } - - .nav { - display: block; - } - } - - > a { - -webkit-font-smoothing: antialiased; - - &:hover{ - &:before{ - left: $parent-active-state; - } - } - - &:before{ - content: ''; - position: absolute; - width: 7px; - height: 8px; - top: 15px; - left: $parent-default-state; - overflow: hidden; - background: image-url("triangle-sprite.png") 0 -9px no-repeat; - @include img-retina("triangle-sprite.png", "triangle-sprite@2x.png", 7px, 25px); - } - } - } - - //nested ul.nav - .nav { - display: none; - margin-bottom: 15px; - - > li{ - margin-left: 10px; - - &.active{ - > a{ - color: $black; - - &:hover{ - &:before{ - left: $child-default-state; - } - } - - &:before{ - background: image-url("triangle-sprite.png") 0 0 no-repeat; - @include img-retina("triangle-sprite.png", "triangle-sprite@2x.png", 5px, 19px); - } - } - } - - > a{ - -webkit-font-smoothing: antialiased; - padding: 6px 15px; - - &:hover{ - &:before{ - left: $child-active-state; - } - } - - &:before{ - opacity: .75; - content: ''; - position: absolute; - width: 5px; - height: 7px; - top: 12px; - left: $child-default-state; - overflow: hidden; - background: image-url("triangle-sprite.png") 0 -13px no-repeat; - @include img-retina("triangle-sprite.png", "triangle-sprite@2x.png", 5px, 19px); - } - } - } - } - - .nav-visible { - display: block; + height: 100%; + width: 8px } - } + + &:focus, + &:hover { + background-color: transparent; + color: $sidebar-link-color-hover; + + &:before { + opacity: 1; + } + } + } + } + + li.active { + > a { + color: $sidebar-link-color-active; + + &:before { + opacity: 1; + } + } + + // Open nested navigations + ul.nav { + display: block; + } + } + + // subnav + ul.nav { + display: none; + margin: 10px; + + li { + margin-left: 10px; + + a { + padding: 6px 15px; + } + } + } + } } +.bs-docs-section { + padding-top: 10px; + padding-left: 3%; + padding-bottom: 80px; -.bs-docs-section{ - padding-top: 10px; - padding-left: 3%; - padding-bottom: 80px; + p, li, .alert { + font-size: $docs-font-size; + font-family: $font-family-open-sans; + font-weight: $font-weight-reg; + line-height: 1.84em; + margin: 0 0 $docs-font-size; + -webkit-font-smoothing: antialiased; + } - .lead{ - margin-bottom: 48px - } + pre { + font-size: ($docs-font-size - 3); + margin: 0 0 $docs-font-size; - .doc-sectional{ - margin-bottom: 48px; - } + // This will force the code to scroll horizontally on small screens + // instead of wrapping. + code { + overflow-wrap: normal; + white-space: pre; + } + } - p, li, .alert { - font-size: 18px; - font-family: $font-family-open-sans; - font-weight: $font-weight-reg; - line-height: 1.5em; - margin: 0 0 18px; - -webkit-font-smoothing: antialiased; - } + a { + color: $dark-blue; + text-decoration: none; - pre{ - margin: 0 0 18px; + &:hover { + text-decoration: underline; } - a{ - color: $dark-blue; - &:hover{ - text-decoration: underline; - } - } - - img{ - max-width: 650px; - margin-top: 25px; - margin-bottom: 25px; + code { + background: inherit; + color: $dark-blue; } + } - h1{ - color: $black; - font-weight: $font-weight-b; - font-size: 36px; - margin-top: 50px; - margin-bottom: 24px; - } + img { + max-width: 650px; + margin-top: 25px; + margin-bottom: 25px; + } - h2, h3, h4{ - margin-bottom: 16px; - font-weight: $font-weight-b; - - } - - #graph { - margin-top: 30px; - } + h1, + h2, + h3, + h4 { + color: $body-font-color; + margin-top: 54px; + margin-bottom: $docs-font-size; + line-height: 1.3; + } } - @media (max-width: 992px) { - - .bs-docs-section{ - padding-left: 0; + .bs-docs-section { + padding-left: 0; } } @media (max-width: 768px) { - .bs-docs-section{ - padding-top: 0; - h1{ - margin-top: 0; - } - } + .bs-docs-section { + padding-top: 0; + } } - - - @media (max-width: 480px) { - .bs-docs-section{ - img{ - max-width: 450px; - } - - h1{ - font-size: 32px; - } - } + .bs-docs-section { + img { + max-width: 450px; + } + } } diff --git a/website/source/assets/stylesheets/_downloads.scss b/website/source/assets/stylesheets/_downloads.scss index be2187eafb..7150c6f407 100644 --- a/website/source/assets/stylesheets/_downloads.scss +++ b/website/source/assets/stylesheets/_downloads.scss @@ -1,59 +1,59 @@ .downloads { + margin-top: 20px; + + .description { + margin-bottom: 20px; + } + + .download { + border-bottom: 1px solid #b2b2b2; + padding-bottom: 15px; + margin-top: 10px; + margin-bottom: 10px; + + .details { + padding-left: 95px; + + h2 { + margin-top: 30px; + } + + ul { + padding-left: 0px; + } + + li { + display: inline-block; + + &:after { + content: " | "; + } + + &:last-child:after { + content: ""; + } + } + } + + .icon { + img { + width: 75px; + } + } + + .os-name { + font-size: 40px; + margin-bottom: -3px; + } + } + + .poweredby { margin-top: 20px; - .description { - margin-bottom: 20px; - } - - .download { - border-bottom: 1px solid #b2b2b2; - padding-bottom: 15px; - margin-top: 10px; - margin-bottom: 10px; - - .details { - padding-left: 95px; - - h2 { - margin-top: 30px; - } - - ul { - padding-left: 0px; - } - - li { - display: inline-block; - - &:after { - content: " | "; - } - - &:last-child:after { - content: ""; - } - } - } - - .icon { - img { - width: 75px; - } - } - - .os-name { - font-size: 40px; - margin-bottom: -3px; - } - } - - .poweredby { - margin-top: 20px; - - img { - display: block; - margin: 0 auto; - width: 122px; - } + img { + display: block; + margin: 0 auto; + width: 122px; } + } } diff --git a/website/source/assets/stylesheets/_footer.scss b/website/source/assets/stylesheets/_footer.scss index 45aaebe81d..dacbb27cda 100644 --- a/website/source/assets/stylesheets/_footer.scss +++ b/website/source/assets/stylesheets/_footer.scss @@ -1,38 +1,38 @@ -body.page-sub{ - #footer{ +body.page-sub { + #footer { padding: 0 0 40px 0; - .col-md-10{ + .col-md-10 { padding-top: 40px; border-top: 1px solid $faint-gray; } } } -#footer{ +#footer { flex-shrink:0; padding: 64px 0; - .hashicorp-project{ + .hashicorp-project { margin-top: 24px; @include project-by-hashicorp-style(); - &:hover{ + &:hover { color: $black; } } - .pull-right{ + .pull-right { padding-right: 15px; } } -.edit-page-link{ +.edit-page-link { position: absolute; top: -50px; right: 15px; z-index: 10; - a{ + a { text-transform: uppercase; color: $black; font-size: 13px; @@ -44,12 +44,12 @@ body.page-sub{ display: block; text-align: center; - ul{ + ul { display: inline-block;; float: none !important; } - .footer-hashi{ + .footer-hashi { display: block; float: none !important; } @@ -57,17 +57,17 @@ body.page-sub{ } @media (max-width: 414px) { - #footer{ - ul{ + #footer { + ul { display: block; - li{ + li { display: block; float: none; } - &.external-links{ - li{ - svg{ + &.external-links { + li { + svg { position: relative; left: 0; top: 2px; diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index 4738683b03..9a1cd37c94 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -2,101 +2,94 @@ // Global Site // -------------------------------------------------- -/*html{ +html { + height: 100%; + min-height: 100%; text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; -}*/ -html{ - min-height: 100%; } body { - min-height: 100%; - -webkit-font-smoothing: antialiased; - color: $black; - background-color: $white; - font-size: 16px; - font-family: $font-family-open-sans; - font-weight: 400; + -webkit-font-smoothing: antialiased; + color: $body-font-color; + background-color: $white; + font-size: $font-size; + font-family: $font-family-open-sans; + font-weight: $font-weight-reg; + height: 100%; + min-height: 100%; } - h1, h2, h3, h4, h5 { - -webkit-font-smoothing: antialiased; -} -h1{ - font-size: 42px; - line-height: 42px; - margin-bottom: 24px; + font-family: $font-family-klavika; + -webkit-font-smoothing: antialiased; } -h3{ - font-size: 28px; - line-height: 28px; -} - -//an alternative color for buttons in the doc body -.btn-serf{ - color: $white !important; - background-color: $btn-color; - border-radius: $btn-border-radius; - //@include box-shadow( $shadow ); +h1 { + margin-bottom: 24px; } .highlight{ - margin-bottom: 18px; + margin-bottom: 18px; } pre { - background-color: $black; - color: $white; - font-size: 14px; - font-weight: normal; - font-family: "Courier New", Monaco, Menlo, Consolas, monospace; - border: none; - padding: 20px; - margin-bottom: 0; -} - - -//fixed grid below 992 to prevent smaller responsive sizes -@media (max-width: 992px) { - .container{ - max-width: 970px; - } + background-color: $black; + color: $white; + font-size: 14px; + font-weight: normal; + font-family: $font-family-monospace; + border: none; + padding: 20px; + margin-bottom: 0; } //all below styles are overriding corrections for below (min-width: 992px) //below (min-width: 992px) these styles change .navbar-nav { - margin: 0; + margin: 0; } .navbar-right { - float: right !important; + float: right !important; } .navbar-nav > li { - float: left; + float: left; } .navbar-nav > li > a { - padding-top: 15px; - padding-bottom: 15px; + padding-top: 15px; + padding-bottom: 15px; } .center { - text-align: center; + text-align: center; } -.hcaret{ - display: inline-block; - -moz-transform: translate(0, -1px) rotate(135deg); - -webkit-transform: translate(0, -1px) rotate(135deg); - transform: translate(0, -1px) rotate(135deg); - width: 7px; - height: 7px; - border-top: 1px solid $blue; - border-left: 1px solid $blue; - @include transition(all .1s ease-in); +.alert p:last-child { + margin-bottom: 0; +} + +//Typekit utilites for hiding FOUC +.wf-loading { + visibility: hidden; +} + +.wf-active, .wf-inactive { + visibility: visible; +} + +//fixed grid below 992 to prevent smaller responsive sizes +@media (min-width: 768px) and (max-width: 992px) { + .container{ + width: 100%; + } +} + +//guarantees nav list fits at tablet viewport size +@media (min-width: 768px) and (max-width: 800px) { + #header .navbar-nav a { + font-size: 12px !important; + } } diff --git a/website/source/assets/stylesheets/_header.scss b/website/source/assets/stylesheets/_header.scss index 93b4dc42d2..4127280fec 100755 --- a/website/source/assets/stylesheets/_header.scss +++ b/website/source/assets/stylesheets/_header.scss @@ -8,7 +8,7 @@ flex-shrink:0; .navbar-brand { - .logo{ + .logo { width: $project-logo-width; padding-left: 50px; font-size: 0; @@ -19,11 +19,11 @@ } } - .by-hashicorp{ + .by-hashicorp { @include project-by-hashicorp-style(); } - .buttons{ + .buttons { margin-top: 2px; //baseline everything } } @@ -31,13 +31,8 @@ @media (max-width: 414px) { #header { .navbar-brand { - .logo{ + .logo { width: $project-logo-width * .8; - - img{ - //width: 72px; - //height: 14px; - } } } } diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss index 47568daf2c..5409715d85 100755 --- a/website/source/assets/stylesheets/_home.scss +++ b/website/source/assets/stylesheets/_home.scss @@ -1,578 +1,109 @@ -// -// Home -// -------------------------------------------------- +#page-home { + #container { + margin-top: 140px; + position: relative; + text-align: center; + z-index: 1; -#hero{ - /* opacity: 0; - @include translate3d(0, -10px, 0); */ - text-align: center; + #tag-line { + display: block; + font-size: 24px; + font-weight: 300; + margin: 15px 0 40px 0; + } - /* &.showit{ - opacity: 1; - @include translate3d(0, 0px, 0); - transition: all 1s ease; - } */ + #diagram { + background-image: image-url("hero@2x.png"); + background-origin: content-box; + background-position: center center; + background-repeat: no-repeat; + background-size: contain; + display: block; + margin: 60px 0; + padding: 15px; - #logo-lockup{ - position: relative; - display: inline-block; - width: 228px; - height: 43px; - margin-top: 120px; - background: image-url('logo-lockup.png') 0 0 no-repeat; - @include img-retina("logo-lockup.png", "logo-lockup@2x.png", 228px, 43px); + height: 193px; + width: 100%; + } - .keys{ - position: absolute; - left: 15px; - top: 8px; - width: 12px; + h2.features-header { + color: $blue; + display: inline-block; + font-size: 44px; + font-weight: 600; + letter-spacing: 2px; + margin: 120px auto 40px auto; + text-transform: uppercase; + } - span{ - width: 3px; - height: 3px; - border-radius: 2px; - float: left; - margin-left: 1px; - margin-bottom: 1px; - background-color: $blue; - transition: all 250ms ease-in; + h3.feature-header { + color: $black; + font-size: 36px; + font-weight: 300; + margin: 30px 0; + text-transform: none; + } - &:nth-child(1){ - opacity: .85; - } + p { + font-size: 18px; + font-weight: 300; + line-height: 36px; + margin: 25px 0; + padding: 15px; + text-align: left; + } - &:nth-child(2){ - opacity: .4; - } + .feature { + margin-bottom: 150px; - &:nth-child(3){ - opacity: .8; - } + .graphic { + background-origin: content-box; + background-position: center center; + background-repeat: no-repeat; + background-size: contain; + display: block; + margin: 60px 0; + padding: 15px; - &:nth-child(4){ - opacity: .9; - } + height: 160px; + width: 100%; + } - &:nth-child(5){ - opacity: .8; - } + &#crud { + .graphic { + background-image: image-url("graphic-crud@2x.png"); + } + } - &:nth-child(6){ - opacity: .5; - } + &#key { + .graphic { + background-image: image-url("graphic-key@2x.png"); + } + } - &:nth-child(7){ - opacity: .65; - } + &#audit { + .graphic { + background-image: image-url("graphic-audit@2x.png"); + } + } + } - &:nth-child(8){ - opacity: .7; - } + #cta { + @include img-retina("bg-icons.png", "bg-icons@2x.png", 669px, 260px); + background: image-url("bg-icons.png") center center no-repeat; + background-position: center center; + border-top: 1px solid $faint-gray; + border-bottom: 1px solid $faint-gray; + padding: 140px 0; - &:nth-child(9){ - opacity: 1; - } - - &:nth-child(10){ - opacity: 1; - margin-left: 5px; - } - - &.full{ - opacity: 1; - transition: all 250ms ease-in; - } - - &.full.off{ - opacity: .55; - transition: all 250ms ease-in; - } - - &.full.press{ - - animation-name: press; - -webkit-animation-name: press; - - animation-duration: 600ms; - -webkit-animation-duration: 600ms; - - animation-timing-function: ease; - -webkit-animation-timing-function: ease; - } - } - } - } - - #tag-line{ - margin: 15px 0 20px 0; - font-size: 24px; - font-weight: 300; - } - - #diagram{ - display: inline-block; - width: 490px; - height: 193px; - margin-top: 120px; - background: image-url('hero.png') 0 0 no-repeat; - @include img-retina("hero.png", "hero@2x.png", 490px, 193px); - } - - p{ - margin-top: 60px; - text-align: left; - line-height: 2em; - - .strong{ - font-size: 20px; - font-weight: 600; - } - } -} - -#content{ - margin-top: 180px; - text-align: center; - - h2{ - margin-bottom: 120px; - color: $blue; - font-family: $font-family-klavika; - font-size: 44px; - text-transform: uppercase; - letter-spacing: 2px; - } - - .feature{ - margin-bottom: 150px; - - &#crud{ - .graphic{ - width: 335px; - height: 128px; - background: image-url('graphic-crud.png') 0 0 no-repeat; - @include img-retina("graphic-crud.png", "graphic-crud@2x.png", 335px, 128px); - } - } - - &#key{ - .graphic{ - width: 243px; - height: 140px; - background: image-url('graphic-key.png') 0 0 no-repeat; - @include img-retina("graphic-key.png", "graphic-key@2x.png", 243px, 140px); - } - } - - &#audit{ - .graphic{ - width: 491px; - height: 129px; - background: image-url('graphic-audit.png') 0 0 no-repeat; - @include img-retina("graphic-audit.png", "graphic-audit@2x.png", 491px, 129px); - } - } - - .graphic{ - display: inline-block; - } - - h3{ - font-family: $font-family-klavika; - margin: 30px 0; - color: $black; - font-size: 34px; - font-weight: 600; - line-height: 34px; - text-transform: uppercase; - } - - p{ - margin-bottom: 30px; - text-align: left; - font-size: 16px; - line-height: 1.75em; - } - - .feature-footer{ - a{ - margin-bottom: 15px; - margin-left: 15px; - - &:first-child{ - margin-left: 0; - } - } - } - } - - #cta { - position: relative; - padding: 160px 0; - background: image-url('bg-icons.png') center center no-repeat; - @include img-retina("bg-icons.png", "bg-icons@2x.png", 669px, 260px); - background-position: center center; - border-top: 1px solid $faint-gray; - border-bottom: 1px solid $faint-gray; - - a{ - margin-bottom: 5px; - } - - p{ - margin-top: 10px; - color: $black; - font-size: 14px; - font-weight: 600; - line-height: 1.5esm; - - &.cta-gray{ - color: $gray; - } - } - - .outline-btn { - padding: 16px 40px; - display: inline-block; - &:focus { - outline: 0; - } - } - } -} - -#demos{ - position: relative; - padding: 180px 0 60px; - margin-top: -80px; - - >.container{ - z-index: 31; - } - - #demo-bg{ - background-color: #000; - @include skewY(-3deg); - z-index: 30; - } - - .explantion { - margin: 40px 0 60px 15px; - border-left: 8px solid #1e1e1e; - - h2 { - margin-top: 0; - font-size: 28px; - color: lighten($purple, 8%); - } - - p{ - margin-bottom: 0; - font-size: 16px; - letter-spacing: 1px; - line-height: 1.5em; - color: $gray-light; - font-weight: 400; - } - } - - .terminals{ - margin-bottom: 80px; - - .terminal-item{ - margin-bottom: 120px; - - &.last{ - border-bottom: none; - } - >header{ - .left{ - span.icn{ - display: inline-block; - width: 83px; - height: 74px; - } - } - - .right{ - padding-left: 25px; - - h2{ - margin-top: 0; - font-size: 28px; - text-transform: uppercase; - } - - p{ - font-size: 16px; - } - } - } - - .terminal{ - border: 2px solid #1e1e1e; - //border-radius: 4px; - - header{ - position: relative; - text-align: center; - padding: 3px; - //background-color: #1e1e1e; - border-bottom: 2px solid #1e1e1e; - - h4{ - font-size: 14px; - letter-spacing: 1px; - color: white; - } - - ul.shell-dots{ - position: absolute; - top: 10px; - left: 8px; - padding-left: 0; - - li{ - &.d1{ - background-color: #4a08a7; - } - &.d2{ - background-color: #6517cf; - } - &.d3{ - background-color: #7b29ee; - } - - display: inline-block; - width: 12px; - height: 12px; - border-radius: 6px; - margin-left: 6px; - } - } - } - - .terminal-window{ - min-height: 140px; - padding: 20px; - font-size: 15px; - font-family: "Courier New", Monaco, Menlo, Consolas, monospace; - color: $white; - background-color: transparent; - overflow:auto; - font-weight: 500; - -webkit-font-smoothing: antialiased; - - .txt-spe { - color: lighten($blue, 5%); - font-weight: 600; - } - - .txt-var { - color: lighten($purple, 8%); - font-weight: 600; - } - - .txt-str { - color: lighten($green, 2%); - } - - .txt-int { - color: lighten($orange, 2%); - font-weight: 600; - } - - p{ - margin-bottom: 2px; - white-space: pre-wrap; - } - .cursor { - background-color: lighten($purple, 5%); - } - } - } - - .feature-bullets{ - list-style-type: none; - padding-left: 35px; - - li{ - padding: 5px 0 5px 45px; - } - } - } - } -} - - -@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { - #demos{ - .terminals{ - .terminal-item{ - .feature-bullets{ - li{ - background-size: 12px 12px; - } - } - } - } - } -} - - -@media (min-width: 1200px) { - -} - - -@media (max-width: 1200px) { - -} - -@media (min-width: 992px) and (max-width:1200px) { - #cta a { - margin-top: 15px; - font-size: 18px; - } -} - -@media (min-width: 768px) and (max-width:992px) { - #cta a { - margin-top: 10px; - } -} - -@media (max-width: 992px) { - - #demos{ - .terminals{ - .terminal-item{ - >header{ - .left{ - span.icn{ - } - } - - .right{ - padding-left: 54px; - } - } - } - } - } -} - -@media (max-width: 768px) { - - #demos{ - .explantion { - margin: 40px 0 60px 0; - } - - .terminals{ - .terminal-item{ - >header{ - .left{ - span.icn{ - padding-bottom: 15px; - } - } - - .right{ - padding-left: 15px; - } - } - } - } - } - - #cta{ - .intro{ - text-align: center; - p{ - text-align: center; - margin-bottom: 15px; - } - } - } -} - - -@media (max-width: 480px) { - - - #hero{ - #diagram{ - width: 100%; - height: 132px; - background: image-url('hero.png') center 0 no-repeat; - @include img-retina("hero.png", "hero@2x.png", 320px, 132px); - } - } - - #content{ - .feature{ - &#audit{ - .graphic{ - width: 100%; - height: 84px; - background: image-url('graphic-audit.png') center 0 no-repeat; - @include img-retina("graphic-audit.png", "graphic-audit@2x.png", 320px, 84px); - } - } - } - } - - .feature-footer{ - text-align: center; - a{ - margin-bottom: 15px; - margin-left: 0 !important; - } - } -} - - -@media (max-width: 320px) { - - #hero{ - #diagram{ - width: 100%; - height: 132px; - background: image-url('hero.png') center 0 no-repeat; - @include img-retina("hero.png", "hero@2x.png", 320px, 132px); - } - } - - #content{ - .feature{ - &#crud{ - .graphic{ - width: 100%; - height: 111px; - background: image-url('graphic-crud.png') center 0 no-repeat; - @include img-retina("graphic-crud.png", "graphic-crud@2x.png", 290px, 111px); - } - } - - &#audit{ - .graphic{ - width: 100%; - height: 76px; - background: image-url('graphic-audit.png') center 0 no-repeat; - @include img-retina("graphic-audit.png", "graphic-audit@2x.png", 290px, 76px); - } - } - } - } - - #demos .explantion{ - border-left: 8px solid transparent; - } - - #cta a { - font-size: 14px; - font-weight: 400; - } + p { + margin-top: 10px; + color: $black; + font-size: 14px; + font-weight: 600; + line-height: 1.5esm; + text-align: center; + } + } + } } diff --git a/website/source/assets/stylesheets/_sidebar.scss b/website/source/assets/stylesheets/_sidebar.scss index 360db6b0d7..198142edd3 100644 --- a/website/source/assets/stylesheets/_sidebar.scss +++ b/website/source/assets/stylesheets/_sidebar.scss @@ -1,17 +1,7 @@ -// -// Sidebar -// - Project Specific -// - Make sidebar edits here -// -------------------------------------------------- - .sidebar { .sidebar-nav { - // Links - //---------------- li { a { - font-family: $header-font-family; - font-weight: 400; color: $black; svg{ diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index 96d76108c3..71edbdfbac 100755 --- a/website/source/assets/stylesheets/_variables.scss +++ b/website/source/assets/stylesheets/_variables.scss @@ -1,69 +1,39 @@ -// -// Variables -// -------------------------------------------------- - - // Global values -// -------------------------------------------------- +$header-height: 90px; +$btn-border-radius: 4px; +$el-border-radius: 6px; -$header-height: 90px; -$btn-border-radius: 4px; -$el-border-radius: 6px; -// colors -// ------------------------- - -$white: #fff; -$black: #000; -$gray: #929199; -$light-gray: #C2C1C7; -$faint-gray: #E3E3EA; -$dark-blue: #00ABE0; -$blue: #00BFE0; -$light-black: #242424; -$orange: #e78c5b; -$green: #5be764; -$gray-darker: #555; -$gray: #777; -$gray-light: #939393; -$gray-lighter: #979797; -$red: #dd4e58; -$red-dark: #c5454e; -$purple: #822ff7; -$light-purple: #f7f3f9; -$btn-color: #4592C5; - - -// Scaffolding -// ------------------------- -$body-bg: #fff; -$text-color: $gray; - -// Links -// ------------------------- -$link-color: $red-dark; -$link-hover-color: darken($link-color, 15%); +// Colors +$white: #FFFFFF; +$black: #000000; +$gray: #929199; +$light-gray: #C2C1C7; +$faint-gray: #E3E3EA; +$dark-blue: #00ABE0; +$blue: #00BFE0; +$light-black: #242424; +$orange: #E78C5B; +$green: #5BE764; +$gray-darker: #555555; +$gray: #777777; +$gray-light: #939393; +$gray-lighter: #979797; +$red: #DD4E58; +$red-dark: #C5454E; +$purple: #822FF7; // Typography -// ------------------------- -$font-family-klavika: 'klavika-web', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; -$font-family-open-sans: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; -$font-weight-xl: 300; -$font-weight-reg: 400; -$font-weight-b: 600; +$font-family-klavika: 'klavika-web', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-family-open-sans: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-family-monospace: 'Fira Mono', monospace; +$font-size: 15px; +$font-weight-reg: 400; +$font-weight-bold: 600; -$text-shadow: 1px 1px 1px #000; -$shadow: $text-shadow; +// Body +$body-font-color: $gray-darker; - -// -// ---- -$imagePath: "atlas/"; - -//margin + padding -$xsmall-pad: 20px; -$small-pad: 30px; -$med-pad: 70px; -$large-pad: 120px; -$xl-pad: 150px; - -$light-outline: #f7f7f7; +// Sidebar +$sidebar-link-color: $body-font-color; +$sidebar-link-color-hover: $black; +$sidebar-link-color-active: $dark-blue; diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index ccfe4b20cf..5d16a0e996 100755 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -1,7 +1,9 @@ @import 'bootstrap-sprockets'; @import 'bootstrap'; -@import url("//fonts.googleapis.com/css?family=Open+Sans:300,400,700|Open+Sans:300,600,400|Ubuntu+Mono"); +// Remote fonts +@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600'); +@import url('https://fonts.googleapis.com/css?family=Fira+Mono'); // Core variables and mixins @import '_variables'; @@ -19,7 +21,6 @@ @import '_announcement-bnr'; @import '_header'; @import '_footer'; -@import '_jumbotron'; @import '_buttons'; @import '_sidebar'; diff --git a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss index a8564f209f..904d942804 100644 --- a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss +++ b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-sidebar.scss @@ -47,9 +47,11 @@ $sidebar-icon-height: 20px; li > a { background-color: $link-bg; } + li:hover > a { background-color: $link-hover-bg; } + li:focus > a, li > a:focus { background-color: $link-bg; } diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 10dd4531ad..d5f1d54109 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -1,114 +1,95 @@ <%= partial "layouts/sidebar" %> -
-
-
-
-
-
- - - - - - - - - - -
-
-

A tool for managing secrets.

- -
-

- Vault secures, stores, and tightly - controls access to tokens, passwords, certificates, API keys, - and other secrets in modern computing. Vault handles leasing, - key revocation, key rolling, and auditing. Through a unified - API, users can access an encrypted Key/Value store and network - encryption-as-a-service, or generate AWS IAM/STS credentials, - SQL/NoSQL databases, X.509 certificates, SSH credentials, and - more. -

-
-
-
-
-
-
-
-
-
-

Features

+
+
+ " alt="Vault" height="80"> + A tool for managing secrets -
-
-

Secret Storage

-

- Vault can store your existing secrets, or it can - dynamically generate new secrets to control access to - third-party resources or provide time-limited credentials - for your infrastructure. All data that Vault stores is - encrypted. Any dynamically-generated secrets are associated - with leases, and Vault will automatically revoke these - secrets after the lease period ends. Access control - policies provide strict control over who can access what - secrets. -

-
- Learn more -
-
+ -
-
-

Key Rolling

-

- Secrets you store within Vault can be updated at any time. - If using Vault's encryption-as-a-service functionality, the - keys used can be rolled to a new key version at any time, - while retaining the ability to decrypt values encrypted - with past key versions. For dynamically-generated secrets, - configurable maximum lease lifetimes ensure that key - rolling is easy to enforce. -

-
- Learn more -
-
+
-
-
-

Audit Logs

-

- Vault stores a detailed audit log of all authenticated - client interaction: authentication, token creation, secret - access, secret revocation, and more. Audit logs can be sent - to multiple backends to ensure redundant copies. Paired - with Vault's strict leasing policies, operators can easily - trace the lifetime and origin of any secret. -

-
- Learn more -
-
+

+ Vault secures, stores, and tightly + controls access to tokens, passwords, certificates, API keys, + and other secrets in modern computing. Vault handles leasing, + key revocation, key rolling, and auditing. Through a unified + API, users can access an encrypted Key/Value store and network + encryption-as-a-service, or generate AWS IAM/STS credentials, + SQL/NoSQL databases, X.509 certificates, SSH credentials, and + more. +

+
-
-
+
+

Features

-
-
-
- Get Started with Vault -

Completely free and open source.

-
-
-
-
-
+
+
+

Secret Storage

+

+ Vault can store your existing secrets, or it can + dynamically generate new secrets to control access to + third-party resources or provide time-limited credentials + for your infrastructure. All data that Vault stores is + encrypted. Any dynamically-generated secrets are associated + with leases, and Vault will automatically revoke these + secrets after the lease period ends. Access control + policies provide strict control over who can access what + secrets. +

+
+ Learn more +
+
+
+ +
+
+
+

Key Rolling

+

+ Secrets you store within Vault can be updated at any time. + If using Vault's encryption-as-a-service functionality, the + keys used can be rolled to a new key version at any time, + while retaining the ability to decrypt values encrypted + with past key versions. For dynamically-generated secrets, + configurable maximum lease lifetimes ensure that key + rolling is easy to enforce. +

+
+ Learn more +
+
+
+ +
+
+
+

Audit Logs

+

+ Vault stores a detailed audit log of all authenticated + client interaction: authentication, token creation, secret + access, secret revocation, and more. Audit logs can be sent + to multiple backends to ensure redundant copies. Paired + with Vault's strict leasing policies, operators can easily + trace the lifetime and origin of any secret. +

+
+ Learn more +
+
+
+ +
+
+ Get Started with Vault +

Completely free and open source.

+
+
+
From 50c9d135ac789f3f2a905149b5d51d26dd932eaa Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 15:17:52 -0500 Subject: [PATCH 014/127] Add syntax highlighting --- website/source/assets/stylesheets/_docs.scss | 3 +++ website/source/assets/stylesheets/_global.scss | 15 --------------- .../source/assets/stylesheets/_syntax.scss.erb | 14 ++++++++++++++ website/source/assets/stylesheets/_variables.scss | 2 +- .../source/assets/stylesheets/application.scss | 6 +++--- 5 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 website/source/assets/stylesheets/_syntax.scss.erb diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 0cfe56e5e1..c8bbb3e27e 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -128,7 +128,10 @@ body.layout-intro { } pre { + font-family: $font-family-monospace; font-size: ($docs-font-size - 3); + font-weight: normal; + padding: 20px; margin: 0 0 $docs-font-size; // This will force the code to scroll horizontally on small screens diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index 9a1cd37c94..67f13f3028 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -29,21 +29,6 @@ h1 { margin-bottom: 24px; } -.highlight{ - margin-bottom: 18px; -} - -pre { - background-color: $black; - color: $white; - font-size: 14px; - font-weight: normal; - font-family: $font-family-monospace; - border: none; - padding: 20px; - margin-bottom: 0; -} - //all below styles are overriding corrections for below (min-width: 992px) //below (min-width: 992px) these styles change .navbar-nav { diff --git a/website/source/assets/stylesheets/_syntax.scss.erb b/website/source/assets/stylesheets/_syntax.scss.erb new file mode 100644 index 0000000000..fc1f52f846 --- /dev/null +++ b/website/source/assets/stylesheets/_syntax.scss.erb @@ -0,0 +1,14 @@ +pre.highlight code { + color: $gray-dark; +} + +<%= Rouge::Themes::Github.render(scope: ".highlight") %> + +pre.highlight { + border: 1px solid $light-gray; +} + +pre.highlight code span.c1 { + font-style: normal; + opacity: 0.8; +} diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index 71edbdfbac..f264f95a41 100755 --- a/website/source/assets/stylesheets/_variables.scss +++ b/website/source/assets/stylesheets/_variables.scss @@ -25,7 +25,7 @@ $purple: #822FF7; // Typography $font-family-klavika: 'klavika-web', 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; $font-family-open-sans: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; -$font-family-monospace: 'Fira Mono', monospace; +$font-family-monospace: 'Courier New', monospace; $font-size: 15px; $font-weight-reg: 400; $font-weight-bold: 600; diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index 5d16a0e996..3548a0ccb0 100755 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -3,7 +3,6 @@ // Remote fonts @import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600'); -@import url('https://fonts.googleapis.com/css?family=Fira+Mono'); // Core variables and mixins @import '_variables'; @@ -25,11 +24,12 @@ @import '_sidebar'; // Pages -@import '_home'; +@import '_api'; @import '_community'; @import '_docs'; @import '_downloads'; -@import '_api'; +@import '_home'; +@import '_syntax'; // Demo @import '_demo'; From 76b9ed270227a15d82cdab162b6c13f49d82c696 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 15:18:15 -0500 Subject: [PATCH 015/127] Tabs to spaces --- website/source/layouts/docs.erb | 396 ++++++++++++++++---------------- 1 file changed, 198 insertions(+), 198 deletions(-) diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 018945341b..2a85261b3a 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -1,253 +1,253 @@ <% wrap_layout :inner do %> - <% content_for :sidebar do %> - + <% end %> - <%= yield %> + <%= yield %> <% end %> From 7fceebcd6e9170c0906e6a21f60bb51880faa4bc Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 16:09:38 -0500 Subject: [PATCH 016/127] Update upgrade guides --- .../{upgrade-to-0.5.html.md => upgrade-to-0.5.0.html.md} | 4 ++-- .../{upgrade-to-0.6.html.md => upgrade-to-0.6.0.html.md} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename website/source/docs/install/{upgrade-to-0.5.html.md => upgrade-to-0.5.0.html.md} (99%) rename website/source/docs/install/{upgrade-to-0.6.html.md => upgrade-to-0.6.0.html.md} (98%) diff --git a/website/source/docs/install/upgrade-to-0.5.html.md b/website/source/docs/install/upgrade-to-0.5.0.html.md similarity index 99% rename from website/source/docs/install/upgrade-to-0.5.html.md rename to website/source/docs/install/upgrade-to-0.5.0.html.md index c15677e1aa..29a8c86c75 100644 --- a/website/source/docs/install/upgrade-to-0.5.html.md +++ b/website/source/docs/install/upgrade-to-0.5.0.html.md @@ -1,7 +1,7 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.5" -sidebar_current: "docs-install-upgrade-to-0.5" +sidebar_current: "docs-install-upgrade-to-0.5.0" description: |- Learn how to upgrade to Vault 0.5 --- diff --git a/website/source/docs/install/upgrade-to-0.6.html.md b/website/source/docs/install/upgrade-to-0.6.0.html.md similarity index 98% rename from website/source/docs/install/upgrade-to-0.6.html.md rename to website/source/docs/install/upgrade-to-0.6.0.html.md index bb6977f157..5e8db029d2 100644 --- a/website/source/docs/install/upgrade-to-0.6.html.md +++ b/website/source/docs/install/upgrade-to-0.6.0.html.md @@ -1,7 +1,7 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.6" -sidebar_current: "docs-install-upgrade-to-0.6" +sidebar_current: "docs-install-upgrade-to-0.6.0" description: |- Learn how to upgrade to Vault 0.6 --- From 71a06096160561563905b0d4dae037463da98153 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 6 Mar 2017 16:10:09 -0500 Subject: [PATCH 017/127] Move install guides into docs layout --- website/source/docs/install/index.html.md | 2 +- website/source/docs/install/install.html.md | 2 +- .../docs/install/upgrade-to-0.5.1.html.md | 2 +- .../docs/install/upgrade-to-0.6.1.html.md | 4 +- .../docs/install/upgrade-to-0.6.2.html.md | 2 +- .../docs/install/upgrade-to-0.6.3.html.md | 2 +- .../docs/install/upgrade-to-0.6.4.html.md | 2 +- website/source/docs/install/upgrade.html.md | 2 +- website/source/layouts/docs.erb | 41 ++++++++++++--- website/source/layouts/install.erb | 52 ------------------- 10 files changed, 43 insertions(+), 68 deletions(-) delete mode 100644 website/source/layouts/install.erb diff --git a/website/source/docs/install/index.html.md b/website/source/docs/install/index.html.md index 7ca11d6d0b..fd16b93294 100644 --- a/website/source/docs/install/index.html.md +++ b/website/source/docs/install/index.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Install and Upgrade Vault" sidebar_current: "docs-install-overview" description: |- diff --git a/website/source/docs/install/install.html.md b/website/source/docs/install/install.html.md index c24b40e735..558cbea2a2 100644 --- a/website/source/docs/install/install.html.md +++ b/website/source/docs/install/install.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Install Vault" sidebar_current: "docs-install-install" description: |- diff --git a/website/source/docs/install/upgrade-to-0.5.1.html.md b/website/source/docs/install/upgrade-to-0.5.1.html.md index 9094656920..17953d79f5 100644 --- a/website/source/docs/install/upgrade-to-0.5.1.html.md +++ b/website/source/docs/install/upgrade-to-0.5.1.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.5.1" sidebar_current: "docs-install-upgrade-to-0.5.1" description: |- diff --git a/website/source/docs/install/upgrade-to-0.6.1.html.md b/website/source/docs/install/upgrade-to-0.6.1.html.md index 2333099473..32911deb5e 100644 --- a/website/source/docs/install/upgrade-to-0.6.1.html.md +++ b/website/source/docs/install/upgrade-to-0.6.1.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.6.1" sidebar_current: "docs-install-upgrade-to-0.6.1" description: |- @@ -79,7 +79,7 @@ filtering groups were tried in all cases to one where specific filters are defined by the administrator. This vastly increases overall directory compatibility, especially with Active Directory when using nested groups, but unfortunately has the side effect that `memberOf` is no longer searched for by -default, which is a breaking change for many existing setups. +default, which is a breaking change for many existing setups. `Scenario 2` in the [updated documentation](https://www.vaultproject.io/docs/auth/ldap.html) shows an diff --git a/website/source/docs/install/upgrade-to-0.6.2.html.md b/website/source/docs/install/upgrade-to-0.6.2.html.md index a9aef63381..9643230d02 100644 --- a/website/source/docs/install/upgrade-to-0.6.2.html.md +++ b/website/source/docs/install/upgrade-to-0.6.2.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.6.2" sidebar_current: "docs-install-upgrade-to-0.6.2" description: |- diff --git a/website/source/docs/install/upgrade-to-0.6.3.html.md b/website/source/docs/install/upgrade-to-0.6.3.html.md index d46df34399..418b414c81 100644 --- a/website/source/docs/install/upgrade-to-0.6.3.html.md +++ b/website/source/docs/install/upgrade-to-0.6.3.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.6.3" sidebar_current: "docs-install-upgrade-to-0.6.3" description: |- diff --git a/website/source/docs/install/upgrade-to-0.6.4.html.md b/website/source/docs/install/upgrade-to-0.6.4.html.md index 841a2754ff..2d45dddf52 100644 --- a/website/source/docs/install/upgrade-to-0.6.4.html.md +++ b/website/source/docs/install/upgrade-to-0.6.4.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrading to Vault 0.6.4" sidebar_current: "docs-install-upgrade-to-0.6.4" description: |- diff --git a/website/source/docs/install/upgrade.html.md b/website/source/docs/install/upgrade.html.md index 1ec3de71b8..4c4e3a1c55 100644 --- a/website/source/docs/install/upgrade.html.md +++ b/website/source/docs/install/upgrade.html.md @@ -1,5 +1,5 @@ --- -layout: "install" +layout: "docs" page_title: "Upgrade Vault" sidebar_current: "docs-install-upgrade" description: |- diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 2a85261b3a..6cb67a6bb8 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -2,8 +2,39 @@ <% content_for :sidebar do %>