Merge 463932d into 4c7eb1f

socialSearch · Sep 2, 2014 · c74ab69 · c74ab69
2 parents 4c7eb1f + 463932d
commit c74ab69
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/client/app/main/main.css b/client/app/main/main.css
@@ -59,8 +59,12 @@
     margin: auto;
 }
 
+#filter-buttons {
+    text-align: center;
+}
+
 #buttons {
-    width: 231px;
+    display: inline-block;
     margin: auto;
 }
 
@@ -93,9 +97,10 @@
     border-bottom-right-radius: 5px;
     top: -45px;
     position: relative;
-    width: 101px;
+    width: 90px;
     margin: auto;
     background-color: white;
+    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
 }
 
 .cont-media {

diff --git a/client/app/main/main.html b/client/app/main/main.html
@@ -21,9 +21,9 @@ <h1>Social Search</h1>
 
 <div id="filter-buttons">
   <div id="buttons">
-    <button ng-click="updateFilter('twitter')" id="twitter-button" type="button" class="btn btn-default active">Twitter</button>
-    <button ng-click="updateFilter('instagram')" id="instagram-button" type="button" class="btn btn-default active">Instagram</button>
-    <button ng-click="updateFilter('reddit')" id="reddit-button" type="button" class="btn btn-default active">Reddit</button>
+    <button ng-click="updateFilter('twitter')" id="twitter-button" type="button" class="btn btn-default active"><b>Twitter</b></button>
+    <button ng-click="updateFilter('instagram')" id="instagram-button" type="button" class="btn btn-default active"><b>Instagram</b></button>
+    <button ng-click="updateFilter('reddit')" id="reddit-button" type="button" class="btn btn-default active"><b>Reddit</b></button>
   </div>
 </div>
 
@@ -33,7 +33,7 @@ <h1>Social Search</h1>
 
 <div id="loading">
   <div id="loading-text">
-    . . . Loading . . .
+    <b>. . Loading . .</b>
   </div>
 </div>