diff --git a/web/static/img/bitbucket-icon.svg b/web/static/img/bitbucket-icon.svg deleted file mode 100644 index 72f4eb10..00000000 --- a/web/static/img/bitbucket-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/web/static/img/coreos-icon.svg b/web/static/img/coreos-icon.svg deleted file mode 100644 index b3a0c6c1..00000000 --- a/web/static/img/coreos-icon.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - diff --git a/web/static/img/email-icon.svg b/web/static/img/email-icon.svg deleted file mode 100644 index 54660253..00000000 --- a/web/static/img/email-icon.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - -Rectangle 290 + Rectangle 291 + Path 232 -Created with Sketch. - - - diff --git a/web/static/img/github-icon.svg b/web/static/img/github-icon.svg deleted file mode 100644 index 5d607282..00000000 --- a/web/static/img/github-icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/web/static/img/google-icon.svg b/web/static/img/google-icon.svg deleted file mode 100644 index 4f1a6f77..00000000 --- a/web/static/img/google-icon.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - Shape + g+ - Created with Sketch. - - - - - - - - - - - - - - - - - - - - diff --git a/web/static/main.css b/web/static/main.css index 931455b5..e69de29b 100644 --- a/web/static/main.css +++ b/web/static/main.css @@ -1,115 +0,0 @@ -* { - box-sizing: border-box; -} - -body { - margin: 0; -} - -.dex-container { - color: #333; - margin: 45px auto; - max-width: 500px; - min-width: 320px; - text-align: center; -} - -.dex-btn { - border-radius: 4px; - border: 0; - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 1px rgba(0, 0, 0, 0.25); - cursor: pointer; - font-size: 16px; - padding: 0; -} - -.dex-btn:focus { - outline: none; -} - -.dex-btn:active { - box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); - outline: none; -} - -.dex-btn-provider { - background-color: #fff; - color: #333; - width: 250px; -} - -.dex-btn-provider:hover { - color: #999; -} - -.dex-btn-icon { - background-position: center; - background-repeat: no-repeat; - background-size: 24px; - border-radius: 4px 0 0 4px; - float: left; - height: 36px; - margin-right: 5px; - width: 36px; -} - -.dex-btn-icon--google { - background-color: #DB4437; - background-image: url(../static/img/google-icon.svg);; -} -.dex-btn-icon--local { - background-color: #84B6EF; - background-image: url(../static/img/email-icon.svg); -} - -.dex-btn-icon--coreos { - /* B&W CoreOS SVG logo */ - background-image: url(../static/img/coreos-icon.svg); -} - -.dex-btn-icon--github { - background-color: #F5F5F5; - background-image: url(../static/img/github-icon.svg); -} - -.dex-btn-icon--bitbucket { - background-color: #205081; - background-image: url(../static/img/bitbucket-icon.svg); -} - -.dex-btn-text { - font-weight: 600; - line-height: 36px; - padding: 6px 12px; - text-align: center; -} - -.dex-subtle-text { - color: #999; - font-size: 12px; -} - -.dex-seperator { - color: #999; -} - -.dex-list { - color: #999; - display: inline-block; - font-size: 12px; - list-style: circle; - text-align: left; -} - -.dex-error-box { - background-color: #DD1327; - color: #fff; - font-size: 14px; - font-weight: normal; - max-width: 320px; - padding: 4px 0; -} - -.dex-error-box { - margin: 20px auto; -} diff --git a/web/templates/approval.html b/web/templates/approval.html index bfcd6bd3..076049c0 100644 --- a/web/templates/approval.html +++ b/web/templates/approval.html @@ -1,35 +1,37 @@ {{ template "header.html" . }} -
-

Grant Access

+
+

Grant Access

-
-
-
{{ .Client }} would like to:
-
    +
    +
    +
    {{ .Client }} would like to:
    {{ range $scope := .Scopes }} -
  • {{ $scope }}
    • +
  • +
    + {{ $scope }} +
    +
    • {{ end }} -
-
+
-
+
-
-
+
-
diff --git a/web/templates/header.html b/web/templates/header.html index 53803311..79438ec4 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -6,15 +6,237 @@ {{ issuer }} - + + - -
-
- + + -
+
diff --git a/web/templates/login.html b/web/templates/login.html index 673ff54d..e52f775a 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -1,19 +1,22 @@ {{ template "header.html" . }} -
-

Log in to {{ issuer }}

+
+

Log in to {{ issuer }}

+
{{ range $c := .Connectors }} -
+
-
{{ end }}
+
+ {{ template "footer.html" . }} diff --git a/web/templates/oob.html b/web/templates/oob.html index ba84d817..09c98e08 100644 --- a/web/templates/oob.html +++ b/web/templates/oob.html @@ -1,9 +1,11 @@ {{ template "header.html" . }} -
-

Login Successful

-

Please copy this code, switch to your application and paste it there:

- +
+

Login Successful

+ + Please copy this code, switch to your application and paste it there: +
+
{{ template "footer.html" . }} diff --git a/web/templates/password.html b/web/templates/password.html index 4bd0ca75..7a9ffb14 100644 --- a/web/templates/password.html +++ b/web/templates/password.html @@ -1,29 +1,29 @@ {{ template "header.html" . }} -
-

Log in to Your Account

+
+

Log in to Your Account

-
-
+
+
- +
-
-
+
+
- +
{{ if .Invalid }} -
+
Invalid username and password.
{{ end }} - +
diff --git a/web/themes/coreos/style.css b/web/themes/coreos/style.css new file mode 100644 index 00000000..e69de29b diff --git a/web/themes/coreos/styles.css b/web/themes/coreos/styles.css deleted file mode 100644 index 5fb5b76e..00000000 --- a/web/themes/coreos/styles.css +++ /dev/null @@ -1,99 +0,0 @@ -.theme-body { - background-color: #efefef; - color: #333; - font-family: 'Source Sans Pro', Helvetica, sans-serif; -} - -.theme-navbar { - background-color: #fff; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2); - color: #333; - font-size: 13px; - font-weight: 100; - height: 46px; - overflow: hidden; - padding: 0 10px; -} - -.theme-navbar__logo-wrap { - display: inline-block; - height: 100%; - overflow: hidden; - padding: 10px 15px; - width: 300px; -} - -.theme-navbar__logo { - height: 100%; - max-height: 25px; -} - -.theme-heading { - font-size: 20px; - font-weight: 500; - margin-bottom: 10px; - margin-top: 0; -} - -.theme-panel { - background-color: #fff; - box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); - padding: 30px; -} - -.theme-btn--primary { - background-color: #333; - border: none; - color: #fff; - min-width: 200px; - padding: 6px 12px; -} - -.theme-btn--primary:hover { - background-color: #666; - color: #fff; -} - -.theme-btn--success { - background-color: #2FC98E; - color: #fff; - width: 250px; -} - -.theme-btn--success:hover { - background-color: #49E3A8; -} - -.theme-form-row { - display: block; - margin: 20px auto; -} - -.theme-form-input { - border-radius: 4px; - border: 1px solid #CCC; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - color: #666; - display: block; - font-size: 14px; - height: 36px; - line-height: 1.42857143; - margin: auto; - padding: 6px 12px; - width: 250px; -} - -.theme-form-input:focus, -.theme-form-input:active { - border-color: #66AFE9; - outline: none; -} - -.theme-form-label { - font-size: 13px; - font-weight: 600; - margin: 4px auto; - position: relative; - text-align: left; - width: 250px; -} diff --git a/web/themes/tectonic/logo.png b/web/themes/tectonic/logo.png deleted file mode 100644 index bf30f734..00000000 Binary files a/web/themes/tectonic/logo.png and /dev/null differ diff --git a/web/themes/tectonic/styles.css b/web/themes/tectonic/styles.css deleted file mode 100644 index ab6abba1..00000000 --- a/web/themes/tectonic/styles.css +++ /dev/null @@ -1,99 +0,0 @@ -.theme-body { - background-color: #1E394C; - color: #333; - font-family: 'Source Sans Pro', Helvetica, sans-serif; -} - -.theme-navbar { - background-color: #fff; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2); - color: #333; - font-size: 13px; - font-weight: 100; - height: 46px; - overflow: hidden; - padding: 0 10px; -} - -.theme-navbar__logo-wrap { - display: inline-block; - height: 100%; - overflow: hidden; - padding: 10px 15px; - width: 300px; -} - -.theme-navbar__logo { - height: 100%; - max-height: 25px; -} - -.theme-heading { - font-size: 20px; - font-weight: 500; - padding-bottom: 10px; - margin-top: 0; -} - -.theme-panel { - background-color: #fff; - box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5); - padding: 30px; -} - -.theme-btn--primary { - background-color: #2fc98e; - border: none; - color: #fff; - min-width: 200px; - padding: 6px 12px; -} - -.theme-btn--primary:hover { - background-color: #25a071; - color: #fff; -} - -.theme-btn--success { - background-color: #2FC98E; - color: #fff; - width: 250px; -} - -.theme-btn--success:hover { - background-color: #49E3A8; -} - -.theme-form-row { - display: block; - margin: 20px auto; -} - -.theme-form-input { - display: block; - height: 36px; - padding: 6px 12px; - font-size: 14px; - line-height: 1.42857143; - color: #666; - border: 1px solid #CCC; - border-radius: 4px; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - width: 250px; - margin: auto; -} - -.theme-form-input:focus, -.theme-form-input:active { - outline: none; - border-color: #66AFE9; -} - -.theme-form-label { - width: 250px; - margin: 4px auto; - text-align: left; - position: relative; - font-size: 13px; - font-weight: 600; -}