Skip to content
This repository
Browse code

updated pills, fixed curl positioning

  • Loading branch information...
commit de7993bf510f8354fa87fba0c7562d0dfdeb8d76 1 parent 92a1384
Rod Simpson authored
15  css/usergrid.css
@@ -4048,7 +4048,6 @@ hr.col-divider {
4048 4048
   padding: 0px;
4049 4049
   line-height: 25px;
4050 4050
   display: block;
4051  
-  margin-top: 15px;
4052 4051
 }
4053 4052
 .console-section .console-section-contents .form-actions {
4054 4053
   margin: 20px -10px -10px;
@@ -4267,6 +4266,11 @@ hr.col-divider {
4267 4266
   width: 25%;
4268 4267
   padding: 10px !important;
4269 4268
 }
  4269
+#user-panel-tab-bar,
  4270
+#group-panel-tab-bar,
  4271
+#role-panel-tab-bar {
  4272
+  margin-left: 40px;
  4273
+}
4270 4274
 #user-panel-tab-bar .tab-button,
4271 4275
 #group-panel-tab-bar .tab-button,
4272 4276
 #role-panel-tab-bar .tab-button {
@@ -4779,7 +4783,7 @@ hr.col-divider {
4779 4783
   color: #c09853;
4780 4784
 }
