Merge pull request #69 from gdg-x/wip/materialDesignForEvents

update(design): material design update for events and analytics pages
gdg-x · Oct 18, 2015 · 481ada0 · 481ada0
2 parents dad258e + 351b49a
commit 481ada0
Show file tree

Hide file tree

Showing 14 changed files with 391 additions and 374 deletions.
diff --git a/bower.json b/bower.json
@@ -11,7 +11,7 @@
     "angular-cookies": "1.4.7",
     "angular-sanitize": "1.4.7",
     "angular-route": "1.4.7",
-    "angular-material": "0.11.2",
+    "angular-material": "0.11.4",
     "angular-google-chart": "0.0.11",
     "angular-google-maps": "2.1.5",
     "font-awesome": "4.3.0",

diff --git a/client/app/app.css b/client/app/app.css
@@ -29,14 +29,6 @@
     color: #000;
     padding: 0.2em 0;
 }
-.eiw md-card {
-  height: 100%;
-}
-.eiw {
-  flex: 1 1 auto;
-  width: 100%;
-  height: 100%;
-}
 .footer a {
   text-decoration: none;
   color: rgba(0, 0, 0, 0.87);

diff --git a/client/app/shorturl/shorturl.analytics.html b/client/app/shorturl/shorturl.analytics.html
diff --git a/client/app/shorturl/shorturl.controller.js b/client/app/shorturl/shorturl.controller.js
diff --git a/client/app/shorturl/shorturl.css b/client/app/shorturl/shorturl.css
@@ -0,0 +1,34 @@
+.event-info {
+  margin: 16px 16px 0 16px;
+  height: 160px;
+  max-width: 600px !important;
+}
+#event-card-container md-card {
+  height: 170px;
+  width: 400px;
+}
+.event-info-image {
+  margin-top: 16px;
+  float: right;
+}
+.event-text {
+  padding-left: 14px;
+}
+.event-text a {
+  text-decoration: none;
+}
+.event-text a:hover {
+  text-decoration: underline;
+}
+.event-info .chapter-name {
+  font-weight: 500;
+}
+.event-description {
+  text-align: center;
+}
+.event-description a {
+  text-decoration: none;
+}
+.event-description a:hover {
+  text-decoration: underline;
+}