From 57080761375a5c4157e9f1d474b9611bf8a80cee Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 2 May 2013 11:35:15 -0400 Subject: [PATCH] enabling twitter login --- .gitignore | 1 + public/css/style.css | 122 -------------------------------- public/css/style.less | 21 ++++++ public/images/twitter_login.png | Bin 0 -> 2830 bytes public/templates/login.tpl | 31 +++++--- 5 files changed, 42 insertions(+), 133 deletions(-) delete mode 100644 public/css/style.css create mode 100644 public/images/twitter_login.png diff --git a/.gitignore b/.gitignore index e081d8f481..714b58c685 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ node_modules/ sftp-config.json public/config.json config.js +public/css/style.css diff --git a/public/css/style.css b/public/css/style.css deleted file mode 100644 index 6f23061dd5..0000000000 --- a/public/css/style.css +++ /dev/null @@ -1,122 +0,0 @@ -@media (min-width: 979px) { - body { - padding-top: 60px; - } -} -#notification_window { - position: absolute; - right: 20px; - top: 80px; - width: 300px; - height: 0px; -} -.toaster-alert { - cursor: pointer; -} -footer.footer { - color: #555; - text-align: center; -} -footer.footer a { - color: #222; -} -#post_window { - width: 100%; - position: absolute; - height: 350px; - left: 0px; - bottom: 0px; - background: white; -} -#post_window input { - width: 100%; - height: 30px; - padding: 5px; -} -#post_window textarea { - width: 100%; - background: #222; - height: 220px; - resize: none; - border-radius: 0; - border: 1px solid #111; - font-size: 16px; - color: #bebebe; - outline: 0; -} -#post_window textarea:focus { - outline: 0; - border: none !important; - box-shadow: none !important; -} -#post_window .post-title-container { - opacity: 0.8; - height: 50px; -} -#post_window .post-content-container { - opacity: 0.8; - background: #000; - width: 100%; - height: 300px; -} -.topic-container { - list-style-type: none; - padding: 0; - margin: 0; - border: 1px solid #eee; - margin-top: 50px; -} -.topic-container a:nth-child(odd) li.topic-row { - background-color: #fdfdfd; -} -.topic-container a:nth-child(even) li.topic-row { - background-color: #fff; -} -.topic-container li.topic-row { - cursor: pointer; - border-bottom: 1px solid #eee; - padding: 10px; -} -.topic-container li:last-child { - border-bottom: 0; -} -.topic-container li.topic-row:hover { - background-color: #eee; -} -.post-container { - list-style-type: none; - padding: 0; - margin: 0; - border: 1px solid #eee; -} -.post-container li:last-child { - border-bottom: 0; -} -.post-container li.post-row { - cursor: pointer; - border-bottom: 1px solid #eee; - padding: 10px; -} -.post-container li.post-row:nth-child(odd) { - background-color: #fdfdfd; -} -.post-container li.post-row:nth-child(even) { - background-color: #fff; -} -.post-container li.post-row:hover { - background-color: #eee; -} -#user_label img { - border: 1px solid #999; - margin-right: 8px; - margin-top: -2px; -} -#user_label span { - font-size: 12px; - font-weight: bold; -} -#reply_title { - font-size: 17px; - padding-top: 14px; - font-weight: 600; -} diff --git a/public/css/style.less b/public/css/style.less index a36ece8fd8..06d0cda1e8 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -1,3 +1,14 @@ +.pointer { + cursor: pointer; + *cursor: hand; +} + +.inline-block { + display: inline-block; + *display: inline; + zoom: 1; +} + @media (min-width: 979px) { body { padding-top: 60px; @@ -147,4 +158,14 @@ footer.footer { font-size: 17px; padding-top: 14px; font-weight: 600; +} + +.alt-logins { + margin: 0; + padding: 0; + + li { + .inline-block; + .pointer; + } } \ No newline at end of file diff --git a/public/images/twitter_login.png b/public/images/twitter_login.png new file mode 100644 index 0000000000000000000000000000000000000000..c2822dc8e609a644fc763f98248136c6ee05b26a GIT binary patch literal 2830 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 literal 0 HcmV?d00001 diff --git a/public/templates/login.tpl b/public/templates/login.tpl index c430b90f17..8cf6aca923 100644 --- a/public/templates/login.tpl +++ b/public/templates/login.tpl @@ -1,13 +1,22 @@

Login

-
- -
-
-
-   -
- Forgot Password? +
+
+

Login via Username & Password

+ +
+
+
+   +
+ Forgot Password? +
+
+

Alternative Logins

+
    +
    • +
+
\ No newline at end of file