4781 4785
 .panel-section-message {
4782  
-  margin: 30px 15px 15px 15px;
  4786
+  margin: 15px;
4783 4787
   padding: 8px 35px 8px 14px;
4784 4788
   margin-bottom: 18px;
4785 4789
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
@@ -4790,7 +4794,9 @@ hr.col-divider {
4790 4794
   border-radius: 4px;
4791 4795
   color: #c09853;
4792 4796
 }
4793  
-
  4797
+.user-panel-section {
  4798
+  margin: 15px;
  4799
+}
4794 4800
 /*----------------- Activities ------------------*/
4795 4801
 #activities-pagination {
4796 4802
   display: none;
@@ -5011,6 +5017,9 @@ a.data-explorer-link {
5011 5017
   padding-right: 40px;
5012 5018
 }
5013 5019
 /* ---------------- Curl Container ------------ */
  5020
+.curl-container {
  5021
+  margin-top: 10px;
  5022
+}
5014 5023
 .curl-container .curl-info,
5015 5024
 .curl-container .curl-token {
5016 5025
   padding-left: 5px;
3  css/usergrid.less
@@ -862,6 +862,7 @@ hr.col-divider{
862 862
 }
863 863
 
864 864
 #user-panel-tab-bar , #group-panel-tab-bar, #role-panel-tab-bar{
  865
+  margin-left: 40px;
865 866
   .tab-button{
866 867
     background-color: #ffffff !important;
867 868
     opacity: 1 !important;
@@ -939,6 +940,7 @@ hr.col-divider{
939 940
   font-weight:bold;
940 941
 }
941 942
 
  943
+
942 944
 /*******************************************************************
943 945
  *
944 946
  * Users
@@ -1627,6 +1629,7 @@ a.data-explorer-link {
1627 1629
 /* ---------------- Curl Container ------------ */
1628 1630
 
1629 1631
 .curl-container{
  1632
+  margin-top: 10px;
1630 1633
   .curl-info, .curl-token{
1631 1634
     padding-left: 5px;
1632 1635
   }
27  js/app/console.js
@@ -2159,7 +2159,7 @@ function buildContentArea(obj2) {
2159 2159
     hideModal('.messages');
2160 2160
     Pages.SelectPanel('user');
2161 2161
     requestUser(userName);
2162  
-    selectTabButton('#button-user-profile');
  2162
+    selectPillButton('#button-user-profile');
2163 2163
     showPanelContent('#user-panel', '#user-panel-profile');
2164 2164
   }
2165 2165
   window.Usergrid.console.pageOpenUserProfile = pageOpenUserProfile;
@@ -2167,7 +2167,7 @@ function buildContentArea(obj2) {
2167 2167
   function pageOpenUserActivities(userId) {
2168 2168
     Pages.SelectPanel('user');
2169 2169
     requestUser(userId);
2170  
-    selectTabButton('#button-user-activities');
  2170
+    selectPillButton('#button-user-activities');
2171 2171
     showPanelContent('#user-panel', '#user-panel-activities');
2172 2172
   }
2173 2173
   window.Usergrid.console.pageOpenUserActivities = pageOpenUserActivities;
@@ -2175,7 +2175,7 @@ function buildContentArea(obj2) {
2175 2175
   function pageSelectUserPermissions(userId) {
2176 2176
     Pages.SelectPanel('user');
2177 2177
     requestUser(userId);
2178  
-    selectTabButton('#button-user-permissions');
  2178
+    selectPillButton('#button-user-permissions');
2179 2179
     showPanelContent('#user-panel', '#user-panel-permissions');
2180 2180
   }
2181 2181
   window.Usergrid.console.pageSelectUserPermissions = pageSelectUserPermissions;
@@ -2183,14 +2183,14 @@ function buildContentArea(obj2) {
2183 2183
   function pageSelectUserGroups(userId) {
2184 2184
     Pages.SelectPanel('user');
2185 2185
     requestUser(userId);
2186  
-    selectTabButton('#button-user-memberships');
  2186
+    selectPillButton('#button-user-memberships');
2187 2187
     showPanelContent('#user-panel', '#user-panel-memberships');
2188 2188
   }
2189 2189
 
2190 2190
   function pageSelectUserGraph(userId) {
2191 2191
     Pages.SelectPanel('user');
2192 2192
     requestUser(userId);
2193  
-    selectTabButton('#button-user-graph');
  2193
+    selectPillButton('#button-user-graph');
2194 2194
     showPanelContent('#user-panel', '#user-panel-graph');
2195 2195
   }
2196 2196
 
@@ -2576,7 +2576,7 @@ function buildContentArea(obj2) {
2576 2576
   function pageOpenGroupProfile(groupPath) {
2577 2577
     Pages.SelectPanel('group');
2578 2578
     requestGroup(groupPath);
2579  
-    selectTabButton('#button-group-details');
  2579
+    selectPillButton('#button-group-details');
2580 2580
     showPanelContent('#group-panel', '#group-panel-details');
2581 2581
   }
2582 2582
   window.Usergrid.console.pageOpenGroupProfile = pageOpenGroupProfile;
@@ -2584,7 +2584,7 @@ function buildContentArea(obj2) {
2584 2584
   function pageSelectGroupMemberships(groupId) {
2585 2585
     Pages.SelectPanel('group');
2586 2586
     requestGroup(groupId);
2587  
-    selectTabButton('#button-group-memberships');
  2587
+    selectPillButton('#button-group-memberships');
2588 2588
     showPanelContent('#group-panel', '#group-panel-memberships');
2589 2589
   }
2590 2590
   window.Usergrid.console.pageSelectGroupMemberships = pageSelectGroupMemberships;
@@ -2871,7 +2871,7 @@ function buildContentArea(obj2) {
2871 2871
     showPanel('#role-panel');
2872 2872
     Pages.ActivatePanel('roles');
2873 2873
     $('#role-panel-list').hide();
2874  
-    selectTabButton('#button-role-settings');
  2874
+    selectPillButton('#button-role-settings');
2875 2875
     $('#role-panel-settings').show();
2876 2876
   }
2877 2877
   window.Usergrid.console.pageOpenRole = pageOpenRole;
@@ -2882,7 +2882,7 @@ function buildContentArea(obj2) {
2882 2882
     showPanel('#role-panel');
2883 2883
     Pages.ActivatePanel('roles');
2884 2884
     $('#role-panel-list').hide();
2885  
-    selectTabButton('#button-role-users');
  2885
+    selectPillButton('#button-role-users');
2886 2886
     $('#role-panel-users').show();
2887 2887
   }
2888 2888
   window.Usergrid.console.pageSelectRoleUsers = pageSelectRoleUsers;
@@ -2893,7 +2893,7 @@ function buildContentArea(obj2) {
2893 2893
     showPanel('#role-panel');
2894 2894
     Pages.ActivatePanel('roles');
2895 2895
     $('#role-panel-list').hide();
2896  
-    selectTabButton('#button-role-groups');
  2896
+    selectPillButton('#button-role-groups');
2897 2897
     $('#role-panel-groups').show();
2898 2898
   }
2899 2899
   window.Usergrid.console.pageSelectRoleGroups = pageSelectRoleGroups;
@@ -3176,7 +3176,7 @@ function buildContentArea(obj2) {
3176 3176
   function pageSelectGroupPermissions(groupId) {
3177 3177
     Pages.SelectPanel('group');
3178 3178
     requestGroup(groupId);
3179  
-    selectTabButton('#button-group-permissions');
  3179
+    selectPillButton('#button-group-permissions');
3180 3180
     showPanelContent('#group-panel', '#group-panel-permissions');
3181 3181
   }
3182 3182
   window.Usergrid.console.pageSelectGroupPermissions = pageSelectGroupPermissions;
@@ -4396,7 +4396,6 @@ function buildContentArea(obj2) {
4396 4396
   });
4397 4397
 
4398 4398
   $('#group-panel-tab-bar a').click(function() {
4399  
-    //selectTabButton(this);
4400 4399
     selectPillButton(this);
4401 4400
     if ($(this).attr('id') == "button-group-list") {
4402 4401
       groupLetter = '*';
@@ -4414,7 +4413,6 @@ function buildContentArea(obj2) {
4414 4413
       showPanelList('roles');
4415 4414
     }
4416 4415
     else if ($(this).attr('id') == "button-roles-search") {
4417  
-      //selectTabButton('#button-roles-search');
4418 4416
       selectPillButton('#button-roles-search');
4419 4417
       $('#roles-panel-list').hide();
4420 4418
       $('#role-panel-users').hide();
@@ -4430,21 +4428,18 @@ function buildContentArea(obj2) {
4430 4428
       Pages.SelectPanel('roles');
4431 4429
       showPanelList('roles');
4432 4430
     } else if ($(this).attr('id') == "button-role-settings") {
4433  
-      //selectTabButton('#button-role-settings');
4434 4431
       selectPillButton('#button-role-settings');
4435 4432
       $('#roles-panel-list').hide();
4436 4433
       $('#role-panel-users').hide();
4437 4434
       $('#role-panel-groups').hide();
4438 4435
       $('#role-panel-settings').show();
4439 4436
     } else if ($(this).attr('id') == "button-role-users") {
4440  
-      //selectTabButton('#button-role-users');
4441 4437
       selectPillButton('#button-role-users');
4442 4438
       $('#roles-panel-list').hide();
4443 4439
       $('#role-panel-settings').hide();
4444 4440
       $('#role-panel-groups').hide();
4445 4441
       $('#role-panel-users').show();
4446 4442
     } else if ($(this).attr('id') == "button-role-groups") {
4447  
-      //selectTabButton('#button-role-groups');
4448 4443
       selectPillButton('#button-role-groups');
4449 4444
       $('#roles-panel-list').hide();
4450 4445
       $('#role-panel-settings').hide();

0 notes on commit de7993b

Please sign in to comment.
Something went wrong with that request. Please try again.