From 5e61d5fe83444024792ec7dc8f9f8e6fcd10b6d9 Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Thu, 1 Dec 2016 13:18:32 -0800 Subject: [PATCH] Revert "Merge pull request #714 from amrutac/refactor-css" This reverts commit 4d88eabb500748df1f8c205c73ac55f3eb2d4fd8, reversing changes made to b38d3552026c60c3877b181d858359f5264545a4. --- web/static/img/bitbucket-icon.svg | 5 - web/static/img/coreos-icon.svg | 19 --- web/static/img/email-icon.svg | 14 -- web/static/img/github-icon.svg | 5 - web/static/img/google-icon.svg | 25 ---- web/static/main.css | 115 --------------- web/templates/approval.html | 32 ++-- web/templates/header.html | 234 +++++++++++++++++++++++++++++- web/templates/login.html | 15 +- web/templates/oob.html | 10 +- web/templates/password.html | 20 +-- web/themes/coreos/style.css | 0 web/themes/coreos/styles.css | 99 ------------- web/themes/tectonic/logo.png | Bin 6081 -> 0 bytes web/themes/tectonic/styles.css | 99 ------------- 15 files changed, 270 insertions(+), 422 deletions(-) delete mode 100644 web/static/img/bitbucket-icon.svg delete mode 100644 web/static/img/coreos-icon.svg delete mode 100644 web/static/img/email-icon.svg delete mode 100644 web/static/img/github-icon.svg delete mode 100644 web/static/img/google-icon.svg create mode 100644 web/themes/coreos/style.css delete mode 100644 web/themes/coreos/styles.css delete mode 100644 web/themes/tectonic/logo.png delete mode 100644 web/themes/tectonic/styles.css 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 bf30f73440189bc865cc185932017f76b5129029..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6081 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