From 7caa99f8f20a79bf8a059aca9924575aea163047 Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 27 Nov 2013 12:13:18 +0100 Subject: [PATCH] bootstrap3 --- .../pages/PasswordRecoveryCallbackPage.html | 22 +- .../frontend/pages/PasswordRecoveryPage.html | 17 +- .../commafeed/frontend/pages/WelcomePage.html | 12 +- .../frontend/pages/components/LoginPanel.html | 22 +- .../pages/components/RegisterPanel.html | 24 +- src/main/webapp/js/controllers.js | 68 +- src/main/webapp/js/main.js | 15 + .../webapp/sass/components/_entry-list.scss | 3 +- .../sass/components/_subscription-list.scss | 1 + src/main/webapp/sass/components/_toolbar.scss | 4 +- src/main/webapp/sass/generic/_misc.scss | 9 + src/main/webapp/templates/_category.html | 33 +- src/main/webapp/templates/_feedsearch.html | 12 +- src/main/webapp/templates/_footer.html | 2 +- src/main/webapp/templates/_metrics.meter.html | 6 +- src/main/webapp/templates/_shortcuts.html | 46 +- src/main/webapp/templates/_subscribe.html | 109 --- src/main/webapp/templates/_toolbar.html | 120 ++- src/main/webapp/templates/_tree.html | 59 +- src/main/webapp/templates/admin.metrics.html | 16 +- src/main/webapp/templates/admin.settings.html | 231 +++--- src/main/webapp/templates/admin.useradd.html | 41 +- src/main/webapp/templates/admin.useredit.html | 54 +- src/main/webapp/templates/admin.userlist.html | 4 +- .../templates/feeds.category_details.html | 42 +- .../webapp/templates/feeds.feed_details.html | 79 +- src/main/webapp/templates/feeds.help.html | 118 +-- src/main/webapp/templates/feeds.html | 9 +- src/main/webapp/templates/feeds.import.html | 19 + .../webapp/templates/feeds.new_category.html | 29 + .../webapp/templates/feeds.subscribe.html | 37 + .../webapp/templates/feeds.tag_details.html | 18 +- src/main/webapp/templates/feeds.view.html | 17 +- src/main/webapp/templates/profile.html | 73 +- src/main/webapp/templates/settings.html | 66 +- .../vendor/bootstrap/bootstrap-2.3.0.min.js | 6 - .../vendor/bootstrap/bootstrap-3.0.2.min.js | 9 + .../bootstrap/bootstrap-responsive.min.css | 9 - .../vendor/bootstrap/bootstrap-theme.min.css | 9 + .../webapp/vendor/bootstrap/bootstrap.min.css | 9 + .../bootstrap/bootstrap.no-icons.min.css | 724 ------------------ 41 files changed, 787 insertions(+), 1416 deletions(-) delete mode 100644 src/main/webapp/templates/_subscribe.html create mode 100644 src/main/webapp/templates/feeds.import.html create mode 100644 src/main/webapp/templates/feeds.new_category.html create mode 100644 src/main/webapp/templates/feeds.subscribe.html delete mode 100644 src/main/webapp/vendor/bootstrap/bootstrap-2.3.0.min.js create mode 100644 src/main/webapp/vendor/bootstrap/bootstrap-3.0.2.min.js delete mode 100644 src/main/webapp/vendor/bootstrap/bootstrap-responsive.min.css create mode 100644 src/main/webapp/vendor/bootstrap/bootstrap-theme.min.css create mode 100644 src/main/webapp/vendor/bootstrap/bootstrap.min.css delete mode 100644 src/main/webapp/vendor/bootstrap/bootstrap.no-icons.min.css diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html index 9f373f02..2ef21f7e 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryCallbackPage.html @@ -5,15 +5,19 @@
-
- New Password: - -
- Confirm: - -
- - + +
+ + +
+
+ + +
+
+ + +
diff --git a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html index 19940bfb..03c85239 100644 --- a/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html +++ b/src/main/java/com/commafeed/frontend/pages/PasswordRecoveryPage.html @@ -2,15 +2,18 @@
-
+
-
- Email: - -
- - + +
+ + +
+
+ + +
diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html index 5b128471..3048b192 100644 --- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html +++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html @@ -3,8 +3,8 @@
-
-
+
+ -
-
+
+

Login

-
+

Register

@@ -40,7 +40,7 @@